From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 1 Feb 2010 00:40:12 +0000 (-0200)
Subject: Using base_url at setup template (2)
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=982f7235ee7a1b68ba7718e4546c834d4ec1f8a2;p=puppet-ikiwiki.git

Using base_url at setup template (2)
---

diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb
index fa2718f..3e7943c 100644
--- 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://<%= name %>.<%= ikiwiki_base %>",
-  cgiurl => "http://<%= name %>.<%= ikiwiki_base %>/ikiwiki.cgi",
+  url => "http://<%= name %>.<%= base_url %>",
+  cgiurl => "http://<%= name %>.<%= base_url %>/ikiwiki.cgi",
 	#templatedir => "/usr/share/ikiwiki/templates",
 	#underlaydir => "/usr/share/ikiwiki/basewiki",