From 6f91dbf64caa2fb4a760b5592f070f1b3e0fbf76 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 28 Nov 2019 18:28:07 +0100
Subject: [PATCH] Proxy type defaults to https More unset

---
 CHANGELOG.md  | 5 +++++
 README.md     | 6 +++---
 entrypoint.sh | 8 +++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 141fdac..eead24d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 21137-RC4 (2019/11/28)
+
+* Proxy type defaults to `https`
+* More unset
+
 ## 21137-RC3 (2019/11/28)
 
 * Add env vars to set proxy settings (#21)
diff --git a/README.md b/README.md
index ea5ce89..ca937a9 100644
--- a/README.md
+++ b/README.md
@@ -45,11 +45,11 @@ Image: crazymax/jetbrains-license-server:latest
 ### Environment variables
 
 * `TZ`: The timezone assigned to the container (default `UTC`)
-* `PUID`: Process UID (default `1000`)
-* `PGID`: Process GID (default `1000`)
+* `PUID`: JLS UID (default `1000`)
+* `PGID`: JLS GID (default `1000`)
 * `JLS_VIRTUAL_HOSTS`: [Virtual hosts](https://www.jetbrains.com/help/license_server/setting_host_and_port.html#d1010e63) where license server will be available (comma delimited for several hosts)
 * `JLS_CONTEXT`:  [Context path](https://www.jetbrains.com/help/license_server/setting_host_and_port.html#d1010e63) used by the license server (default `/`)
-* `JLS_PROXY_TYPE`: Type of [proxy](https://www.jetbrains.com/help/license_server/configuring_proxy_settings.html) to use. Can be `http` or `https` (default `http`)
+* `JLS_PROXY_TYPE`: Type of [proxy](https://www.jetbrains.com/help/license_server/configuring_proxy_settings.html) to use. Can be `http` or `https` (default `https`)
 * `JLS_PROXY_HOST`: The host name of your proxy server
 * `JLS_PROXY_PORT`: The port number that the proxy server listens to
 * `JLS_PROXY_USER`: Username to connect to the proxy server (no auth if empty)
diff --git a/entrypoint.sh b/entrypoint.sh
index 32cc823..c36865e 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,7 +5,7 @@ JLS_LISTEN_ADDRESS="0.0.0.0"
 JLS_PORT=8000
 JLS_CONTEXT=${JLS_CONTEXT:-/}
 JLS_ACCESS_CONFIG=${JLS_ACCESS_CONFIG:-/data/access-config.json}
-JLS_PROXY_TYPE=${JLS_PROXY_TYPE:-http}
+JLS_PROXY_TYPE=${JLS_PROXY_TYPE:-https}
 
 if [ -n "${PGID}" ] && [ "${PGID}" != "$(id -g jls)" ]; then
   echo "Switching to PGID ${PGID}..."
@@ -46,10 +46,10 @@ if [ ! -z "$JLS_PROXY_HOST" -a ! -z "$JLS_PROXY_PORT" ]; then
     su-exec jls:jls license-server configure \
       -J-D${JLS_PROXY_TYPE}.proxyUser=${JLS_PROXY_USER} \
       -J-D${JLS_PROXY_TYPE}.proxyPassword=${JLS_PROXY_PASSWORD}
-    unset JLS_PROXY_USER
-    unset JLS_PROXY_PASSWORD
   fi
 fi
+unset JLS_PROXY_USER
+unset JLS_PROXY_PASSWORD
 
 # https://www.jetbrains.com/help/license_server/configuring_user_restrictions.html
 if [ -s "$JLS_ACCESS_CONFIG" ]; then
@@ -68,6 +68,8 @@ if [ ! -z "$JLS_SMTP_SERVER" -a ! -z "$JLS_STATS_RECIPIENTS" ]; then
     su-exec jls:jls license-server configure --smtp.server.username ${JLS_SMTP_USERNAME}
     su-exec jls:jls license-server configure --smtp.server.password ${JLS_SMTP_PASSWORD}
   fi
+  unset JLS_SMTP_USERNAME
+  unset JLS_SMTP_PASSWORD
 
   if [ ! -z "$JLS_STATS_FROM" ]; then
     echo "Setting stats sender to $JLS_STATS_FROM..."