Merge pull request #993 from tphoney/removing_whitespace

modules-1559 Apache module no service refresh

README.md

@@ -438,6 +438,10 @@ Determines whether the service should be running. Valid values are 'true', 'fals
 
 Name of the Apache service to run. Defaults to: 'httpd' on RedHat, 'apache2' on Debian, and 'apache22' on FreeBSD.
 
+#####`service_manage`
+
+Determines whether the HTTPD service state is managed by Puppet . Defaults to 'true'.
+
 #####`trace_enable`
 
 Controls how TRACE requests per RFC 2616 are handled. More information about [TraceEnable](http://httpd.apache.org/docs/current/mod/core.html#traceenable). Defaults to 'On'.

manifests/init.pp

@@ -28,6 +28,7 @@
   $default_ssl_crl_check  = undef,
   $ip                     = undef,
   $service_enable         = true,
+  $service_manage         = true,
   $service_ensure         = 'running',
   $purge_configs          = true,
   $purge_vhost_dir        = undef,
@@ -72,6 +73,7 @@
   validate_bool($default_confd_files)
   # true/false is sufficient for both ensure and enable
   validate_bool($service_enable)
+  validate_bool($service_manage)
 
   $valid_mpms_re = $apache_version ? {
     '2.4'   => '(event|itk|peruser|prefork|worker)',
@@ -126,6 +128,7 @@
   class { '::apache::service':
     service_name   => $service_name,
     service_enable => $service_enable,
+    service_manage => $service_manage,
     service_ensure => $service_ensure,
   }
 

manifests/mod.pp

@@ -88,7 +88,7 @@
       Exec["mkdir ${mod_dir}"],
     ],
     before  => File[$mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   if $::osfamily == 'Debian' {
@@ -105,7 +105,7 @@
         Exec["mkdir ${enable_dir}"],
       ],
       before  => File[$enable_dir],
-      notify  => Service['httpd'],
+      notify  => Class['apache::service'],
     }
     # Each module may have a .conf file as well, which should be
     # defined in the class apache::mod::module
@@ -123,7 +123,7 @@
           Exec["mkdir ${enable_dir}"],
         ],
         before  => File[$enable_dir],
-        notify  => Service['httpd'],
+        notify  => Class['apache::service'],
       }
     }
   }

manifests/mod/alias.pp

@@ -19,6 +19,6 @@
     content => template('apache/mod/alias.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/authnz_ldap.pp

@@ -14,6 +14,6 @@
     content => template('apache/mod/authnz_ldap.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/autoindex.pp

@@ -7,6 +7,6 @@
     content => template('apache/mod/autoindex.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/cgid.pp

@@ -17,7 +17,7 @@
       content => template('apache/mod/cgid.conf.erb'),
       require => Exec["mkdir ${::apache::mod_dir}"],
       before  => File[$::apache::mod_dir],
-      notify  => Service['httpd'],
+      notify  => Class['apache::service'],
     }
   }
 }

manifests/mod/dav_fs.pp

@@ -15,6 +15,6 @@
     content => template('apache/mod/dav_fs.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/deflate.pp

@@ -19,6 +19,6 @@
     content => template('apache/mod/deflate.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/dir.pp

@@ -16,6 +16,6 @@
     content => template('apache/mod/dir.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/disk_cache.pp

@@ -19,6 +19,6 @@
     content => template('apache/mod/disk_cache.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/event.pp

@@ -43,7 +43,7 @@
     content => template('apache/mod/event.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   case $::osfamily {

manifests/mod/fastcgi.pp

@@ -17,7 +17,7 @@
       content => template('apache/mod/fastcgi.conf.erb'),
       require => Exec["mkdir ${::apache::mod_dir}"],
       before  => File[$::apache::mod_dir],
-      notify  => Service['httpd'],
+      notify  => Class['apache::service'],
     }
   }
 

manifests/mod/fcgid.pp

@@ -19,6 +19,6 @@
     content => template('apache/mod/fcgid.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/info.pp

@@ -13,6 +13,6 @@
     content => template('apache/mod/info.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/itk.pp

@@ -39,7 +39,7 @@
     content => template('apache/mod/itk.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   case $::osfamily {

manifests/mod/ldap.pp

@@ -9,6 +9,6 @@
     content => template('apache/mod/ldap.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/mime.pp

@@ -10,7 +10,7 @@
     content => template('apache/mod/mime.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
   if $mime_support_package {
     package { $mime_support_package:

manifests/mod/mime_magic.pp

@@ -9,6 +9,6 @@
     content => template('apache/mod/mime_magic.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/negotiation.pp

@@ -20,6 +20,6 @@
     content => template('apache/mod/negotiation.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/nss.pp

@@ -20,6 +20,6 @@
     content => template('apache/mod/nss.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/pagespeed.pp

@@ -50,6 +50,6 @@
     content => template('apache/mod/pagespeed.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/passenger.pp

@@ -81,6 +81,6 @@
     content => template('apache/mod/passenger.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/peruser.pp

@@ -43,7 +43,7 @@
     content => template('apache/mod/peruser.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
   file { "${::apache::mod_dir}/peruser":
     ensure  => directory,

manifests/mod/php.pp

@@ -55,6 +55,6 @@
       Exec["mkdir ${::apache::mod_dir}"],
     ],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/prefork.pp

@@ -39,7 +39,7 @@
     content => template('apache/mod/prefork.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   case $::osfamily {
@@ -56,7 +56,7 @@
           line    => '#HTTPD=/usr/sbin/httpd.worker',
           match   => '#?HTTPD=/usr/sbin/httpd.worker',
           require => Package['httpd'],
-          notify  => Service['httpd'],
+          notify  => Class['apache::service'],
         }
       }
     }

manifests/mod/proxy.pp

@@ -11,6 +11,6 @@
     content => template('apache/mod/proxy.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/proxy_html.pp

@@ -32,6 +32,6 @@
     content => template('apache/mod/proxy_html.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/reqtimeout.pp

@@ -9,6 +9,6 @@
     content => template('apache/mod/reqtimeout.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/rpaf.pp

@@ -15,6 +15,6 @@
     content => template('apache/mod/rpaf.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/security.pp

@@ -33,7 +33,7 @@
     path    => "${::apache::mod_dir}/security.conf",
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   file { $modsec_dir:
@@ -56,7 +56,7 @@
     ensure  => file,
     content => template('apache/mod/security_crs.conf.erb'),
     require => File[$modsec_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   apache::security::rule_link { $activated_rules: }

manifests/mod/setenvif.pp

@@ -7,6 +7,6 @@
     content => template('apache/mod/setenvif.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/ssl.pp

@@ -56,6 +56,6 @@
     content => template('apache/mod/ssl.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/status.pp

@@ -41,6 +41,6 @@
     content => template('apache/mod/status.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/suphp.pp

@@ -8,7 +8,7 @@
     content => template('apache/mod/suphp.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd']
+    notify  => Class['apache::service'],
   }
 }
 

manifests/mod/userdir.pp

@@ -13,6 +13,6 @@
     content => template('apache/mod/userdir.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 }

manifests/mod/worker.pp

@@ -41,7 +41,7 @@
     content => template('apache/mod/worker.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['apache::service'],
   }
 
   case $::osfamily {
@@ -58,7 +58,7 @@
           line    => 'HTTPD=/usr/sbin/httpd.worker',
           match   => '#?HTTPD=/usr/sbin/httpd.worker',
           require => Package['httpd'],
-          notify  => Service['httpd'],
+          notify  => Class['apache::service'],
         }
       }
     }

manifests/mod/wsgi.pp

@@ -35,7 +35,7 @@
     content => template('apache/mod/wsgi.conf.erb'),
     require => Exec["mkdir ${::apache::mod_dir}"],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd']
+    notify  => Class['apache::service'],
   }
 }