diff --git a/setup.sh b/setup.sh index c03cdb3..d7f5c0c 100755 --- a/setup.sh +++ b/setup.sh @@ -117,11 +117,6 @@ if [ ! -e ./.env ]; then read -p "FQDN to be used (for reverse proxy) [$value_default]: " new_value FQDN=${new_value:-$value_default} - LOCALIP=$(ip route get 1 | sed -n 's/^.*src \([0-9.]*\) .*$/\1/p') - value_default="$LOCALIP" - read -p "IP of your primary network interface (used to ensure to always resolve the FQDN) [$value_default]: " new_value - FQDNIP=${new_value:-$value_default} - value_default="self_signed" read -p "Email address to use for Lets Encrypt. Use 'self_signed' as your email to create self signed certificates. @@ -318,7 +313,6 @@ HTTPS=443 LDAPPORT=389 # Settings for test environments -EXTRAHOSTS=$FQDN:$FQDNIP INSECURE=$INSECURE # Docker Repository to push to/pull from diff --git a/web/Dockerfile b/web/Dockerfile index 53381c9..d1388b0 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -3,6 +3,9 @@ FROM kopano/kwebd:${CODE_VERSION} ARG CODE_VERSION ENV CODE_VERSION="${CODE_VERSION}" +ENV KWEBD_USER root +ENV KWEBD_GROUP root +USER root COPY wrapper.sh /usr/local/bin COPY kweb.cfg /etc/kweb.cfg diff --git a/web/kweb.cfg b/web/kweb.cfg index c18baff..19455bc 100644 --- a/web/kweb.cfg +++ b/web/kweb.cfg @@ -1,8 +1,8 @@ -:8080 { +:80 { redir / https://{host}{uri} } -*, :8443 { +*, :443 { log stdout errors stdout