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 some HTML for disabled services to use
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
b8e76ad
..
ac46632
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-87,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'),
}
@@
-109,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',
}
@@
-118,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 => '',