Merge pull request #411 from nemchik/port-proto

Add Port and Proto variables

Author: aptalca

readme-vars.yml

@@ -125,6 +125,7 @@ app_setup_nginx_reverse_proxy_block: ""
 
 # changelog
 changelogs:
+  - { date: "05.03.20:", desc: "Use port and proto upstream variables for ldap and default sample confs." }
   - { date: "24.02.20:", desc: "Remove world/group read permissions in dns-conf." }
   - { date: "23.02.20:", desc: "Add aliyun dns validation plugin." }
   - { date: "28.01.20:", desc: "Deprecate tls-sni validation method, remove from docs." }

root/defaults/default

@@ -1,4 +1,4 @@
-## Version 2019/08/01 - Changelog: https://github.com/linuxserver/docker-letsencrypt/commits/master/root/defaults/default
+## Version 2020/03/05 - Changelog: https://github.com/linuxserver/docker-letsencrypt/commits/master/root/defaults/default
 
 # redirect all traffic to https
 server {
@@ -100,8 +100,10 @@ server {
 #
 #		include /config/nginx/proxy.conf;
 #		resolver 127.0.0.11 valid=30s;
-#		set $upstream_heimdall heimdall;
-#		proxy_pass https://$upstream_heimdall:443;
+#		set $upstream_app heimdall;
+#		set $upstream_port 443;
+#		set $upstream_proto https;
+#		proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 #	}
 #}
 

root/defaults/ldap.conf

@@ -1,19 +1,23 @@
-## Version 2018/08/10 - Changelog: https://github.com/linuxserver/docker-letsencrypt/commits/master/root/defaults/ldap.conf
+## Version 2020/03/05 - Changelog: https://github.com/linuxserver/docker-letsencrypt/commits/master/root/defaults/ldap.conf
 ## this conf is meant to be used in conjuntction with our ldap-auth image: https://github.com/linuxserver/docker-ldap-auth
 ## see the heimdall example in the default site config for info on enabling ldap auth
 ## for further instructions on this conf, see https://github.com/nginxinc/nginx-ldap-auth
 
     location /login {
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ldap ldap-auth;
-        proxy_pass http://$upstream_ldap:9000;
+        set $upstream_app ldap-auth;
+        set $upstream_port 9000;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
         proxy_set_header X-Target $request_uri;
     }
 
     location = /auth {
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ldap ldap-auth;
-        proxy_pass http://$upstream_ldap:8888;
+        set $upstream_app ldap-auth;
+        set $upstream_port 8888;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
         proxy_pass_request_body off;
         proxy_set_header Content-Length "";