aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-06-08 16:08:38 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-06-08 16:08:38 -0300
commitfe19d18f34d76916f47471e076802966ec68673f (patch)
tree7c8475990eb30cbf526ac1745ca5baba89a68c91
parentf433258eaab82107b383c8428a736461d528df80 (diff)
downloadpuppet-php-fe19d18f34d76916f47471e076802966ec68673f.tar.gz
puppet-php-fe19d18f34d76916f47471e076802966ec68673f.tar.bz2
Ensure /etc/php5/cli
-rw-r--r--manifests/init.pp16
1 files changed, 8 insertions, 8 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 6c392f3..7892265 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,6 +26,13 @@ class php {
}
}
+ file { [ '/etc/php5', '/etc/php5/cli', '/etc/php5/apache2' ]:
+ ensure => directory,
+ owner => root,
+ group => root,
+ mode => 0755,
+ }
+
file { '/etc/php5/cli/php.ini':
ensure => present,
owner => root,
@@ -36,14 +43,7 @@ class php {
"puppet:///modules/php/cli/php.${::operatingsystem}_${::lsbdistcodename}.ini",
"puppet:///modules/php/cli/php.${::operatingsystem}.ini",
"puppet:///modules/php/cli/php.ini" ],
- require => Package['php5-cli'],
- }
-
- file { [ '/etc/php5', '/etc/php5/apache2' ]:
- ensure => directory,
- owner => root,
- group => root,
- mode => 0755,
+ require => [ Package['php5'], File['/etc/php5/cli'] ],
}
file { "/etc/php5/apache2/php.ini":