Make mpm_worker config into a template

diff --git a/modules/apache2/files/mpm_worker b/modules/apache2/files/mpm_worker
deleted file mode 100644 (file)
index 3c0b0eb..0000000
--- a/modules/apache2/files/mpm_worker
+++ /dev/null
@@ -1,32 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-##
-
-# worker MPM
-# StartServers: initial number of server processes to start
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadLimit: ThreadsPerChild can be changed to this maximum value during a
-#                        graceful restart. ThreadLimit can only be changed by stopping
-#                        and starting Apache.
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxRequestWorkers: maximum number of threads
-# MaxConnectionsPerChild: maximum number of requests a server process serves
-
-<IfModule mpm_worker_module>
-       #StartServers                    2
-       #MinSpareThreads                 25
-       #MaxSpareThreads                 75
-       #ThreadLimit                     64
-       #ThreadsPerChild                 25
-       #MaxRequestWorkers        150
-       #MaxConnectionsPerChild   0
-       ServerLimit                30
-       MaxRequestWorkers        1500
-       ThreadsPerChild            50
-       MinSpareThreads            20
-       MaxSpareThreads            75
-       MaxConnectionsPerChild  1000000
-</IfModule>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index fba3b38..66ee3df 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -89,7 +89,7 @@ class apache2 {
 
        if $::lsbmajdistrelease > 7 {
                file { '/etc/apache2/mods-available/mpm_worker.conf':
-                       source => 'puppet:///modules/apache2/mpm_worker',
+                       content => template('apache2/mpm_worker'),
                }
        }
 

diff --git a/modules/apache2/templates/mpm_worker.erb b/modules/apache2/templates/mpm_worker.erb
new file mode 100644 (file)
index 0000000..3c0b0eb
--- /dev/null
+++ b/modules/apache2/templates/mpm_worker.erb
@@ -0,0 +1,32 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+##
+
+# worker MPM
+# StartServers: initial number of server processes to start
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadLimit: ThreadsPerChild can be changed to this maximum value during a
+#                        graceful restart. ThreadLimit can only be changed by stopping
+#                        and starting Apache.
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestWorkers: maximum number of threads
+# MaxConnectionsPerChild: maximum number of requests a server process serves
+
+<IfModule mpm_worker_module>
+       #StartServers                    2
+       #MinSpareThreads                 25
+       #MaxSpareThreads                 75
+       #ThreadLimit                     64
+       #ThreadsPerChild                 25
+       #MaxRequestWorkers        150
+       #MaxConnectionsPerChild   0
+       ServerLimit                30
+       MaxRequestWorkers        1500
+       ThreadsPerChild            50
+       MinSpareThreads            20
+       MaxSpareThreads            75
+       MaxConnectionsPerChild  1000000
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet