Commit cfacc7a7 authored by Karl Kornel's avatar Karl Kornel
Browse files

apache: Add /usr/bin to path for Apache commands 



Commands like a2ensite call other commands (like env), and those commands were
not in the Puppet Exec's path.

Signed-off-by: default avatarKarl Kornel <akkornel@stanford.edu>
parent b7226a43

NEWS

+1 −0
Original line number Diff line number Diff line 
unreleased



    In jessie, install new configs after installing jessie (akkornel).

    Update Exec paths for apache commands (akkornel).



release/001.016 (2016-01-28)

manifests/conf.pp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ define apache::conf( 
    }

    exec { "a2enconf ${conf_id}":

      command     => "a2enconf ${conf_id}",

      path        => '/usr/sbin',

      path        => '/usr/bin:/usr/sbin',

      refreshonly => true,

      require     => File["/etc/apache2/conf-available/$conf_id"],

      notify      => Exec['apache reload'],

manifests/debian.pp

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ class apache::debian::old( 
  exec { 'a2dissite 000-default':

    command => 'a2dissite 000-default',

    onlyif  => 'readlink /etc/apache2/sites-enabled/000-default | grep sites-available/default',

    path    => '/bin:/usr/bin:/usr/sbin',

    require => Package['apache'],

  }
@@ -58,7 +59,7 @@ class apache::debian::new( 
  exec { 'a2dissite 000-default.conf':

    command => 'a2dissite 000-default.conf',

    onlyif  => 'readlink /etc/apache2/sites-enabled/000-default.conf',

    path    => '/bin:/usr/sbin',

    path    => '/bin:/usr/bin:/usr/sbin',

    require => Package['apache'],

  }

manifests/site.pp

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ define apache::site( 
  if ($ensure == 'present') {

    exec { "a2ensite ${site_id}":

      command => "a2ensite ${site_id}",

      path    => '/usr/bin:/usr/sbin',

      creates => "/etc/apache2/sites-enabled/${site_id}",

      require => [ Package['apache'], File[$realname] ],

      notify  => Exec['apache reload'],
@@ -59,6 +60,7 @@ define apache::site( 
    exec { "a2dissite ${site_id}":

      command => "a2dissite ${site_id}",

      unless  => "[ ! -e '/etc/apache2/sites-enabled/${site_id}' ]",

      path    => '/usr/bin:/usr/sbin',

      require => Package['apache'],

      notify  => Exec['apache reload'],

    }