From 60d08dbd8131ec6fd40b222c6b5ce2135ea470da Mon Sep 17 00:00:00 2001
From: Firq <firelp42@gmail.com>
Date: Thu, 27 Jul 2023 22:52:35 +0200
Subject: [PATCH] moving dirs

---
 .gitlab-ci.yml | 24 ++++++++++++------------
 serve.json     | 22 ++++++++++++++--------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b838571..0bde5ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,11 +61,11 @@ deploy-site:
     - echo "Getting artifacts"
     - ls public
     - echo "Stopping screen session, cleaning"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S website-firq-npx kill; rm -r -f public/*;"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S website-firq-npx kill; rm -r -f firq_dev/public/*;"
     - echo "Copying to proxmox machine"
-    - rsync -az --stats public $DEPLOY_USER@$DEPLOY_HOST:~/.
+    - rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/public
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "find maintenance public -maxdepth 1 -printf '%p\n'; screen -S website-firq-npx -dm npx serve public/ -p 9000 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "cd firq_dev; find maintenance public -maxdepth 1 -printf '%p\n'; screen -S website-firq-npx -dm npx serve public/ -p 9000 -c serve.json"
     - echo "Website is up on https://firq.dev/"
 
 deploy-testing:
@@ -80,11 +80,11 @@ deploy-testing:
     - echo "Getting artifacts"
     - ls public
     - echo "Stopping screen session, cleaning"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S staging-firq-npx kill; rm -r -f staging/*;"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S staging-firq-npx kill; rm -r -f firq_dev/staging/*;"
     - echo "Copying to proxmox machine"
-    - rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/staging
+    - rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/staging
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "find staging -maxdepth 1 -printf '%p\n'; screen -S staging-firq-npx -dm npx serve staging/ -p 9100 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "cd firq_dev; find staging -maxdepth 1 -printf '%p\n'; screen -S staging-firq-npx -dm npx serve staging/ -p 9100 -c serve.json"
     - echo "Staging environment is up!"
 
 unlighthouse:
@@ -119,11 +119,11 @@ unlighthouse-publish:
     - echo "Getting artifacts"
     - ls unlighthouse-reports
     - echo "Stopping screen session, cleaning"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S unlighthouse-results kill; rm -r -f unlighthouse/*;"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S unlighthouse-results kill; rm -r -f firq_dev/unlighthouse/*;"
     - echo "Copying to proxmox machine"
-    - rsync -az --stats unlighthouse-reports/* $DEPLOY_USER@$DEPLOY_HOST:~/unlighthouse
+    - rsync -az --stats unlighthouse-reports/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/unlighthouse
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "find unlighthouse -maxdepth 1 -printf '%p\n'; screen -S unlighthouse -dm npx serve unlighthouse/ -p 9101 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "cd firq_dev; find unlighthouse -maxdepth 1 -printf '%p\n'; screen -S unlighthouse -dm npx serve unlighthouse/ -p 9101 -c serve.json"
     - echo "Unlighthouse results are up!"
 
 success_notification:
@@ -181,7 +181,7 @@ redeploy-site:
     - echo "Stopping screen session"
     - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S website-firq-npx kill" || true
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S website-firq-npx -dm npx serve public/ -p 9000 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S website-firq-npx -dm npx serve firq_dev/public/ -p 9000 -c serve.json"
     - echo "Website is up on https://firq.dev/"
 
 redeploy-staging:
@@ -196,7 +196,7 @@ redeploy-staging:
     - echo "Stopping screen session"
     - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S staging-firq-npx kill" || true
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S staging-firq-npx -dm npx serve staging/ -p 9100 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S staging-firq-npx -dm npx serve firq_dev/staging/ -p 9100 -c serve.json"
     - echo "Staging environment is up!"
 
 redeploy-unlighthouse:
@@ -211,7 +211,7 @@ redeploy-unlighthouse:
     - echo "Stopping screen session"
     - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S unlighthouse-results kill" || true
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S unlighthouse-results -dm npx serve unlighthouse/ -p 9101 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S unlighthouse-results -dm npx serve firq_dev/unlighthouse/ -p 9101 -c serve.json"
     - echo "Staging environment is up!"
 
 maintenance-deploy:
diff --git a/serve.json b/serve.json
index acf34e5..3eba146 100644
--- a/serve.json
+++ b/serve.json
@@ -1,14 +1,20 @@
 {
-  "directoryListing": ["/!assets/**"],
+  "cleanUrls": true,
+  "directoryListing": false,
+  "etag": true,
   "headers": [
     {
-      "source": "**/*.@(jpg|jpeg|gif|png|webp)",
-      "headers": [
-        {
-          "key": "Cache-Control",
-          "value": "no-cache"
-        }
-      ]
+      "source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)",
+      "headers" : [{
+        "key" : "Cache-Control",
+        "value" : "no-cache"
+      }]
+    }, {
+      "source" : "404.html",
+      "headers" : [{
+        "key" : "Cache-Control",
+        "value" : "no-cache"
+      }]
     }
   ]
 }