Adding $base_url; minor fix

diff --git a/manifests/init.pp b/manifests/init.pp
index 20561d81e1c8f86c2494b260a3b7686bb4a9c6b9..30fb521ae2c814267c15022c0a28f8407f6da731 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,13 +15,20 @@ class ikiwiki {
     mode    => 755,
   }
 
-  define instance($ensure = 'present') {
+  define instance($base_url = false, $ensure = 'present') {
+
+    $ikiwiki_base = $base_url ? {
+      false   => $domain,
+      default => $base_url,
+    }
+
     file { "/etc/ikiwiki/$name.setup":
       ensure  => $ensure,
       content => template('ikiwiki/ikiwiki.setup.erb'),
       owner   => root,
       group   => root,
       mode    => 644,
+      notify  => Exec["ikiwiki --setup /etc/ikiwiki/$name.setup"],
     }
 
     case $ensure {
@@ -32,7 +39,7 @@ class ikiwiki {
         }
     
         exec { "/usr/local/sbin/ikiwiki-deploy $name":
-          unless  => "/bin/sh -c [ -f '${apache_sites_folder}/${name}/ikiwiki_src/index.mdw' ]",
+          unless  => "/bin/sh -c '[ -f ${apache_sites_folder}/${name}/ikiwiki_src/index.mdw ]'",
           user    => root,
         }
     

diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb
index 927e760d0696004bfd6829f89cf779c31acd5be0..c42a7e39b75f93cd1d29201e7f2ac0439045391e 100644 (file)
--- a/templates/ikiwiki.setup.erb
+++ b/templates/ikiwiki.setup.erb
@@ -14,8 +14,8 @@ use IkiWiki::Setup::Standard {
   srcdir => "<%= apache_sites_folder %>/<%= name %>/ikiwiki_src",
        destdir => "<%= apache_sites_folder %>/<%= name %>/ikiwiki",
 
-       url => "http://example.org/wiki",
-       cgiurl => "http://example.org/wiki/ikiwiki.cgi",
+  url => "http://<%= name %>.<%= ikiwiki_base %>",
+  cgiurl => "http://<%= name %>.<%= ikiwiki_base %>/ikiwiki.cgi",
        #templatedir => "/usr/share/ikiwiki/templates",
        #underlaydir => "/usr/share/ikiwiki/basewiki",