From 3de8599c9675a8886d194088c94312ee5ce2bca1 Mon Sep 17 00:00:00 2001
From: TNE <tne@garudalinux.org>
Date: Tue, 19 Apr 2022 20:23:26 +0200
Subject: [PATCH] Move from ./repo to ./http-root/chaotic-aur

This allows nginx to be used for other stuff too
---
 docker-compose-tunnels.yml         |  6 +++---
 docker-compose.yml                 |  4 ++--
 preset/conf.d-tunnels/chaotic.conf |  2 +-
 preset/conf.d/chaotic.conf         |  2 +-
 run                                | 13 ++++++++++---
 stop                               | 11 +++++++++++
 6 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100755 stop

diff --git a/docker-compose-tunnels.yml b/docker-compose-tunnels.yml
index 2c313e0..f51adf2 100644
--- a/docker-compose-tunnels.yml
+++ b/docker-compose-tunnels.yml
@@ -5,7 +5,7 @@ services:
     restart: unless-stopped
     hostname: ${DOMAIN_NAME:?err}
     volumes:
-      - './repo:/var/lib/nginx/html/repo/chaotic-aur:ro'
+      - './http-root:/var/lib/nginx/html/http-root:ro'
       - './data/acme-webroot:/var/lib/nginx/html/acme:ro'
       - './data/letsencrypt/etc:/etc/letsencrypt:ro'
       - './preset/nginx.conf:/etc/nginx/nginx.conf:ro'
@@ -22,7 +22,7 @@ services:
       - TZ=Europe/London
     volumes:
         - './data/syncthing:/config'
-        - './repo:/repo'
+        - './http-root/chaotic-aur:/repo'
     ports:
       - 8384:8384
       - 22000:22000/tcp
@@ -31,7 +31,7 @@ services:
     restart: unless-stopped
 
   cloudflared:
-    image: cloudflare/cloudflared:2022.2.2
+    image: cloudflare/cloudflared:2022.4.1
     container_name: cloudflared
     command: tunnel run --url http://nginx ${DOMAIN_NAME:?err}
     user: root
diff --git a/docker-compose.yml b/docker-compose.yml
index 06923cf..606ca3b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     restart: unless-stopped
     hostname: ${DOMAIN_NAME:?err}
     volumes:
-      - './repo:/var/lib/nginx/html/repo/chaotic-aur:ro'
+      - './http-root:/var/lib/nginx/html/http-root:ro'
       - './data/acme-webroot:/var/lib/nginx/html/acme:ro'
       - './data/letsencrypt/etc:/etc/letsencrypt:ro'
       - './preset/nginx.conf:/etc/nginx/nginx.conf:ro'
@@ -29,7 +29,7 @@ services:
       - TZ=Europe/London
     volumes:
         - './data/syncthing:/config'
-        - './repo:/repo'
+        - './http-root/chaotic-aur:/repo'
     ports:
       - 8384:8384
       - 22000:22000/tcp
diff --git a/preset/conf.d-tunnels/chaotic.conf b/preset/conf.d-tunnels/chaotic.conf
index 986be85..4324f9c 100644
--- a/preset/conf.d-tunnels/chaotic.conf
+++ b/preset/conf.d-tunnels/chaotic.conf
@@ -4,7 +4,7 @@ server {
     autoindex_exact_size off;
     autoindex_format xml;
 
-    root /var/lib/nginx/html/repo;
+    root /var/lib/nginx/html/http-root;
     location ~* /chaotic-aur/x86_64/(?!.*chaotic-aur\.(db|files)).+\.tar.* {
         add_header Cache-Control "max-age=150, stale-while-revalidate=150, stale-if-error=86400";
     }
diff --git a/preset/conf.d/chaotic.conf b/preset/conf.d/chaotic.conf
index 3c196f6..201c239 100644
--- a/preset/conf.d/chaotic.conf
+++ b/preset/conf.d/chaotic.conf
@@ -7,7 +7,7 @@ server {
     autoindex_exact_size off;
     autoindex_format xml;
 
-    root /var/lib/nginx/html/repo;
+    root /var/lib/nginx/html/http-root;
     location ~* /chaotic-aur/x86_64/(?!.*chaotic-aur\.(db|files)).+\.tar.* {
         add_header Cache-Control "max-age=150, stale-while-revalidate=150, stale-if-error=86400";
     }
diff --git a/run b/run
index 1a52b21..e589eea 100755
--- a/run
+++ b/run
@@ -35,9 +35,16 @@ elif [ ! -e "./data/cloudflared/home/.cloudflared/cert.pem" ]; then
   docker-compose -f docker-compose-tunnels.yml run --rm cloudflared tunnel route dns $DOMAIN_NAME $DOMAIN_NAME
 fi
 
-if [ ! -e ./repo ]; then
-  mkdir -p ./repo/.stfolder
-  chown -R 1000:1000 ./repo
+if [ ! -e ./http-root/chaotic-aur ]; then
+  # Convert legacy
+  if [ -d ./repo ]; then
+    ./stop
+    mkdir ./http-root
+    mv ./repo ./http-root/chaotic-aur
+  else
+    mkdir -p ./http-root/chaotic-aur/.stfolder
+    chown -R 1000:1000 ./http-root/chaotic-aur/
+  fi
 fi
 
 if [ ! -e ./data/syncthing/config.xml ]; then
diff --git a/stop b/stop
new file mode 100755
index 0000000..9e64ae6
--- /dev/null
+++ b/stop
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+if [[ $EUID -ne 0 ]]; then
+    echo Run as root!
+    exit 1
+fi
+
+docker-compose -f docker-compose.yml down
+docker-compose -f docker-compose-tunnels.yml down