Using base_url at setup template (2)

diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb
index fa2718f4824fb13108340194b6068c95f6444a05..3e7943cde54bf1fffccd73e140ac502c0b690dd5 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://<%= 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",