start using the new certs, directly from le path

Author: vigneshsarma

salt/roots/pythonexpress/pythonexpress.org.conf

@@ -21,13 +21,13 @@ server {
         return 200 "User-agent: * Disallow:";
     }
 
-    # {% if not ssl['on'] %}
-    # include /etc/nginx/sites-available/pythonexpress.org/*.conf;
-    # {% else %}
-    # location / {
-    #     rewrite ^/(.*) https://pythonexpress.org/$1 permanent;
-    # }
-    # {% endif %}
+    {% if not ssl['on'] %}
+    include /etc/nginx/sites-available/pythonexpress.org/*.conf;
+    {% else %}
+    location / {
+        rewrite ^/(.*) https://pythonexpress.org/$1 permanent;
+    }
+    {% endif %}
 }
 
 {% if ssl['on'] %}

salt/roots/pythonexpress/pythonexpress.org.with_ssl.conf

@@ -10,8 +10,8 @@ if ($scheme = http) {
     rewrite ^(.*) https://$server_name$1 permanent;
 }
 
-ssl_certificate /etc/ssl/pythonexpress.org.crt;
-ssl_certificate_key /etc/ssl/pythonexpress.org.key;
+ssl_certificate /etc/letsencrypt/live/pythonexpress.org/fullchain.pem;
+ssl_certificate_key /etc/letsencrypt/live/pythonexpress.org/privkey.pem;
 
 # Recomended settings form
 # https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html