Ensure /etc/php5/cli

diff --git a/manifests/init.pp b/manifests/init.pp
index 6c392f3b7aca5e44bf14d0f3c0bb91cd47b0166f..78922653c48e1d0ba24578e2a719af5de1954c76 100644 (file)
--- 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":