From 32beedf5dcdc99b60c7b74e5b05d7d74575fd1fe Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <elizabeth.hunt@simponic.xyz>
Date: Fri, 12 Jan 2024 23:50:49 -0700
Subject: [PATCH] forgor that i made it like literally one server per conf

---
 .../files/levi/http.simponic.xyz.conf         | 13 ++++++++++
 .../files/levi/http.static.simponic.xyz.conf  |  1 -
 .../files/levi/https.simponic.xyz.conf        | 25 ++++++++++++++++++
 .../files/levi/https.static.simponic.xyz.conf | 26 -------------------
 4 files changed, 38 insertions(+), 27 deletions(-)
 create mode 100644 roles/webservers/files/levi/http.simponic.xyz.conf
 create mode 100644 roles/webservers/files/levi/https.simponic.xyz.conf

diff --git a/roles/webservers/files/levi/http.simponic.xyz.conf b/roles/webservers/files/levi/http.simponic.xyz.conf
new file mode 100644
index 0000000..b2686c9
--- /dev/null
+++ b/roles/webservers/files/levi/http.simponic.xyz.conf
@@ -0,0 +1,13 @@
+server {
+  listen 80;
+  server_name simponic.xyz;
+
+  location /.well-known/acme-challenge {
+    root /var/www/letsencrypt;
+    try_files $uri $uri/ =404;
+  }
+
+  location / {
+    rewrite ^ https://simponic.xyz$request_uri? permanent;
+  }
+}
diff --git a/roles/webservers/files/levi/http.static.simponic.xyz.conf b/roles/webservers/files/levi/http.static.simponic.xyz.conf
index 7572d31..648c2db 100644
--- a/roles/webservers/files/levi/http.static.simponic.xyz.conf
+++ b/roles/webservers/files/levi/http.static.simponic.xyz.conf
@@ -1,7 +1,6 @@
 server {
   listen 80;
   server_name static.simponic.xyz;
-  server_name simponic.xyz;
 
   location /.well-known/acme-challenge {
     root /var/www/letsencrypt;
diff --git a/roles/webservers/files/levi/https.simponic.xyz.conf b/roles/webservers/files/levi/https.simponic.xyz.conf
new file mode 100644
index 0000000..09c59ce
--- /dev/null
+++ b/roles/webservers/files/levi/https.simponic.xyz.conf
@@ -0,0 +1,25 @@
+server {
+  listen 443 ssl;
+  server_name simponic.xyz;
+
+  ssl_certificate         /etc/letsencrypt/live/simponic.xyz/fullchain.pem;
+  ssl_certificate_key     /etc/letsencrypt/live/simponic.xyz/privkey.pem;
+  ssl_trusted_certificate /etc/letsencrypt/live/simponic.xyz/fullchain.pem;
+
+  ssl_session_cache shared:SSL:50m;
+  ssl_session_timeout 5m;
+  ssl_stapling on;
+  ssl_stapling_verify on;
+
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
+
+  ssl_dhparam /etc/nginx/dhparams.pem;
+  ssl_prefer_server_ciphers on;
+
+  root /var/www/html/static.simponic.xyz;
+
+  location / {
+    try_files $uri $uri/ $uri.html =404;
+  }
+}
diff --git a/roles/webservers/files/levi/https.static.simponic.xyz.conf b/roles/webservers/files/levi/https.static.simponic.xyz.conf
index 407b5a5..6ac8806 100644
--- a/roles/webservers/files/levi/https.static.simponic.xyz.conf
+++ b/roles/webservers/files/levi/https.static.simponic.xyz.conf
@@ -23,29 +23,3 @@ server {
     try_files $uri $uri/ $uri.html =404;
   }
 }
-
-server {
-  listen 443 ssl;
-  server_name simponic.xyz;
-
-  ssl_certificate         /etc/letsencrypt/live/simponic.xyz/fullchain.pem;
-  ssl_certificate_key     /etc/letsencrypt/live/simponic.xyz/privkey.pem;
-  ssl_trusted_certificate /etc/letsencrypt/live/simponic.xyz/fullchain.pem;
-
-  ssl_session_cache shared:SSL:50m;
-  ssl_session_timeout 5m;
-  ssl_stapling on;
-  ssl_stapling_verify on;
-
-  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-  ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
-
-  ssl_dhparam /etc/nginx/dhparams.pem;
-  ssl_prefer_server_ciphers on;
-
-  root /var/www/html/simponic.xyz;
-
-  location / {
-    try_files $uri $uri/ $uri.html =404;
-  }
-}