Misc fixes

diff --git a/manifests/init.pp b/manifests/init.pp
index 35b7b8d76e96831f494daf344c37ad295803aa47..edfba036034541c04442ce64c224799c2e1d62bd 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -32,10 +32,10 @@ class ikiwiki {
         }
     
         exec { "/usr/local/sbin/ikiwiki-deploy $name":
-          unless  => "/bin/sh -c [ -f '${apache_sites_folder}/${name}_src/index.mdw' ]",
+          unless  => "/bin/sh -c [ -f '${apache_sites_folder}/${name}/ikiwiki_src/index.mdw' ]",
         }
     
-        if !defined(File["${apache_sites_folder}/${name}_src"]) {
+        if !defined(File["${apache_sites_folder}/${name}/ikiwiki_src"]) {
           file { "${apache_sites_folder}/${name}_src":
             ensure  => directory,
             owner   => gitosis,
@@ -45,8 +45,8 @@ class ikiwiki {
           }
         }
 
-        if !defined(File["${apache_sites_folder}/${name}"]) {
-          file { "${apache_sites_folder}/${name}":
+        if !defined(File["${apache_sites_folder}/${name}/ikiwiki"]) {
+          file { "${apache_sites_folder}/${name}/ikiwiki":
             ensure  => directory,
             owner   => gitosis,
             group   => gitosis,