From 382bfad14c395529ad23611a7b7e1edf1a003835 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sun, 25 Feb 2024 12:57:44 +0200
Subject: [PATCH] Use bind mount for arch repo. Couldn't find another way past
 permission issues

---
 docker/caddy/docker-compose.toml | 3 +--
 root/etc/pacman.conf             | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml
index 7e2995c..f543159 100644
--- a/docker/caddy/docker-compose.toml
+++ b/docker/caddy/docker-compose.toml
@@ -3,7 +3,6 @@ data = {}
 config = {}
 wkd = {}
 korhonen_cc = {}
-index = {}
 
 [volumes.nextcloud_config]
 external = true
@@ -20,8 +19,8 @@ volumes = [
   "config:/config",
   "wkd:/var/www/wkd",
   "korhonen_cc:/var/www/korhonen.cc",
-  "index:/var/www/index.korhonen.cc",
   "nextcloud_config:/var/www/nextcloud",
+  "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc",
 ]
 environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"]
 
diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf
index b380709..249cd2a 100755
--- a/root/etc/pacman.conf
+++ b/root/etc/pacman.conf
@@ -10,7 +10,7 @@ LocalFileSigLevel = Optional
 CacheDir = /var/cache/pacman/pkg
 {%@@ if profile == "Moria" @@%}
 CleanMethod=KeepCurrent
-CacheDir= /var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/korhonen_aur/x86_64
+CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64
 {%@@ endif @@%}
 
 [core]
@@ -27,7 +27,7 @@ Include = /etc/pacman.d/mirrorlist
 
 [korhonen_aur]
 {%@@ if profile == "Moria" @@%}
-Server = file:///var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/$repo/$arch
+Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch
 {%@@ else @@%}
 Include = /etc/pacman.d/pacserve
 Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch