From a4ceeff2f09d18e5390a870b3e89a0b03bf3cd63 Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Fri, 9 Sep 2022 10:50:42 +0200
Subject: [PATCH 1/2] Add Adminer to Nextcloud stack

---
 nextcloud/docker-compose.yaml | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml
index 6ee41bc..eaf069e 100644
--- a/nextcloud/docker-compose.yaml
+++ b/nextcloud/docker-compose.yaml
@@ -82,12 +82,40 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_USER=${MYSQL_USER}
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "200k"
+        max-file: "5"
     networks:
       - nextcloud
+      - mariadb
     labels: 
       - "docker.group=netxtcloud"
 
 
+  adminer:
+    image: adminer
+    restart: unless-stopped
+    networks:
+       - web
+       - mariadb
+    environment:
+      - ADMINER_DEFAULT_SERVER=db
+      - ADMINER_DESIGN=flat
+    depends_on:
+      - db
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.adminer.rule=Host(`adminer.${DOMAIN}`)"
+      - "traefik.http.routers.adminer.entrypoints=websecure"
+      - "traefik.http.routers.adminer.tls.certresolver=netcup"
+      - "traefik.http.routers.adminer.tls.options=intermediate@file"
+      - "traefik.http.routers.adminer.middlewares=adminerauth"
+      - "traefik.http.middlewares.adminerauth.basicauth.users=${HTPASSWD_ADMINER}"
+      - "docker.group=netxtcloud"
+
+
   redis:
     image: redis:alpine
     restart: unless-stopped
@@ -133,4 +161,4 @@ networks:
   web:
     external: true
   nextcloud:
-    external: false
+  mariadb:

From a49c8712a2d85ede2f2503f7e7842d2a5b6279a0 Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Fri, 9 Sep 2022 10:51:18 +0200
Subject: [PATCH 2/2] Start All angepasst

---
 start-all.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/start-all.sh b/start-all.sh
index 19e4cdf..032def4 100755
--- a/start-all.sh
+++ b/start-all.sh
@@ -1,6 +1,14 @@
 #/bin/bash/
 
-for dir in ./*/ ; do
-   (cd "$dir" && echo "[$dir]" && docker-compose up -d);
-done
 
+function up {
+   (cd "$1" && echo "[$1]" && docker-compose up -d "${@:2}");
+}
+
+up proxy;
+up monitoring;
+up nextcloud --scale app=3 --scale web=2;
+up gitea;
+up wallabag;
+up www;
+up firefoxsync;