Commit 2393d189 authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

fix notify (take 1)

parent 2b3bd9ba

manifests/init.pp

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class su_apache ( 
  # Force a reload after a configuration change.  The Debian init script

  # does a configtest by default, but the Red Hat one does not, so force Red

  # Hat to do the right thing.

  exec { 'apache reload':

  exec { 'su_apache_reload':

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

    command    => $osfamily ? {

      'Debian' => 'service apache2 reload',

manifests/module.pp

+1 −1
Original line number Diff line number Diff line
@@ -33,6 +33,6 @@ define su_apache::module( 
    path    => '/usr/sbin:/usr/bin',

    require => Class['apache'],

    unless  => "[ $condition ]",

    notify  => Class['apache::service'];

    notify  => Exec['su_apache_reload'];

  }

}

manifests/site.pp

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ define su_apache::site( 
    ensure  => $ensure,

    source  => $source,

    content => $content,

    notify  => Class['apache::service'],

    notify  => Exec['su_apache_reload'];

  }



  # Enable or disable the site, based on the ensure parameter.
@@ -51,7 +51,7 @@ define su_apache::site( 
      path    => '/usr/bin:/usr/sbin',

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

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

      notify  => Class['apache::service'],

      notify  => Exec['su_apache_reload'],

    }

  } elsif ($ensure == 'absent') {

    exec { "a2dissite ${site_id}":
@@ -59,7 +59,7 @@ define su_apache::site( 
      unless  => "[ ! -e '/etc/apache2/sites-enabled/${site_id}' ]",

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

      require => Class['apache'],

      notify  => Class['apache::service'],

      notify  => Exec['su_apache_reload'],

    }

  }

}