From 03eb9ab6e7cb3273ed0ae092d031c501332d64d4 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 16 Dec 2020 21:32:24 +0200
Subject: [PATCH] Add index.korhonen.cc and aur repository

---
 docker/index.korhonen.cc/docker-compose.yaml | 33 ++++++++++++++++++++
 docker/marko.korhonen.cc/docker-compose.yaml | 30 ------------------
 root/etc/pacman.conf                         |  9 ++++++
 3 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 docker/index.korhonen.cc/docker-compose.yaml
 delete mode 100644 docker/marko.korhonen.cc/docker-compose.yaml

diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml
new file mode 100644
index 0000000..16ded23
--- /dev/null
+++ b/docker/index.korhonen.cc/docker-compose.yaml
@@ -0,0 +1,33 @@
+version: "3"
+
+services:
+  nginx:
+    image: fraoustin/fancyindex
+    container_name: index.korhonen.cc
+    environment:
+      - DISABLE_AUTH=true
+      - CONTAINER_TIMEZONE="Europe/Helsinki"
+    volumes:
+      - /docker/index.korhonen.cc:/share
+    networks:
+      - proxy
+    restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+
+      - "traefik.http.routers.index-redirect.entrypoints=http"
+      - "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)"
+      - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
+      - "traefik.http.routers.index-redirect.middlewares=http2https"
+
+      - "traefik.http.routers.index.entrypoints=https"
+      - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)"
+      - "traefik.http.routers.index.tls=true"
+      - "traefik.http.routers.index.tls.certresolver=http"
+      - "traefik.http.routers.index.service=index"
+      - "traefik.docker.network=proxy"
+      - "traefik.http.services.index.loadbalancer.server.port=80"
+
+networks:
+  proxy:
+    external: true
diff --git a/docker/marko.korhonen.cc/docker-compose.yaml b/docker/marko.korhonen.cc/docker-compose.yaml
deleted file mode 100644
index 522dbc1..0000000
--- a/docker/marko.korhonen.cc/docker-compose.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-version: "3"
-
-services:
-  site:
-    image: nginx:alpine
-    container_name: marko.korhonen.cc
-    volumes:
-      - /docker/marko.korhonen.cc:/usr/share/nginx/html:ro
-    networks:
-      - proxy
-    restart: unless-stopped
-    labels:
-      - "traefik.enable=true"
-
-      - "traefik.http.routers.marko-redirect.entrypoints=http"
-      - "traefik.http.routers.marko-redirect.rule=Host(`marko.korhonen.cc`)"
-      - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
-      - "traefik.http.routers.marko-redirect.middlewares=http2https"
-
-      - "traefik.http.routers.marko.entrypoints=https"
-      - "traefik.http.routers.marko.rule=Host(`marko.korhonen.cc`)"
-      - "traefik.http.routers.marko.tls=true"
-      - "traefik.http.routers.marko.tls.certresolver=http"
-      - "traefik.http.routers.marko.service=marko"
-      - "traefik.docker.network=proxy"
-      - "traefik.http.services.marko.loadbalancer.server.port=80"
-
-networks:
-  proxy:
-    external: true
diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf
index 43ca4cc..42a140e 100755
--- a/root/etc/pacman.conf
+++ b/root/etc/pacman.conf
@@ -9,6 +9,15 @@ Architecture = auto
 LocalFileSigLevel = Optional
 CacheDir = /var/cache/pacman/pkg
 
+[korhonen-aur]
+{%@@ if profile == "Moria" @@%}
+Server = file:///docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur
+CleanMethod=KeepCurrent
+CacheDir=/docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur
+{%@@ else @@%}
+Server = https://index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur
+{%@@ endif @@%}
+
 [core]
 Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist