projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make mpm_worker config into a template
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
cb8d1d7
..
66ee3df
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-80,7
+80,7
@@
class apache2 {
}
apache2::config { 'puppet-config':
}
apache2::config { 'puppet-config':
-
source => 'puppet:///modules/apache2/puppet-config'
,
+
content => template('apache2/puppet-config.erb')
,
}
apache2::config { 'pratchett':
}
apache2::config { 'pratchett':
@@
-89,7
+89,7
@@
class apache2 {
if $::lsbmajdistrelease > 7 {
file { '/etc/apache2/mods-available/mpm_worker.conf':
if $::lsbmajdistrelease > 7 {
file { '/etc/apache2/mods-available/mpm_worker.conf':
-
source => 'puppet:///modules/apache2/mpm_worker'
,
+
content => template('apache2/mpm_worker')
,
}
}
}
}