summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf10
-rw-r--r--shib_secondary/remote/110-bwlp-passthrough.conf2
2 files changed, 9 insertions, 3 deletions
diff --git a/satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf b/satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf
index a4a2bdd..83859b7 100644
--- a/satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf
+++ b/satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf
@@ -15,6 +15,7 @@ server.username = "www-data"
server.groupname = "www-data"
server.port = 80
server.reject-expect-100-with-417 = "disable"
+server.max-keep-alive-idle = 10
index-file.names = ( "index.php", "index.html" )
@@ -32,6 +33,11 @@ include "/etc/lighttpd/conf-enabled/*.conf"
# Check if server.pem exists, if so output configuration block for HTTPS
include_shell "/usr/share/lighttpd/auto-ssl.sh"
+# Fow CoW editing
+$HTTP["url"] =~ "^/cow/" {
+ proxy.server = ( "" => (( "host" => "127.0.0.1", "port" => 9080 )) )
+}
+
url.rewrite-once = (
"^/*boot/+([a-z0-9_/-]+)/+config$" => "/slx-admin/api.php?do=getconfig&type=$1",
"^/*boot/+([a-z0-9_/-]+)/+config\?(.*)$" => "/slx-admin/api.php?$2&do=getconfig&type=$1",
@@ -41,8 +47,8 @@ url.rewrite-once = (
"^/*boot/+ipxe\?(.*)$" => "/slx-admin/api.php?$1&do=serversetup",
"^/*vmchooser/+list[^?]*$" => "/slx-admin/api.php?do=dozmod&resource=list",
"^/*vmchooser/+list[^?]*\?(.*)$" => "/slx-admin/api.php?$1&do=dozmod&resource=list",
- "^/*vmchooser/+lecture/+([^/]+)(\?|$)" => "/slx-admin/api.php?do=dozmod&resource=vmx&lecture=$1",
- "^/*vmchooser/+lecture/+([^/]+)/+([^/]+)(\?|$)" => "/slx-admin/api.php?do=dozmod&resource=$2&lecture=$1",
+ "^/*vmchooser/+lecture/+([^/]+)/+([^/]+)$" => "/slx-admin/api.php?do=dozmod&resource=$2&lecture=$1",
+ "^/*vmchooser/+lecture/+([^/]+)/+([^/]+)\?(.+)$" => "/slx-admin/api.php?do=dozmod&resource=$2&lecture=$1&$3",
"^/*vmchooser/+([^/]+)$" => "/slx-admin/api.php?do=news&type=$1",
"^/panel/([^?]{36})$" => "/slx-admin/?do=locationinfo&show=panel&uuid=$1",
"^/panel/([^?]*\.(js|css|png|svg))$" => "/slx-admin/$1",
diff --git a/shib_secondary/remote/110-bwlp-passthrough.conf b/shib_secondary/remote/110-bwlp-passthrough.conf
index 807d8f8..2a6cdba 100644
--- a/shib_secondary/remote/110-bwlp-passthrough.conf
+++ b/shib_secondary/remote/110-bwlp-passthrough.conf
@@ -30,7 +30,7 @@
Alias /shibboleth-sp/logo.jpg /usr/share/shibboleth/logo.jpg
SSLProxyEngine on
- <LocationMatch ^/(webif/|netboot/|minilinux/|rpc/|/Shibboleth\.sso/|error_report.php)(.*)$>
+ <LocationMatch ^/(webif/|netboot/|minilinux/|rpc/|Shibboleth\.sso/|error_report.php)(.*)$>
ProxyPassMatch "https://%DOMAIN%/$1$2" connectiontimeout=5 timeout=30 max=10
</LocationMatch>