aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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":