apache: fix conditionals for future parser.

gwarf · gwarf · commit 9e4f6b19f8e2 · 2015-09-29T17:11:08.000+02:00
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -438,7 +438,7 @@
   }
 
   # The whole apache configuration directory can be recursively overriden
-  if $apache::source_dir {
+  if $apache::source_dir and $apache::source_dir != '' {
     file { 'apache.dir':
       ensure  => directory,
       path    => $apache::config_dir,
@@ -461,7 +461,7 @@
   }
 
   ### Include custom class if $my_class is set
-  if $apache::my_class {
+  if $apache::my_class and $apache::my_class != '' {
     include $apache::my_class
   }
 

Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`# The whole apache configuration directory can be recursively overriden`
`441`		`- if $apache::source_dir {`
	`441`	`+ if $apache::source_dir and $apache::source_dir != '' {`
`442`	`442`	`file { 'apache.dir':`
`443`	`443`	`ensure => directory,`
`444`	`444`	`path => $apache::config_dir,`
`@@ -461,7 +461,7 @@`
`461`	`461`	`}`
`462`	`462`
`463`	`463`	`### Include custom class if $my_class is set`
`464`		`- if $apache::my_class {`
	`464`	`+ if $apache::my_class and $apache::my_class != '' {`
`465`	`465`	`include $apache::my_class`
`466`	`466`	`}`
`467`	`467`