fixed lets encrypt

autocli.yml

@@ -2,6 +2,7 @@ auto_reload: 1
 confirm_quit: false
 
 modules: [auto.lib.docker, auto.lib.infrastructure]
+letsencrypt_email: thecere@gmail.com
 
 path:
     cache: t:\autocli_home\cache

ngp/Dockerfile

@@ -37,3 +37,5 @@ ENTRYPOINT ["/app/docker-entrypoint.sh"]
 
 CMD ["/opt/go/bin/forego", "start", "-r"]
 
+# compat with lets encrypt proxy volumes from detection
+ENV NGINX_VERSION=1

ngp/scripts/nginx.tmpl

@@ -74,7 +74,7 @@ server {
 {{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
 server {
 	server_name _; # This is just an invalid value which will never trigger on a real hostname.
-	listen 443 ssl http2;
+	listen 443 ssl;
 	access_log /var/log/nginx/access.log vhost;
 	return 503;
 
@@ -148,7 +148,7 @@ server {
 
 server {
 	server_name {{ $host }};
-	listen 443 ssl http2 {{ $default_server }};
+	listen 443 ssl {{ $default_server }};
 	access_log /var/log/nginx/access.log vhost;
 
 	# [dr]: increased from 1M default for uploads
@@ -240,7 +240,7 @@ server {
 {{ if (and (not $is_https) (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
 server {
 	server_name {{ $host }};
-	listen 443 ssl http2 {{ $default_server }};
+	listen 443 ssl {{ $default_server }};
 	access_log /var/log/nginx/access.log vhost;
 	return 500;
 

ngp_le/Dockerfile

@@ -3,7 +3,7 @@ FROM hypriot/rpi-alpine-scratch
 RUN apk update \
     && apk upgrade
 
-RUN apk add bash python git gcc musl-dev libffi-dev python-dev openssl-dev
+RUN apk add bash python git gcc musl-dev libffi-dev python-dev openssl-dev curl jq
 
 ENV DOCKER_GEN_VERSION=0.7.3 \
     DOCKER_HOST=unix:///var/run/docker.sock
@@ -21,7 +21,7 @@ RUN pip install requests
 
 # Get Let's Encrypt simp_le client source
 RUN mkdir -p /src
-RUN git -C /src clone https://github.com/kuba/simp_le.git
+RUN git -C /src clone https://github.com/zenhack/simp_le.git
 
 # Install simp_le in /usr/bin
 RUN cd /src/simp_le && \
@@ -39,4 +39,6 @@ ENV debug=false
 ENTRYPOINT ["/bin/bash", "/app/entrypoint.sh" ]
 CMD ["/bin/bash", "/app/start.sh"]
 
+
 COPY /app/ /app/
+RUN chmod u+x /app/letsencrypt_service && chmod u+x /app/update_certs

ngp_le/app/entrypoint.sh

@@ -70,7 +70,7 @@ function check_dh_group {
 
 source /app/functions.sh
 
-[[ $DEBUG == true ]] && set -x
+# [[ $DEBUG == true ]] && set -x
 
 if [[ "$*" == "/bin/bash /app/start.sh" ]]; then
     check_docker_socket

ngp_le/app/update_certs

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-pkill -f -SIGUSR1 /app/letsencrypt_service
+pkill -SIGUSR1 -f /app/letsencrypt_service

services.yml

@@ -9,7 +9,7 @@ domoticz:
     volumes:
       - /etc/localtime:/etc/localtime
       - /opt/fast/domoticz/domoticz.db:/root/domoticz/domoticz.db
-    ports: 8080:8080
+    #ports: 8080:8080
     devices: /dev/ttyUSB0
 
 # https://github.com/mkueper/rpi-svn/blob/master/Dockerfile
@@ -25,9 +25,9 @@ svn:
 ngp:
   host: himbeere
   docker:
-    - name: ngp
+    - name: nginx-proxy
       build: ngp
-      ports: 0.0.0.0:1080:80, 0.0.0.0:1443:443
+      ports: 192.168.178.43:1080:80, 192.168.178.43:1443:443
       volumes:
         - /usr/share/nginx/html
         - /var/run/docker.sock:/tmp/docker.sock:ro
@@ -40,9 +40,10 @@ ngp:
           method: exec
           cmd: cat /etc/nginx/conf.d/default.conf
           docs: show dockergen-generated config
+
     - name: ngp_le
       build: ngp_le
-      volumes_from: ngp
+      volumes_from: nginx-proxy
       volumes:
         - /opt/fast/nginx/certs:/etc/nginx/certs:rw
         - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -78,6 +79,6 @@ gogs:
   docker:
     image: gogs/gogs-rpi
     volumes: /opt/fast/gogs:/data
-    ports: 3000:3000, 3022:22
+    ports: 3022:22
     env:
       VIRTUAL_PORT: 3000