projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only mail on error
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
3c0874e
..
0c15379
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-14,7
+14,7
@@
class apache2 {
apache2::site { '00-default':
site => 'default-debian.org',
apache2::site { '00-default':
site => 'default-debian.org',
-
template => 'apache2/default-debian.org.erb'
,
+
content => template('apache2/default-debian.org.erb')
,
}
apache2::site { '000-default':
}
apache2::site { '000-default':
@@
-22,19
+22,19
@@
class apache2 {
}
apache2::config { 'ressource-limits':
}
apache2::config { 'ressource-limits':
-
template => 'apache2/ressource-limits.erb'
,
+
content => template('apache2/ressource-limits.erb')
,
}
apache2::config { 'security':
}
apache2::config { 'security':
-
config
=> 'puppet:///modules/apache2/security',
+
source
=> 'puppet:///modules/apache2/security',
}
apache2::config { 'local-serverinfo':
}
apache2::config { 'local-serverinfo':
-
config
=> 'puppet:///modules/apache2/local-serverinfo',
+
source
=> 'puppet:///modules/apache2/local-serverinfo',
}
apache2::config { 'server-status':
}
apache2::config { 'server-status':
-
config
=> 'puppet:///modules/apache2/server-status',
+
source
=> 'puppet:///modules/apache2/server-status',
}
file { '/etc/apache2/sites-available/common-ssl.inc':
}
file { '/etc/apache2/sites-available/common-ssl.inc':
@@
-77,7
+77,7
@@
class apache2 {
}
}
}
}
- if $::hostname in [busoni,duarte,holter,lindberg,master,powell,
rore
] {
+ if $::hostname in [busoni,duarte,holter,lindberg,master,powell,
beach
] {
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':