Merge pull request #1 from jacquesbh/feature/modules-dir

Create required /etc/apache2/modules directory
proudsourcing · Apr 22, 2014 · 39b14cd · 39b14cd
2 parents c9bfe4e + bcb5b46
commit 39b14cd
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -18,11 +18,12 @@ Puppet module to install Ioncube Loader for PHP 5.3 / PHP 5.4 / PHP 5.5 (apache-
 
 Default values:
 
-	$module_status			= present
-    $apache_modules_dir		= '/etc/apache2/modules/'
-    $apache_php_dir			= '/etc/php5/apache2/'
-    $php_version			= 'php54'
-    $php_priority			= '5'
+	$module_status			   = present
+    $apache_modules_dir_parent = '/etc/apache2/modules/'
+    $apache_modules_dir		   = '/etc/apache2/modules/icl'
+    $apache_php_dir			   = '/etc/php5/apache2/'
+    $php_version			   = 'php54'
+    $php_priority			   = '5'
 
 
 ## License

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -1,14 +1,20 @@
 class ps_ioncubeloader (
 
-	$module_status		= $ps_ioncubeloader::params::module_status,
-	$apache_modules_dir	= $ps_ioncubeloader::params::apache_modules_dir,
-	$apache_php_dir		= $ps_ioncubeloader::params::apache_php_dir,
-	$php_version		= $ps_ioncubeloader::params::php_version,
-	$php_priority		= $ps_ioncubeloader::params::php_priority,
+	$module_status				= $ps_ioncubeloader::params::module_status,
+	$apache_modules_dir_parent	= $ps_ioncubeloader::params::apache_modules_dir_parent,
+	$apache_modules_dir			= $ps_ioncubeloader::params::apache_modules_dir,
+	$apache_php_dir				= $ps_ioncubeloader::params::apache_php_dir,
+	$php_version				= $ps_ioncubeloader::params::php_version,
+	$php_priority				= $ps_ioncubeloader::params::php_priority,
 
 ) inherits ps_ioncubeloader::params {
 
-	file { "${apache_modules_dir}":
+	file { "${apache_modules_dir_parent}":
+		ensure => directory,
+		mode   => 750,
+		owner  => "root",
+	}
+	->file { "${apache_modules_dir}":
 		ensure => 'directory',
 		mode => 750,
 		owner => 'root',
@@ -32,4 +38,4 @@
     	subscribe => File["${apache_php_dir}conf.d/${php_priority}-ps_ioncubeloader.ini"],
 	}
 
-}
+}
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,8 +1,9 @@
 class ps_ioncubeloader::params
 {
-	$module_status			= present
-    $apache_modules_dir		= '/etc/apache2/modules/icl/'
-    $apache_php_dir			= '/etc/php5/apache2/'   
-    $php_version			= 'php54'  
-    $php_priority			= '05'  
-}
+    $module_status				= present
+    $apache_modules_dir_parent	= '/etc/apache2/modules/'
+    $apache_modules_dir			= '/etc/apache2/modules/icl/'
+    $apache_php_dir				= '/etc/php5/apache2/'
+    $php_version				= 'php54'
+    $php_priority				= '05'
+}