Create conf.d directories as symlinks again

saz · saz · commit a12c55460269 · 2012-11-02T18:01:56.000+01:00
fixes saz#8
diff --git a/manifests/apache2/config.pp b/manifests/apache2/config.pp
@@ -11,7 +11,9 @@
   }
 
   file { "${php::params::apache_dir}conf.d":
-    ensure  => directory,
+    ensure  => link,
+    target  => '../conf.d',
+    force   => true,
     require => File[$php::params::apache_dir],
     notify  => Service[$php::params::apache_service_name],
   }
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -39,6 +39,9 @@
   }
 
   file { "${php::params::cli_dir}conf.d":
-    ensure => directory,
+    ensure  => link,
+    target  => '../conf.d',
+    forge   => true,
+    require => File[$php::params::cli_dir],
   }
 }
diff --git a/manifests/fpm/config.pp b/manifests/fpm/config.pp
@@ -11,7 +11,9 @@
   }
 
   file { "${php::params::fpm_dir}conf.d":
-    ensure  => directory,
+    ensure  => link,
+    target  => '../conf.d',
+    force   => true,
     require => File[$php::params::fpm_dir],
     notify  => Class['php::fpm::service'],
   }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`file { "${php::params::apache_dir}conf.d":`
`14`		`- ensure => directory,`
	`14`	`+ ensure => link,`
	`15`	`+ target => '../conf.d',`
	`16`	`+ force => true,`
`15`	`17`	`require => File[$php::params::apache_dir],`
`16`	`18`	`notify => Service[$php::params::apache_service_name],`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`file { "${php::params::cli_dir}conf.d":`
`42`		`- ensure => directory,`
	`42`	`+ ensure => link,`
	`43`	`+ target => '../conf.d',`
	`44`	`+ forge => true,`
	`45`	`+ require => File[$php::params::cli_dir],`
`43`	`46`	`}`
`44`	`47`	`}`