From 13dd17a1468abc05a7bbda49e424b6a857ac01dc Mon Sep 17 00:00:00 2001 From: chbmb Date: Mon, 29 Apr 2019 20:45:38 +0100 Subject: [PATCH 1/3] Add quassel-web confs --- quassel-web.subdomain.conf.sample | 30 ++++++++++++++++++++++++++++++ quassel-web.subfolder.conf | 17 +++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 quassel-web.subdomain.conf.sample create mode 100644 quassel-web.subfolder.conf diff --git a/quassel-web.subdomain.conf.sample b/quassel-web.subdomain.conf.sample new file mode 100644 index 0000000..120c94f --- /dev/null +++ b/quassel-web.subdomain.conf.sample @@ -0,0 +1,30 @@ +# make sure that your dns has a cname set for quassel + +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name quassel.*; + + include /config/nginx/ssl.conf; + + client_max_body_size 0; + + # enable for ldap auth, fill in ldap details in ldap.conf + #include /config/nginx/ldap.conf; + + location / { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable the next two lines for ldap auth + #auth_request /auth; + #error_page 401 =200 /login; + + include /config/nginx/proxy.conf; + resolver 127.0.0.11 valid=30s; + set $upstream_quassel_web quassel-web; + proxy_pass https://$upstream_quassel_web:64443; + } +} diff --git a/quassel-web.subfolder.conf b/quassel-web.subfolder.conf new file mode 100644 index 0000000..ee5b6ef --- /dev/null +++ b/quassel-web.subfolder.conf @@ -0,0 +1,17 @@ +# Set base-url with docker run command env variable -e 'URL_BASE'='/quassel' + +location ^~ /quassel { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf + #auth_request /auth; + #error_page 401 =200 /login; + + include /config/nginx/proxy.conf; + resolver 127.0.0.11 valid=30s; + set $upstream_quassel_web quassel-web; + proxy_pass https://$upstream_quassel_web:64443; +} + From d359046bd91121cdbf04570ad4e260a35fd41ee2 Mon Sep 17 00:00:00 2001 From: chbmb Date: Sat, 18 May 2019 19:07:57 +0100 Subject: [PATCH 2/3] Update quassel-web.subfolder.conf --- quassel-web.subfolder.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quassel-web.subfolder.conf b/quassel-web.subfolder.conf index ee5b6ef..1e0b74b 100644 --- a/quassel-web.subfolder.conf +++ b/quassel-web.subfolder.conf @@ -1,4 +1,5 @@ -# Set base-url with docker run command env variable -e 'URL_BASE'='/quassel' +# Set base-url with docker run command env variable -e 'URL_BASE'='/quassel' and make sure Quassel-Web is running on http +# with -e 'HTTPS'='false' or if you're using -e 'ADVANCED'='true' by editing config.json appropriately location ^~ /quassel { # enable the next two lines for http auth @@ -12,6 +13,5 @@ location ^~ /quassel { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_quassel_web quassel-web; - proxy_pass https://$upstream_quassel_web:64443; + proxy_pass http://$upstream_quassel_web:64080; } - From 61ba8480451eaee78fc8233f36201b297949553d Mon Sep 17 00:00:00 2001 From: chbmb Date: Sat, 18 May 2019 19:08:49 +0100 Subject: [PATCH 3/3] Update quassel-web.subdomain.conf.sample --- quassel-web.subdomain.conf.sample | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/quassel-web.subdomain.conf.sample b/quassel-web.subdomain.conf.sample index 120c94f..3de6220 100644 --- a/quassel-web.subdomain.conf.sample +++ b/quassel-web.subdomain.conf.sample @@ -1,4 +1,5 @@ -# make sure that your dns has a cname set for quassel +# make sure that your dns has a cname set for quassel and make sure Quassel-Web is running on http +# with -e 'HTTPS'='false' or if you're using -e 'ADVANCED'='true' by editing config.json appropriately server { listen 443 ssl; @@ -25,6 +26,6 @@ server { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_quassel_web quassel-web; - proxy_pass https://$upstream_quassel_web:64443; + proxy_pass http://$upstream_quassel_web:64080; } }