turris_base_url abstraction

utils/turris-diagnostics/files/lighttpd-diagnostics.conf

-$HTTP["url"] =~ "^/diagnostics" {
+$HTTP["url"] =^ turris_base_url {
+
+    $HTTP["url"] =^ turris_base_url + "diagnostics" {
 	fastcgi.server = ( "/" => ( turris_auth_scriptname => turris_auth ))
 	cgi.assign = ( "" => "" )
 	alias.url = ( "" => "/usr/libexec/web-diagnostics.sh" )
-}
-$HTTP["url"] =~ "^/baseauth/diagnostics" {
+    }
+
+    $HTTP["url"] =^ turris_base_url + "baseauth/diagnostics" {
 	auth.backend = "pam"
 	auth.require = ( "" => (
 		"method" => "basic",
@@ -12,4 +15,6 @@ $HTTP["url"] =~ "^/baseauth/diagnostics" {
 	))
 	cgi.assign = ( "" => "" )
 	alias.url = ( "" => "/usr/libexec/web-diagnostics.sh" )
+    }
+
 }

utils/turris-diagnostics/files/lighttpd-snapshots.conf

-$HTTP["url"] =~ "^/snapshot" {
+$HTTP["url"] =^ turris_base_url {
+
+    $HTTP["url"] =^ turris_base_url + "snapshot" {
 	fastcgi.server = ( "/" => ( turris_auth_scriptname => turris_auth ))
 	cgi.assign = ( "" => "" )
 	alias.url = ( "" => "/usr/libexec/web-snapshots.sh" )
-}
-$HTTP["url"] =~ "^/baseauth/snapshot" {
+    }
+
+    $HTTP["url"] =^ turris_base_url + "baseauth/snapshot" {
 	auth.backend = "pam"
 	auth.require = ( "" => (
 		"method" => "basic",
@@ -12,4 +15,6 @@ $HTTP["url"] =~ "^/baseauth/snapshot" {
 	))
 	cgi.assign = ( "" => "" )
 	alias.url = ( "" => "/usr/libexec/web-snapshots.sh" )
+    }
+
 }

web/reforis/reforis/files/reforis-lighttpd-dynamic.sh

@@ -3,10 +3,11 @@
 . /lib/functions.sh
 
 config_load reforis
-config_get SCRIPTNAME server scriptname "/reforis"
+config_get TURRIS_BASE_URL server turris_base_url "/"
+config_get SCRIPTNAME server scriptname "reforis"
 # config_get_bool DEBUG server debug "0"
 # config_get_bool NOAUTH auth noauth "0"
-config_get SESSION_TIMEOUT auth session_timeout ""
+# config_get SESSION_TIMEOUT auth session_timeout ""
 config_get SENTRY_DSN sentry dsn ""
 
 # scriptname must not contain escape codes (avoid CRLF injection in sed later)
@@ -22,11 +23,11 @@ config_get CREDENTIALS_FILE mqtt credentials_file "/etc/fosquitto/credentials.pl
 CONTROLLER_ID=$(crypto-wrapper serial-number)
 
 echo "var.reforis.bin = \"/usr/bin/reforis\""
-echo "var.reforis.scriptname = \"$SCRIPTNAME\""
+echo "var.reforis.scriptname = \"$TURRIS_BASE_URL$SCRIPTNAME\""
 
 echo
-echo "\$HTTP[\"url\"] =~ \"^\" + var.reforis.scriptname + \"/\" {"
-echo " \$HTTP[\"url\"] =~ \"^\" + var.reforis.scriptname + \"/static/\" {"
+echo "\$HTTP[\"url\"] =^ var.reforis.scriptname + \"/\" {"
+echo " \$HTTP[\"url\"] =^ var.reforis.scriptname + \"/static/\" {"
 echo "  alias.url += ( var.reforis.scriptname + \"/static/\" => \"/usr/lib/pythonX.X/site-packages/reforis_static/\" )"
 echo " } else {"
 echo "  server.max-read-idle = 90"