diff options
author | Simon Rettberg | 2017-03-29 10:52:58 +0200 |
---|---|---|
committer | Simon Rettberg | 2017-03-29 10:52:58 +0200 |
commit | 0321b94a6fba558b43751bd5d2a13831407b212d (patch) | |
tree | d5d931b1f3bb599751ebeb073d689c77531c26cf /satellit_installer/static_files | |
parent | [SSPS] Bring lighttpd SSL config up to date (diff) | |
download | setup-scripts-0321b94a6fba558b43751bd5d2a13831407b212d.tar.gz setup-scripts-0321b94a6fba558b43751bd5d2a13831407b212d.tar.xz setup-scripts-0321b94a6fba558b43751bd5d2a13831407b212d.zip |
[SSPS] lighttpd: Add support for HTTPS redirection
Diffstat (limited to 'satellit_installer/static_files')
-rwxr-xr-x | satellit_installer/static_files/lighttpd-auto-ssl.sh | 20 | ||||
-rw-r--r-- | satellit_installer/static_files/lighttpd.conf | 2 |
2 files changed, 17 insertions, 5 deletions
diff --git a/satellit_installer/static_files/lighttpd-auto-ssl.sh b/satellit_installer/static_files/lighttpd-auto-ssl.sh index d7221fe..b5ffc68 100755 --- a/satellit_installer/static_files/lighttpd-auto-ssl.sh +++ b/satellit_installer/static_files/lighttpd-auto-ssl.sh @@ -1,8 +1,10 @@ -#!/bin/sh +#!/bin/bash + +declare -rg CERT="/etc/lighttpd/server.pem" +declare -rg CHAIN="/etc/lighttpd/chain.pem" +declare -rg DHPARAM="/etc/lighttpd/dhparam.pem" +declare -rg REDIR_FLAG="/etc/lighttpd/redirect.flag" -CERT="/etc/lighttpd/server.pem" -CHAIN="/etc/lighttpd/chain.pem" -DHPARAM="/etc/lighttpd/dhparam.pem" if ! [ -s "$DHPARAM" ]; then openssl dhparam -out "$DHPARAM" 2048 >/dev/null 2>&1 fi @@ -43,5 +45,15 @@ HEREDOC [ -s "$DHPARAM" ] && echo " ssl.dh-file = \"$DHPARAM\"" echo "}" +[ -f "$REDIR_FLAG" ] && cat <<"HEREDOC" +$HTTP["scheme"] == "http" { + # capture vhost name with regex condition -> %0 in redirect pattern + # must be the most inner block to the redirect rule + $HTTP["host"] =~ ".*" { + url.redirect = ( "^/slx-admin/($|\?|index.php).*" => "https://%0$0" ) + } +} +HEREDOC + exit 0 diff --git a/satellit_installer/static_files/lighttpd.conf b/satellit_installer/static_files/lighttpd.conf index 40070f5..e201741 100644 --- a/satellit_installer/static_files/lighttpd.conf +++ b/satellit_installer/static_files/lighttpd.conf @@ -2,7 +2,7 @@ server.modules = ( "mod_access", # "mod_alias", "mod_compress", -# "mod_redirect", + "mod_redirect", "mod_rewrite", # "mod_proxy", ) |