projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apache: disable SSLv3 support
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
0470b64
..
3d49ce8
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-43,6
+43,8
@@
class apache2 {
if has_role('buildd_master') {
$memlimit = 192 * 1024 * 1024
if has_role('buildd_master') {
$memlimit = 192 * 1024 * 1024
+ } elsif has_role('buildd_ports_master') {
+ $memlimit = 192 * 1024 * 1024
} elsif has_role('nagiosmaster') {
$memlimit = 96 * 1024 * 1024
} elsif has_role('packagesqamaster') {
} elsif has_role('nagiosmaster') {
$memlimit = 96 * 1024 * 1024
} elsif has_role('packagesqamaster') {
@@
-77,6
+79,10
@@
class apache2 {
source => 'puppet:///modules/apache2/puppet-ssl-macros',
}
source => 'puppet:///modules/apache2/puppet-ssl-macros',
}
+ apache2::config { 'puppet-config':
+ source => 'puppet:///modules/apache2/puppet-config',
+ }
+
file { '/etc/apache2/sites-available/common-ssl.inc':
ensure => absent,
}
file { '/etc/apache2/sites-available/common-ssl.inc':
ensure => absent,
}