projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
factor out schroot
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
082b863
..
ef2864e
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':
@@
-77,7
+77,7
@@
class apache2 {
}
}
}
}
- if $::hostname in [busoni,
duarte,holter,lindberg,master,powell
] {
+ if $::hostname in [busoni,
holter,lindberg,master,powell,beach,buxtehude
] {
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':