Run certbot

2 files changed, 26 insertions, 5 deletions

diff --git a/templates/etc_periodic.conf.j2 b/templates/etc_periodic.conf.j2
index 22602c2..0e70471 100644
--- a/templates/etc_periodic.conf.j2
+++ b/templates/etc_periodic.conf.j2
@@ -1 +1,2 @@
 daily_status_smart_enable="YES"
+weekly_certbot_enable="YES"
diff --git a/templates/usr_local_etc_nginx_nginx.conf.j2 b/templates/usr_local_etc_nginx_nginx.conf.j2
index 692f5a2..fcdaf02 100644
--- a/templates/usr_local_etc_nginx_nginx.conf.j2
+++ b/templates/usr_local_etc_nginx_nginx.conf.j2
@@ -20,21 +20,41 @@ http {
         }
     }
 
+    {% for site in static_sites -%}
+    {% if site.tls -%}
     server {
-        listen 80;
-        server_name jan.systems pursotin.jan.systems local.jan.systems;
+        listen 443 ssl;
+        server_name {{ site.host }};
 
-        root /usr/local/www/jan.systems;
+        root /usr/local/www/{{ site.site }};
         index index.html;
 
         location / {
             try_files $uri $uri.html $uri/ =404;
         }
 
-        access_log /var/log/nginx/jan.systems/access.log;
-        error_log /var/log/nginx/jan.systems/error.log;
+        access_log /var/log/nginx/{{ site.site }}/access.log;
+        error_log /var/log/nginx/{{ site.site }}/error.log;
+
+        ssl_certificate /usr/local/etc/letsencrypt/live/{{ site.host }}/fullchain.pem;
+        ssl_certificate_key /usr/local/etc/letsencrypt/live/{{ site.host }}/privkey.pem;
+        include /usr/local/etc/letsencrypt/options-ssl-nginx.conf;
+        ssl_dhparam /usr/local/etc/letsencrypt/ssl-dhparams.pem;
+    }
+
+    {% endif -%}
+
+    server {
+        listen 80;
+        server_name {{ site.host }};
+
+        return 301 https://$host$request_uri;
+
+        access_log /var/log/nginx/{{ site.site }}/access.log;
+        error_log /var/log/nginx/{{ site.site }}/error.log;
     }
 
+    {% endfor -%}
     {% for jail in jails -%}
     server {
         listen 80;