integration - continue work on storageless config for k8s and swarm

helpers/install.sh

@@ -820,6 +820,7 @@ do_and_check_cmd chmod 750 /opt/bunkerized-nginx/entrypoint/*
 do_and_check_cmd chmod 750 /opt/bunkerized-nginx/gen/main.py
 do_and_check_cmd chmod 750 /opt/bunkerized-nginx/jobs/main.py
 do_and_check_cmd chmod 750 /opt/bunkerized-nginx/jobs/reload.py
+do_and_check_cmd chmod 750 /opt/bunkerized-nginx/jobs/certbot-*.sh
 # Set permissions for /usr/local/bin/bunkerized-nginx
 do_and_check_cmd chown root:root /usr/local/bin/bunkerized-nginx
 do_and_check_cmd chmod 750 /usr/local/bin/bunkerized-nginx

helpers/kubernetes-nginx.yml

@@ -37,31 +37,10 @@ spec:
         - name: MULTISITE
           value: "yes"
         volumeMounts:
-        - name: confs
-          mountPath: /etc/nginx
-          readOnly: true
-        - name: letsencrypt
-          mountPath: /etc/letsencrypt
-          readOnly: true
-        - name: acme-challenge
-          mountPath: /acme-challenge
-          readOnly: true
         - name: www
           mountPath: /www
           readOnly: true
       volumes:
-      - name: confs
-        hostPath:
-          path: /shared/confs
-          type: Directory
-      - name: letsencrypt
-        hostPath:
-          path: /shared/letsencrypt
-          type: Directory
-      - name: acme-challenge
-        hostPath:
-          path: /shared/acme-challenge
-          type: Directory
       - name: www
         hostPath:
           path: /shared/www
@@ -108,22 +87,10 @@ spec:
         - name: API_URI
           value: "/ChangeMeToSomethingHardToGuess"
         volumeMounts:
-        - name: confs
-          mountPath: /etc/nginx
         - name: letsencrypt
           mountPath: /etc/letsencrypt
-        - name: acme-challenge
-          mountPath: /acme-challenge
       volumes:
-      - name: confs
-        hostPath:
-          path: /shared/confs
-          type: Directory
       - name: letsencrypt
         hostPath:
           path: /shared/letsencrypt
           type: Directory
-      - name: acme-challenge
-        hostPath:
-          path: /shared/acme-challenge
-          type: Directory

helpers/swarm.yml

@@ -14,10 +14,7 @@ services:
         mode: host
         protocol: tcp
     volumes:
-      - /shared/confs:/etc/nginx:ro
       - /shared/www:/www:ro
-      - /shared/letsencrypt:/etc/letsencrypt:ro
-      - /shared/acme-challenge:/acme-challenge:ro
     environment:
       - SWARM_MODE=yes
       - USE_API=yes
@@ -41,9 +38,7 @@ services:
     image: bunkerity/bunkerized-nginx-autoconf
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - /shared/confs:/etc/nginx
       - /shared/letsencrypt:/etc/letsencrypt
-      - /shared/acme-challenge:/acme-challenge
     environment:
       - SWARM_MODE=yes
       - API_URI=/ChangeMeToSomethingHardToGuess # must match API_URI from nginx