Merge pull request #15 from linuxserver/proto-regression

Fix protocol regression

Author: thespad

README.md

@@ -87,13 +87,15 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Etc/UTC
-      - QUASSEL_CORE=192.168.1.10
-      - QUASSEL_PORT=4242
+      - QUASSEL_CORE=192.168.1.10 #optional
+      - QUASSEL_PORT=4242 #optional
+      - QUASSEL_HTTPS= #optional
       - URL_BASE=/quassel #optional
     volumes:
       - /path/to/data:/config
     ports:
-      - 64443:64443
+      - 64080:64080 #optional
+      - 64443:64443 #optional
     restart: unless-stopped
 ```
 
@@ -105,10 +107,12 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
-  -e QUASSEL_CORE=192.168.1.10 \
-  -e QUASSEL_PORT=4242 \
+  -e QUASSEL_CORE=192.168.1.10 `#optional` \
+  -e QUASSEL_PORT=4242 `#optional` \
+  -e QUASSEL_HTTPS= `#optional` \
   -e URL_BASE=/quassel `#optional` \
-  -p 64443:64443 \
+  -p 64080:64080 `#optional` \
+  -p 64443:64443 `#optional` \
   -v /path/to/data:/config \
   --restart unless-stopped \
   lscr.io/linuxserver/quassel-web:latest
@@ -120,12 +124,14 @@ Containers are configured using parameters passed at runtime (such as those abov
 
 | Parameter | Function |
 | :----: | --- |
+| `-p 64080` | Quassel-web http webui |
 | `-p 64443` | Quassel-web https webui |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
 | `-e QUASSEL_CORE=192.168.1.10` | specify the URL or IP address of your Quassel Core instance |
 | `-e QUASSEL_PORT=4242` | specify the port of your Quassel Core instance |
+| `-e QUASSEL_HTTPS=` | Set to `true` to have Quassel web serve over https on port 64443 instead of http on port 64080. |
 | `-e URL_BASE=/quassel` | Specify a url-base in reverse proxy setups ie. `/quassel` |
 | `-v /config` | this will store config on the docker host |
 

readme-vars.yml

@@ -15,17 +15,18 @@ param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
   - {vol_path: "/config", vol_host_path: "/path/to/data", desc: "this will store config on the docker host"}
-param_usage_include_env: true
-param_env_vars:
-  - {env_var: "QUASSEL_CORE", env_value: "192.168.1.10", desc: "specify the URL or IP address of your Quassel Core instance"}
-  - {env_var: "QUASSEL_PORT", env_value: "4242", desc: "specify the port of your Quassel Core instance"}
-param_usage_include_ports: true
-param_ports:
-  - {external_port: "64443", internal_port: "64443", port_desc: "Quassel-web https webui"}
-# optional container parameters
+param_usage_include_env: false
 opt_param_usage_include_env: true
 opt_param_env_vars:
+  - {env_var: "QUASSEL_CORE", env_value: "192.168.1.10", desc: "specify the URL or IP address of your Quassel Core instance"}
+  - {env_var: "QUASSEL_PORT", env_value: "4242", desc: "specify the port of your Quassel Core instance"}
+  - {env_var: "QUASSEL_HTTPS", env_value: "", desc: "Set to `true` to have Quassel web serve over https on port 64443 instead of http on port 64080."}
   - {env_var: "URL_BASE", env_value: "/quassel", desc: "Specify a url-base in reverse proxy setups ie. `/quassel`"}
+param_usage_include_ports: false
+opt_param_usage_include_ports: true
+opt_param_ports:
+  - {external_port: "64080", internal_port: "64080", port_desc: "Quassel-web http webui"}
+  - {external_port: "64443", internal_port: "64443", port_desc: "Quassel-web https webui"}
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: "By default this container webui will be available on `https://$SERVER_IP:64443`. To setup this container you can either use the environment variables we recommend or manually setup the configuration file by leaving out the `QUASSEL_CORE` environment variable among others. \nThe configuration file using this method can be found at:\n```\n/config/settings-user.js\n```\n"

root/etc/s6-overlay/s6-rc.d/init-quassel-web-config/run

@@ -33,14 +33,20 @@ done
 echo "QUASSEL_CORE set, injecting env variables into settings.cjs"
 cp -pr /app/quassel-web/settings.cjs /app/quassel-web/settings-env.cjs
 # Env variable injection
-    sed -i \
-        -e "s#host:.*//#host: '${QUASSEL_CORE}', //#g" \
-        -e "s#port:.*,// quasselcore#port: ${QUASSEL_PORT}, // quasselcore#g" \
-        /app/quassel-web/settings-env.cjs && \
+sed -i \
+    -e "s#host:.*//#host: '${QUASSEL_CORE}', //#g" \
+    -e "s#port:.*,// quasselcore#port: ${QUASSEL_PORT}, // quasselcore#g" \
+    /app/quassel-web/settings-env.cjs && \
 if [[ "${URL_BASE+x}" ]]; then
     sed -i "s#prefixpath:.*//#prefixpath: \'${URL_BASE}\', //#g"
     /app/quassel-web/settings-env.cjs
 fi
+if [[ -z "${QUASSEL_HTTPS}" ]]; then
+    sed -i \
+        -e "s#mode:.*// can be 'http'#mode: 'http', // can be 'http'#g" \
+        -e "s#port:.*// Port on which to listen#port: 64080, // Port on which to listen#g" \
+        /app/quassel-web/settings-env.cjs
+fi
 
 # file permissions
 chownfiles

root/etc/s6-overlay/s6-rc.d/svc-quassel-web/run

@@ -9,6 +9,14 @@ fi
 
 export NODE_ENV=production
 
-exec \
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 64443" \
-        cd /app/quassel-web s6-setuidgid abc node app.js --config "${CONFIG}"
+PORT=$(sed -n '/webserver: {/,/},/p' "${CONFIG}" | grep 'port:' | awk -F ':' '{print $2}' | cut -f1 -d ',' | tr -d '[:space:]')
+
+if [[ "${PORT}" != "null" ]]; then
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${PORT}" \
+            cd /app/quassel-web s6-setuidgid abc node app.js --config "${CONFIG}"
+else
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 -c "true" \
+            cd /app/quassel-web s6-setuidgid abc node app.js --config "${CONFIG}"
+fi