diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 8 | ||||
| -rw-r--r-- | manifests/modules/mod_security.pp | 2 | ||||
| -rw-r--r-- | manifests/modules/php.pp | 31 |
3 files changed, 22 insertions, 19 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 35b34de..a710744 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -133,8 +133,8 @@ define apache::vhost::file( $real_source = $source ? { '' => [ - "puppet://$server/dist/apache/vhosts.d/${fqdn}/${name}.conf", - "puppet://$server/dist/apache/vhosts.d/${name}.conf", + "puppet://$server/files/apache/vhosts.d/${fqdn}/${name}.conf", + "puppet://$server/files/apache/vhosts.d/${name}.conf", "puppet://$server/apache/vhosts.d/${name}.conf" ], default => "puppet://$server/$source", @@ -159,8 +159,8 @@ define apache::config::file( $real_source = $source ? { # get a whole bunch of possible sources if there is no specific source for that config-file '' => [ - "puppet://$server/dist/apache/conf/${fqdn}/${name}", - "puppet://$server/dist/apache/conf/${name}", + "puppet://$server/files/apache/conf/${fqdn}/${name}", + "puppet://$server/files/apache/conf/${name}", "puppet://$server/apache/conf/${name}.${operatingsystem}.${lsbdistcodename}", "puppet://$server/apache/conf/${name}.${operatingsystem}", "puppet://$server/apache/conf/${name}.Default", diff --git a/manifests/modules/mod_security.pp b/manifests/modules/mod_security.pp index 4cfc86f..bbc04c9 100644 --- a/manifests/modules/mod_security.pp +++ b/manifests/modules/mod_security.pp @@ -40,7 +40,7 @@ class apache::mod_security::base { # file{custom_host_rules: # path => "/etc/apache2/modules.d/mod_security/Zcustom_rules/", -# source => [ "puppet://$server/dist/apache/mod_security/custom_rules/${fqdn}", +# source => [ "puppet://$server/files/apache/mod_security/custom_rules/${fqdn}", # "puppet://$server/apache/mod_security/custom_rules.Default_keep_it_empty/" ], # recurse => true, # owner => root, diff --git a/manifests/modules/php.pp b/manifests/modules/php.pp index 149b678..9609a96 100644 --- a/manifests/modules/php.pp +++ b/manifests/modules/php.pp @@ -9,6 +9,19 @@ class php::base { before => Service[apache], notify => Service[apache], } + file{php_ini_config: + path => "/etc/php/apache2-php5/php.ini", + source => [ + "puppet://$server/files/apache/php/apache2_php5_php.ini/${fqdn}/php.ini", + "puppet://$server/files/apache/php/apache2_php5_php.ini/php.ini", + "puppet://$server/apache/php/apache2_php5_php.ini/php.ini" + ], + owner => root, + group => 0, + mode => 0644, + require => [ Package[php], Package[apache] ], + notify => Service[apache], + } } class php::centos inherits php::base {} @@ -24,6 +37,10 @@ class php::debian::pear::common { } class php::debian inherits php::base { + #dunno yet about this config file under debian + File[php_ini_config]{ + ensure => absent, + } Package[php]{ name => 'php5', } @@ -61,20 +78,6 @@ class php::gentoo inherits php::base { Package[php]{ category => 'dev-lang', } - - # config files - file{"/etc/php/apache2-php5/php.ini": - source => [ - "puppet://$server/dist/apache/php/apache2_php5_php.ini/${fqdn}/php.ini", - "puppet://$server/dist/apache/php/apache2_php5_php.ini/php.ini", - "puppet://$server/apache/php/apache2_php5_php.ini/php.ini" - ], - owner => root, - group => 0, - mode => 0644, - require => [ Package[php], Package[apache] ], - notify => Service[apache], - } } |