Merge pull request #14 from valiantlynx/working

-d svelte-rich-text.{{ domain }}
valiantlynx · Mar 21, 2024 · 3f927f7 · 3f927f7
2 parents c4ec0b5 + 10ce3e1
commit 3f927f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ansible/roles/docker_deploy/templates/docker/docker-compose.certbot.yml.j2 b/ansible/roles/docker_deploy/templates/docker/docker-compose.certbot.yml.j2
@@ -13,7 +13,7 @@ services:
     command: >
       certonly --webroot -w /var/www/certbot --force-renewal --email valiantlynxz@gmail.com
       {% for domain in cloudflare_zone_ids.keys() %}
-      -d {{ domain }} -d www.{{ domain }}
+      -d svelte-rich-text.{{ domain }}
       {% endfor %}
       --agree-tos --non-interactive
 networks:

diff --git a/ansible/roles/docker_deploy/templates/nginx/http.conf.j2 b/ansible/roles/docker_deploy/templates/nginx/http.conf.j2
@@ -9,7 +9,7 @@ http {
     # Configuration for astromanga.com
     server {
         listen 80;
-        server_name server_name {% for domain in cloudflare_zone_ids.keys() %}{{ domain }} www.{{ domain }} {% endfor %};
+        server_name server_name {% for domain in cloudflare_zone_ids.keys() %}svelte-rich-text.{{ domain }} {% endfor %};
 
         location / {
             proxy_pass http://svelte-rich-text:3000;

diff --git a/ansible/roles/docker_deploy/templates/nginx/https.conf.j2 b/ansible/roles/docker_deploy/templates/nginx/https.conf.j2
@@ -9,18 +9,18 @@ http {
     # Always redirect HTTP to HTTPS
     server {
         listen 80;
-        server_name server_name {% for domain in cloudflare_zone_ids.keys() %}{{ domain }} www.{{ domain }} {% endfor %};
+        server_name server_name {% for domain in cloudflare_zone_ids.keys() %}svelte-rich-text.{{ domain }} {% endfor %};
         return 301 https://$host$request_uri;
     }
     # Configuration for astromanga.com
     server {
         listen 443 ssl http2;
-        server_name server_name {% for domain in cloudflare_zone_ids.keys() %}{{ domain }} www.{{ domain }} {% endfor %};
+        server_name server_name {% for domain in cloudflare_zone_ids.keys() %}svelte-rich-text.{{ domain }} {% endfor %};
 
         # Use the first domain in the list for SSL certificate paths
         {% set primary_domain = cloudflare_zone_ids.keys() | list | first %}
-        ssl_certificate /etc/letsencrypt/live/{{ primary_domain }}/fullchain.pem;
-        ssl_certificate_key /etc/letsencrypt/live/{{ primary_domain }}/privkey.pem;
+        ssl_certificate /etc/letsencrypt/live/svelte-rich-text.{{ primary_domain }}/fullchain.pem;
+        ssl_certificate_key /etc/letsencrypt/live/svelte-rich-text.{{ primary_domain }}/privkey.pem;
         # include /etc/letsencrypt/options-ssl-nginx.conf; # Recommended SSL settings
         # ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # DH parameters