projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update for new debian-ports archive signing key
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
b37d990
..
b8e76ad
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-32,6
+32,10
@@
class apache2 {
site => 'default-debian.org',
content => template('apache2/default-debian.org.erb'),
}
site => 'default-debian.org',
content => template('apache2/default-debian.org.erb'),
}
+ apache2::site { 'xx-default-ssl':
+ site => 'default-debian.org-ssl',
+ content => template('apache2/default-debian.org-ssl.erb'),
+ }
apache2::site { '000-default':
ensure => absent,
apache2::site { '000-default':
ensure => absent,
@@
-47,8
+51,14
@@
class apache2 {
if has_role('udd') {
$memlimit = 512 * 1024 * 1024
if has_role('udd') {
$memlimit = 512 * 1024 * 1024
+ } elsif has_role('dgit_git') {
+ $memlimit = 512 * 1024 * 1024
} elsif has_role('sso') {
$memlimit = 512 * 1024 * 1024
} elsif has_role('sso') {
$memlimit = 512 * 1024 * 1024
+ } elsif has_role('popcon') {
+ $memlimit = 512 * 1024 * 1024
+ } elsif has_role('qamaster') {
+ $memlimit = 300 * 1024 * 1024
} else {
$memlimit = 192 * 1024 * 1024
}
} else {
$memlimit = 192 * 1024 * 1024
}
@@
-137,4
+147,11
@@
class apache2 {
description => 'Allow web access',
rule => '&SERVICE(tcp, (http https))'
}
description => 'Allow web access',
rule => '&SERVICE(tcp, (http https))'
}
+
+ exec { 'service apache2 reload':
+ path => '/usr/bin:/usr/sbin:/bin:/sbin',
+ command => 'service apache2 reload',
+ refreshonly => true,
+ require => Package['apache2'],
+ }
}
}