projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add pkgmirror-csail
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
ee631fe
..
decec23
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,12
+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
} elsif has_role('qamaster') {
$memlimit = 300 * 1024 * 1024
- } elsif has_role('snapshot_master') {
- $memlimit = 1536 * 1024 * 1024
} else {
$memlimit = 192 * 1024 * 1024
}
} else {
$memlimit = 192 * 1024 * 1024
}
@@
-81,6
+87,10
@@
class apache2 {
source => 'puppet:///modules/apache2/puppet-ssl-macros',
}
source => 'puppet:///modules/apache2/puppet-ssl-macros',
}
+ apache2::config { 'puppet-ftp-macros':
+ source => 'puppet:///modules/apache2/puppet-ftp-macros',
+ }
+
apache2::config { 'puppet-config':
content => template('apache2/puppet-config.erb'),
}
apache2::config { 'puppet-config':
content => template('apache2/puppet-config.erb'),
}
@@
-103,7
+113,7
@@
class apache2 {
source => 'puppet:///modules/apache2/apache2.logrotate',
}
source => 'puppet:///modules/apache2/apache2.logrotate',
}
- file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs' ]:
+ file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs'
, '/srv/www/default.debian.org/htdocs-disabled'
]:
ensure => directory,
mode => '0755',
}
ensure => directory,
mode => '0755',
}
@@
-112,6
+122,10
@@
class apache2 {
content => template('apache2/default-index.html'),
}
content => template('apache2/default-index.html'),
}
+ file { '/srv/www/default.debian.org/htdocs-disabled/index.html':
+ content => template('apache2/disabled-index.html'),
+ }
+
file { '/var/log/apache2/.nobackup':
mode => '0644',
content => '',
file { '/var/log/apache2/.nobackup':
mode => '0644',
content => '',
@@
-125,7
+139,7
@@
class apache2 {
script => 'ps_',
}
script => 'ps_',
}
- if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
+ if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1
,pkgmirror-csail
] {
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':
@@
-141,4
+155,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'],
+ }
}
}