projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oh puppet, you are so picky
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
ae66345
..
0e74f7b
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-1,9
+1,14
@@
class apache2 {
package {
apache2: ensure => installed;
class apache2 {
package {
apache2: ensure => installed;
+ logrotate: ensure => installed;
}
file {
}
file {
+ "/etc/apache2/conf.d/ressource-limits":
+ content => template("apache2/ressource-limits.erb"),
+ require => Package["apache2"],
+ notify => Exec["apache2 reload"];
"/etc/apache2/conf.d/security":
source => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/security",
"puppet:///apache2/common/etc/apache2/conf.d/security" ],
"/etc/apache2/conf.d/security":
source => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/security",
"puppet:///apache2/common/etc/apache2/conf.d/security" ],
@@
-15,6
+20,11
@@
class apache2 {
"puppet:///apache2/common/etc/apache2/sites-available/default-debian.org" ],
require => Package["apache2"],
notify => Exec["apache2 reload"];
"puppet:///apache2/common/etc/apache2/sites-available/default-debian.org" ],
require => Package["apache2"],
notify => Exec["apache2 reload"];
+
+ "/etc/logrotate.d/apache2":
+ source => [ "puppet:///apache2/per-host/$fqdn/etc/logrotate.d/apache2",
+ "puppet:///apache2/common/etc/logrotate.d/apache2" ];
+
"/srv/www":
mode => 755,
ensure => directory;
"/srv/www":
mode => 755,
ensure => directory;
@@
-25,7
+35,12
@@
class apache2 {
mode => 755,
ensure => directory;
"/srv/www/default.debian.org/htdocs/index.html":
mode => 755,
ensure => directory;
"/srv/www/default.debian.org/htdocs/index.html":
- content => template("default-index.html");
+ content => template("apache2/default-index.html");
+
+ # sometimes this is a symlink
+ #"/var/log/apache2":
+ # mode => 755,
+ # ensure => directory;
}
exec { "apache2 reload":
}
exec { "apache2 reload":