From c3de8dc57229f45e70c5b79fc701ed9643c59e4a Mon Sep 17 00:00:00 2001
From: Minecon724 <minecon724@noreply.git.m724.eu>
Date: Sat, 12 Apr 2025 16:30:01 +0200
Subject: [PATCH] Fix everything

---
 nginx/nginx.conf   |  6 +++---
 scripts/install.sh | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index efcc97d..843f492 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -42,7 +42,7 @@ http {
     ssl_prefer_server_ciphers off;
 
     # Make sure to generate it first
-    ssl_dhparam dhparam.pem;
+    ssl_dhparam /etc/ssl/dhparam.pem;
 
     # OCSP stapling
     ssl_stapling on;
@@ -72,8 +72,8 @@ http {
         server_name _;
 
         # Make sure to generate
-        ssl_certificate snakeoil.pem;
-        ssl_certificate_key snakeoil.key;
+        ssl_certificate /etc/ssl/snakeoil.pem;
+        ssl_certificate_key /etc/ssl/snakeoil.key;
     }
 
     include /etc/nginx/conf.d/*.conf;
diff --git a/scripts/install.sh b/scripts/install.sh
index 0d98e88..b24c5a2 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -4,10 +4,6 @@ cd "$(dirname "$0")/.."
 
 git submodule update --init
 
-echo "Please wait, this will take a few minutes"
-openssl dhparam -out nginx/dhparam.pem 3072
-openssl req -new -x509 -days 365 -noenc -out nginx/snakeoil.pem -keyout nginx/snakeoil.key -subj "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd"
-
 apt install -y python3-pyroute2
 if [ $? -ne 0 ]; then
   echo -e "\033[0;31mCouldn't install pyroute2. You must install it manually.\033[0m"
@@ -15,10 +11,17 @@ fi
 
 docker compose up -d acme
 
+
 docker compose exec acme mkdir /var/www/html/$DOMAIN
 docker compose exec acme mkdir /etc/ssl/$DOMAIN
-docker compose exec acme ln -s /etc/nginx/snakeoil.key /etc/ssl/$DOMAIN/key.pem
-docker compose exec acme ln -s /etc/nginx/snakeoil.pem /etc/ssl/$DOMAIN/fullchain.pem
+
+echo "Please wait, this will take a few minutes"
+docker compose exec acme openssl dhparam -out /etc/ssl/dhparam.pem 3072
+docker compose exec acme openssl req -new -x509 -days 365 -noenc -out /etc/ssl/snakeoil.pem -keyout /etc/ssl/snakeoil.key -subj "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd"
+
+docker compose exec acme ln -s /etc/ssl/snakeoil.key /etc/ssl/$DOMAIN/key.pem
+docker compose exec acme ln -s /etc/ssl/snakeoil.pem /etc/ssl/$DOMAIN/fullchain.pem
+
 
 docker compose down