Cleanup, README update and dependency fixes

diff --git a/README b/README
index 35e713cb32787b2ee0a56bb20716308f9409048c..ff7040393358c7b35aa3e889e0963612277627c6 100644 (file)
--- a/README
+++ b/README
@@ -46,3 +46,8 @@ Usage example
     disable_plugins => "openid",
     add_plugins     => "goodstuff sidebar",
   }
+
+References
+----------
+
+- See http://rtime.felk.cvut.cz/~sojka/blog/using-ikiwiki-with-gitolite/

diff --git a/manifests/instance.pp b/manifests/instance.pp
index bd46af7b2a1759d2d506d154e81a631e8cf2499b..f845f6841646c20b819884f3c8fff20f76c62483 100644 (file)
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -13,7 +13,6 @@ define ikiwiki::instance(
   $home                      = "/home/$owner",
   $create_ssh_key            = false
 ) {
-
   case $ensure {
     'present': {
       file { "/etc/ikiwiki/$name.setup":
@@ -69,14 +68,6 @@ define ikiwiki::instance(
           }
         }
 
-        if !defined(File["${ikiwiki::sites_folder}/${name}"]) {
-          file { "${ikiwiki::sites_folder}/${name}":
-            ensure  => directory,
-            owner   => root,
-            group   => root,
-          }
-        }
-
         exec { "ssh-keygen-ikiwiki-${owner}":
           command => "ssh-keygen -t rsa -P '' -f ${home}/.ssh/id_rsa",
           creates => "${home}/.ssh/id_rsa",
@@ -86,13 +77,14 @@ define ikiwiki::instance(
         }
       }
 
-      # See http://rtime.felk.cvut.cz/~sojka/blog/using-ikiwiki-with-gitolite/
       file { "${ikiwiki::git_folder}/${name}.git/hooks/post-update":
         ensure  => present,
         owner   => $owner,
         group   => $ikiwiki::git_implementation,
         mode    => 6550,
-        require => File["/etc/ikiwiki/$name.setup"],
+        require => File["/etc/ikiwiki/$name.setup"
+                        "${ikiwiki::sites_folder}/${name}/ikiwiki",
+                        "${ikiwiki::sites_folder}/${name}/ikiwiki_src"],
       }
 
       file { "${ikiwiki::sites_folder}/${name}/ikiwiki/ikiwiki.cgi":
@@ -100,7 +92,9 @@ define ikiwiki::instance(
         owner   => $owner,
         group   => $ikiwiki::www_user,
         mode    => 6550,
-        require => File["/etc/ikiwiki/$name.setup"],
+        require => File["/etc/ikiwiki/$name.setup"
+                        "${ikiwiki::sites_folder}/${name}/ikiwiki",
+                        "${ikiwiki::sites_folder}/${name}/ikiwiki_src"],
       }
     }
     'absent': {