projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
package libapache2-mod-macro is obsolete
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
8be585b
..
cd4f1f7
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-19,19
+19,16
@@
class apache2 {
apache2::module { 'info': }
apache2::module { 'status': }
apache2::module { 'headers': }
apache2::module { 'info': }
apache2::module { 'status': }
apache2::module { 'headers': }
-
- package { 'libapache2-mod-macro':
- ensure => installed
- }
-
- apache2::module { 'macro':
- require => Package['libapache2-mod-macro']
- }
+ apache2::module { 'macro': }
apache2::site { '00-default':
site => 'default-debian.org',
content => template('apache2/default-debian.org.erb'),
}
apache2::site { '00-default':
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,
@@
-83,6
+80,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'),
}
@@
-105,7
+106,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',
}
@@
-114,6
+115,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 => '',
@@
-127,7
+132,7
@@
class apache2 {
script => 'ps_',
}
script => 'ps_',
}
- if $::hostname in [beach,buxtehude,picconi,pkgmirror-
1and1
] {
+ if $::hostname in [beach,buxtehude,picconi,pkgmirror-
csail
] {
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':
@@
-150,4
+155,9
@@
class apache2 {
refreshonly => true,
require => Package['apache2'],
}
refreshonly => true,
require => Package['apache2'],
}
+
+ apache2::config { 'puppet-ssl-key-pins':
+ content => template('apache2/ssl-key-pins.erb'),
+ notify => Exec['service apache2 reload'],
+ }
}
}