# # # patch "htaccess" # from [26d297563036d691d1f930492d5eda382ad8fedd] # to [2d7b0cbd638b1136b192755f4ff5517e40478e4c] # # patch "install" # from [551ef53d72d37ceaf3ad34c0f0854886e9c6806b] # to [523edf6f74f237f03f38d662111c1280b75a004f] # # patch "install-config.dist" # from [041ff1bfa044470e29bbc2be1986d196c13384e2] # to [6f2f3e4ed37b681f28abac4ebc5f7d972e568793] # ============================================================ --- htaccess 26d297563036d691d1f930492d5eda382ad8fedd +++ htaccess 2d7b0cbd638b1136b192755f4ff5517e40478e4c @@ -7,11 +7,11 @@ Options +ExecCGI RewriteEngine on - RewriteCond %{REQUEST_URI} ^/NAME/viewmtn/$ - RewriteRule ^(.*)$ /NAME/ [L,R=seeother] + RewriteCond %{REQUEST_URI} ^WEBPATH/viewmtn/$ + RewriteRule ^(.*)$ WEBPATH/ [L,R=seeother] RewriteCond %{REQUEST_URI} !^(/.*)+viewmtn.py/ - RewriteCond %{REQUEST_URI} !^/NAME/viewmtn/static/.* + RewriteCond %{REQUEST_URI} !^WEBPATH/viewmtn/static/.* RewriteRule ^(.*)$ viewmtn.py/$1 [PT] ============================================================ --- install 551ef53d72d37ceaf3ad34c0f0854886e9c6806b +++ install 523edf6f74f237f03f38d662111c1280b75a004f @@ -76,7 +76,7 @@ do_install() { # The main directory migh just have gotten destroyed, let's recreate it mkdir -p $WWWDIR/ (cd www; tar -cf - .) | (cd $WWWDIR; tar -xf -) - sed -e "s!NAME!$NAME!" \ + sed -e "s!WEBPATH!$WEBPATH!" \ < htaccess > $WWWDIR/viewmtn/.htaccess chmod -R a+r $WWWDIR/ echo "Copied www/... to $WWWDIR/..." ============================================================ --- install-config.dist 041ff1bfa044470e29bbc2be1986d196c13384e2 +++ install-config.dist 6f2f3e4ed37b681f28abac4ebc5f7d972e568793 @@ -21,3 +21,7 @@ address@hidden HOSTNAME=$(hostname) address@hidden + +# The web interface is at http://$HOSTNAME/$WEBPATH/ +# If it's not empty, it should include the leading slash. +WEBPATH=/$NAME