From 4e4744ff9f1f5a5c214665d57d5f3d7cd3174afb Mon Sep 17 00:00:00 2001
From: chris <christiansteinle@arcor.de>
Date: Fri, 23 Feb 2024 19:29:41 +0100
Subject: [PATCH] Changes to automate backups.

---
 buehler-tmp/docker-compose.yaml    | 16 ++++++-------
 kimai-scheidle/.env                |  7 +++---
 kimai-scheidle/docker-compose.yaml | 38 +++++++++++++++---------------
 kimai-scheidle/kimai.conf          |  2 +-
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/buehler-tmp/docker-compose.yaml b/buehler-tmp/docker-compose.yaml
index 46fb5c4..123a8f9 100644
--- a/buehler-tmp/docker-compose.yaml
+++ b/buehler-tmp/docker-compose.yaml
@@ -3,7 +3,7 @@ version: "3.9"
 networks:
   proxy:
     external: true
-  buehler-laravel:
+  buehler:
 
 volumes:
   mysql:
@@ -11,14 +11,14 @@ volumes:
 services:
   buehler:
     image: cs-registry.ddnss.de/buehler/laravel-tmp:latest
-    container_name: buehler-laravel-app
+    container_name: buehler-app
     restart: always
     links:
       - db
     working_dir: /var/www
     networks:
       - proxy
-      - buehler-laravel
+      - buehler
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.buehler.rule=Host(`buehler-kaffee.de`, `www.buehler-kaffee.de`)"
@@ -34,14 +34,14 @@ services:
 
   db:
     image: mysql:8
-    container_name: buehler-laravel-db
+    container_name: buehler-db
     restart: unless-stopped
     volumes:
       - mysql:/var/lib/mysql
     networks:
-      - buehler-laravel
+      - buehler
     environment:
-      MYSQL_ROOT_PASSWORD: 23lsdiuugkk6&7upz
-      MYSQL_PASSWORD: lmaa,dw.
+      MYSQL_ROOT_PASSWORD: jD99Ey8r2gyk5Bhe38eJgbu9c7Gps2mN
+      MYSQL_PASSWORD: hZp2796o4ks7boFyQX2ZU8EVoijbFVJQ
       MYSQL_USER: buehler
-      MYSQL_DATABASE: buehler-laravel
+      MYSQL_DATABASE: buehler
diff --git a/kimai-scheidle/.env b/kimai-scheidle/.env
index 3e8782f..a199ee4 100644
--- a/kimai-scheidle/.env
+++ b/kimai-scheidle/.env
@@ -3,6 +3,7 @@ ADMIN_PASS=paE76zrCZfhA6Fbx1MUM
 
 APP_SECRET=gwot394*Gt
 
-DB_USER=kimai
-DB_NAME=kimai
-DB_PASS=xXW5dnQoMpAmdXrQgUgU
\ No newline at end of file
+DB_USER=scheidle
+DB_NAME=scheidle
+DB_PASS=xXW5dnQoMpAmdXrQgUgU
+DB_ROOT_PASS=3qmjWv5L4Q9fqxt3i6xsT8npoZy3HLc6
\ No newline at end of file
diff --git a/kimai-scheidle/docker-compose.yaml b/kimai-scheidle/docker-compose.yaml
index 0160537..1d32572 100644
--- a/kimai-scheidle/docker-compose.yaml
+++ b/kimai-scheidle/docker-compose.yaml
@@ -2,9 +2,9 @@ version: "3.9"
 
 volumes:
   kimai-scheidle:
-    name: kimai-scheidle
+    name: scheidle
   kimai-scheidle-db:
-    name: kimai-scheidle-db
+    name: scheidle-db
 
 networks:
   proxy:
@@ -14,10 +14,10 @@ networks:
     external: false
 
 services:
-  kimai-scheidle:
+  scheidle-app        :
     image: kimai/kimai2:fpm
-    container_name: kimai-scheidle
-    hostname: kimai-scheidle
+    container_name: scheidle
+    hostname: scheidle
     restart: unless-stopped
     environment:
       ADMINMAIL: ${ADMIN_USER}
@@ -26,16 +26,16 @@ services:
       TRUSTED_HOSTS: kimai.lan,kimai-web,localhost,127.0.0.1
       APP_SECRET: ${APP_SECRET}
     depends_on:
-      - kimai-scheidle-db
+      - scheidle-db
     networks:
-      - kimai-scheidle
+      - scheidle
     volumes:
-      - kimai-scheidle:/opt/kimai/public
+      - scheidle:/opt/kimai/public
 
-  kimai-scheidle-web:
+  scheidle-web:
     image: nginx:alpine
-    container_name: kimai-scheidle-web
-    hostname: kimai-scheidle-web
+    container_name: scheidle-web
+    hostname: scheidle-web
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
@@ -50,28 +50,28 @@ services:
       - "traefik.http.routers.kimai-scheidle-secure.service=kimai-scheidle-secure"
       - "traefik.http.services.kimai-scheidle-secure.loadbalancer.server.port=80"
     depends_on:
-      - kimai-scheidle
+      - scheidle
     networks:
       - proxy
-      - kimai-scheidle
+      - scheidle
     volumes:
-      - kimai-scheidle:/opt/kimai/public:ro
+      - scheidle:/opt/kimai/public:ro
       - ${PWD}/kimai.conf:/etc/nginx/conf.d/default.conf
 
   kimai-scheidle-db:
     image: mysql:8
-    container_name: kimai-scheidle-db
-    hostname: kimai-scheidle-db
+    container_name: scheidle-db
+    hostname: scheidle-db
     command: --default-authentication-plugin=mysql_native_password
     restart: unless-stopped
     environment:
-      MYSQL_ROOT_PASSWORD: ${DB_PASS}
+      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
       MYSQL_USER: ${DB_USER}
       MYSQL_PASSWORD: ${DB_PASS}
       MYSQL_DATABASE: ${DB_NAME}
     volumes:
-      - kimai-scheidle-db:/var/lib/mysql
+      - scheidle-db:/var/lib/mysql
     networks:
-      - kimai-scheidle
+      - scheidle
     healthcheck:
       test: ["CMD-SHELL", "mysqladmin ping -u$${DB_USER} -p$$(DB_PASS)"]
diff --git a/kimai-scheidle/kimai.conf b/kimai-scheidle/kimai.conf
index debfd49..25e8962 100644
--- a/kimai-scheidle/kimai.conf
+++ b/kimai-scheidle/kimai.conf
@@ -15,7 +15,7 @@ server {
     }
 
     location ~ ^/index\.php(/|$) {
-        fastcgi_pass kimai-scheidle:9000;
+        fastcgi_pass scheidle-app:9000;
         fastcgi_split_path_info ^(.+\.php)(/.*)$;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;