diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/config.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 52 |
2 files changed, 27 insertions, 27 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index 4da042e..817790a 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -5,7 +5,7 @@ define php::config($order = '20', $value, $ensure = 'present', $sapi = 'apache2' group => root, mode => 0644, content => "${name}=${value}\n", - require => File["${::php::folder}/${sapi}"], + require => File["${::php::folder}/${sapi}/conf.d"], notify => $sapi ? { 'apache2' => Service['apache2'], default => undef, diff --git a/manifests/init.pp b/manifests/init.pp index 6ac5ae0..ade50f0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -31,7 +31,7 @@ class php($hardened = true) { default => '/etc/php5', } - file { [ "${folder}", "${folder}/cli", "${folder}/apache2" ]: + file { [ "${folder}", "${folder}/cli", "${folder}/apache2", "${folder}/cli/conf.d", "${folder}/apache2/conf.d" ]: ensure => directory, owner => root, group => root, @@ -39,32 +39,32 @@ class php($hardened = true) { require => Package['php5'], } - file { "${folder}/cli/php.ini": - ensure => present, - owner => root, - group => root, - mode => 0644, - source => [ "puppet:///modules/site_php/cli/${::fqdn}/php.ini", - "puppet:///modules/site_php/cli/${::domain}/php.ini", - "puppet:///modules/php/cli/php.${::operatingsystem}_${::lsbdistcodename}.ini", - "puppet:///modules/php/cli/php.${::operatingsystem}.ini", - "puppet:///modules/php/cli/php.ini" ], - require => [ Package['php5'], File["${folder}/cli"] ], - } + #file { "${folder}/cli/php.ini": + # ensure => present, + # owner => root, + # group => root, + # mode => 0644, + # source => [ "puppet:///modules/site_php/cli/${::fqdn}/php.ini", + # "puppet:///modules/site_php/cli/${::domain}/php.ini", + # "puppet:///modules/php/cli/php.${::operatingsystem}_${::lsbdistcodename}.ini", + # "puppet:///modules/php/cli/php.${::operatingsystem}.ini", + # "puppet:///modules/php/cli/php.ini" ], + # require => [ Package['php5'], File["${folder}/cli"] ], + #} - file { "${folder}/apache2/php.ini": - ensure => present, - owner => root, - group => root, - mode => 0644, - source => [ "puppet:///modules/site_php/apache2/${::fqdn}/php.ini", - "puppet:///modules/site_php/apache2/${::domain}/php.ini", - "puppet:///modules/php/apache2/php.${::operatingsystem}_${::lsbdistcodename}.ini", - "puppet:///modules/php/apache2/php.${::operatingsystem}.ini", - "puppet:///modules/php/apache2/php.ini" ], - notify => Service['apache2'], - require => [ Package['php5'], File["${folder}/apache2"] ], - } + #file { "${folder}/apache2/php.ini": + # ensure => present, + # owner => root, + # group => root, + # mode => 0644, + # source => [ "puppet:///modules/site_php/apache2/${::fqdn}/php.ini", + # "puppet:///modules/site_php/apache2/${::domain}/php.ini", + # "puppet:///modules/php/apache2/php.${::operatingsystem}_${::lsbdistcodename}.ini", + # "puppet:///modules/php/apache2/php.${::operatingsystem}.ini", + # "puppet:///modules/php/apache2/php.ini" ], + # notify => Service['apache2'], + # require => [ Package['php5'], File["${folder}/apache2"] ], + #} include php::resources include php::defaults |