aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-31 22:40:12 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-31 22:40:12 -0200
commit982f7235ee7a1b68ba7718e4546c834d4ec1f8a2 (patch)
tree6ed6be010ce3cf65182fc1b71cc622b14452293c
parenta42895a88de45fdef83528e8699f8ba5920fd9af (diff)
downloadpuppet-ikiwiki-982f7235ee7a1b68ba7718e4546c834d4ec1f8a2.tar.gz
puppet-ikiwiki-982f7235ee7a1b68ba7718e4546c834d4ec1f8a2.tar.bz2
Using base_url at setup template (2)
-rw-r--r--templates/ikiwiki.setup.erb4
1 files changed, 2 insertions, 2 deletions
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",