From 04759ad98a01c7637302e21fa31018a7af6f4a51 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 15 Aug 2010 16:36:34 +0100 Subject: [PATCH] and apache module Signed-off-by: Stephen Gran --- modules/apache2/manifests/init.pp | 20 ++++++++++---------- modules/apache2/manifests/security_mirror.pp | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index fb88994c6..fde10b9d9 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -18,8 +18,8 @@ class apache2 { } file { "/etc/php5/conf.d/suhosin.ini": - source => [ "puppet:///apache2/per-host/$fqdn/etc/php5/conf.d/suhosin.ini", - "puppet:///apache2/common/etc/php5/conf.d/suhosin.ini" ], + source => [ "puppet:///modules/apache2/per-host/$fqdn/etc/php5/conf.d/suhosin.ini", + "puppet:///modules/apache2/common/etc/php5/conf.d/suhosin.ini" ], require => Package["apache2", "php5-suhosin"], notify => Exec["force-reload-apache2"]; } @@ -86,18 +86,18 @@ class apache2 { require => Package["apache2"], notify => Exec["reload-apache2"]; "/etc/apache2/conf.d/security": - source => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/security", - "puppet:///apache2/common/etc/apache2/conf.d/security" ], + source => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/conf.d/security", + "puppet:///modules/apache2/common/etc/apache2/conf.d/security" ], require => Package["apache2"], notify => Exec["reload-apache2"]; "/etc/apache2/conf.d/local-serverinfo": - source => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/local-serverinfo", - "puppet:///apache2/common/etc/apache2/conf.d/local-serverinfo" ], + source => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/conf.d/local-serverinfo", + "puppet:///modules/apache2/common/etc/apache2/conf.d/local-serverinfo" ], require => Package["apache2"], notify => Exec["reload-apache2"]; "/etc/apache2/conf.d/server-status": - source => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/server-status", - "puppet:///apache2/common/etc/apache2/conf.d/server-status" ], + source => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/conf.d/server-status", + "puppet:///modules/apache2/common/etc/apache2/conf.d/server-status" ], require => Package["apache2"], notify => Exec["reload-apache2"]; @@ -107,8 +107,8 @@ class apache2 { notify => Exec["reload-apache2"]; "/etc/logrotate.d/apache2": - source => [ "puppet:///apache2/per-host/$fqdn/etc/logrotate.d/apache2", - "puppet:///apache2/common/etc/logrotate.d/apache2" ]; + source => [ "puppet:///modules/apache2/per-host/$fqdn/etc/logrotate.d/apache2", + "puppet:///modules/apache2/common/etc/logrotate.d/apache2" ]; "/srv/www": mode => 755, diff --git a/modules/apache2/manifests/security_mirror.pp b/modules/apache2/manifests/security_mirror.pp index bdc3bcce1..fba5ad474 100644 --- a/modules/apache2/manifests/security_mirror.pp +++ b/modules/apache2/manifests/security_mirror.pp @@ -1,8 +1,8 @@ class apache2::security_mirror inherits apache2 { file { "/etc/apache2/sites-available/security.debian.org": - source => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/security.debian.org", - "puppet:///apache2/common/etc/apache2/sites-available/security.debian.org" ]; + source => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/sites-available/security.debian.org", + "puppet:///modules/apache2/common/etc/apache2/sites-available/security.debian.org" ]; } -- 2.20.1