pillars/roles/nginx/nextcloud.sls

@@ -1,11 +1,10 @@
-
 nginx:
   cloud:
     auth: none
     https:
       port: 8080
       prot: http
-    nolocal: true
+
 portal:
   Misc:
     cloud:

states/roles/maintain/certbot/certbot.sh

@@ -1,6 +1,3 @@
 echo "Running certbot renew" > /root/scripts/certbot.log
 /bin/certbot renew >> /root/scripts/certbot.log
 echo "Finished certbot renew" >> /root/scripts/certbot.log
-echo "Copying certs to /secure" >> /root/scripts/certbot.log
-cp -rL /etc/letsencrypt/live/* /secure/certs/
-echo "Done copying certs to /secure" >> /root/scripts/certbot.log

states/roles/maintain/nginx-proxy/init.sls

@@ -49,8 +49,6 @@ nginx:
     - makedirs: true
   {%- if portal is defined %}
     - source: salt://roles/maintain/nginx-proxy/remote.conf
-  {%- elif pillar['nginx'][name]['nolocal'] is defined and pillar['nginx'][name]['nolocal'] == 'true' %}
-    - source: salt://roles/maintain/nginx-proxy/empty.conf
   {%- else %}
     - source: salt://roles/maintain/nginx-proxy/local.conf
   {%- endif %}

states/roles/maintain/nginx-proxy/local.conf

@@ -19,12 +19,13 @@
     {%- set prot = "https" -%}
   {%- endif -%}
 server {
-  listen 443 ssl;
+  listen 443;
   server_name {{server}}.actcur.com {{wildcard}};
 
 #  resolver {{ resolver }};
   set $backend "{{prot}}://127.0.0.1{%- if port is defined -%}:{{port}}{%- endif -%}";
 
+  ssl on;
   ssl_certificate /etc/nginx/certs/{{server}}.actcur.com/fullchain.pem;
   ssl_certificate_key /etc/nginx/certs/{{server}}.actcur.com/privkey.pem;
   ssl_session_cache shared:SSL:10m;

states/roles/maintain/nginx-proxy/portal.conf

@@ -1,11 +1,12 @@
 server {
 
-  listen 443 ssl default_server;
+  listen 443 default_server;
   server_name portal.actcur.com;
 
   resolver {{resolver}};
   set $certbot "https://salt.actcur.com";
 
+  ssl on;
   ssl_certificate /etc/nginx/certs/portal.actcur.com/fullchain.pem;
   ssl_certificate_key /etc/nginx/certs/portal.actcur.com/privkey.pem;
   ssl_session_cache shared:SSL:10m;

states/roles/maintain/nginx-proxy/remote.conf

@@ -12,13 +12,14 @@
 {%- endif -%}
 
 server {
-  listen 443 ssl;
+  listen 443;
   server_name {{server}}.actcur.com {{wildcard}};
 
   resolver {{resolver}};
   set $backend "https://{{server}}.actcur.com";
   set $certbot "https://salt.actcur.com";
 
+  ssl on;
   ssl_certificate /etc/nginx/certs/{{server}}.actcur.com/fullchain.pem;
   ssl_certificate_key /etc/nginx/certs/{{server}}.actcur.com/privkey.pem;
   ssl_session_cache shared:SSL:10m;