Use full URLs for CGI and authentiation urls
authorTuomas Jormola <tj@solitudo.net>
Thu, 14 Jul 2011 09:52:35 +0000 (12:52 +0300)
committerTuomas Jormola <tj@solitudo.net>
Thu, 14 Jul 2011 09:52:35 +0000 (12:52 +0300)
conf/master.conf
conf/shakti.conf

index 8004f0a..a71e82c 100644 (file)
@@ -6,6 +6,6 @@ IKIWIKI_STATEDIR=$VAR_DIR/ikiwiki/statedir
 IKIWIKI_LIBDIR=$VAR_DIR/ikiwiki/lib
 IKIWIKI_UNDERLAYDIRS="/var/local/www/solitudo.net/var/ikiwiki/private"
 IKIWIKI_URL=http://solitudo.net
-IKIWIKI_CGIURL=/ikiwiki.cgi
-IKIWIKI_AUTHURL=/ikiwiki.cgi/auth
+IKIWIKI_CGIURL=$IKIWIKI_URL/ikiwiki.cgi
+IKIWIKI_AUTHURL=$IKIWIKI_URL/ikiwiki.cgi/auth
 IKIWIKI_GIT_WRAPPER=$IKIWIKI_CHECKOUTDIR/.git/hooks/post-commit
index 9f38658..a5fa021 100644 (file)
@@ -7,5 +7,5 @@ IKIWIKI_STATEDIR=$VAR_DIR/ikiwiki/statedir
 IKIWIKI_LIBDIR=$VAR_DIR/ikiwiki/lib
 IKIWIKI_UNDERLAYDIRS="/home/staff/tj/prj/solitudo.net-private"
 IKIWIKI_URL=http://shakti.solitudo.net/solitudo
-IKIWIKI_CGIURL=/solitudo/ikiwiki.cgi
+IKIWIKI_CGIURL=$IKIWIKI_URL/ikiwiki.cgi
 IKIWIKI_AUTHURL=/solitudo/ikiwiki.cgi/auth