From 7185e734a7f95c8226f03737f641906462cec755 Mon Sep 17 00:00:00 2001
From: wlinator <git@wlinator.org>
Date: Thu, 20 Jun 2024 12:56:07 +0200
Subject: [PATCH] Rename some things to make more sense

---
 .gitignore                           |  3 ++-
 db/{init => migrations}/1-tables.sql |  0
 docker-compose.yml                   | 10 +++++-----
 modules/misc/backup.py               |  4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename db/{init => migrations}/1-tables.sql (100%)

diff --git a/.gitignore b/.gitignore
index d9e19e7..714d745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 venv/
 .idea/
 __pycache__/
+.run/
 
 *.db
 .env
@@ -8,4 +9,4 @@ __pycache__/
 
 users.yml
 db/data/
-db/init/v2-update.sql
+db/migrations/100-dump.sql
diff --git a/db/init/1-tables.sql b/db/migrations/1-tables.sql
similarity index 100%
rename from db/init/1-tables.sql
rename to db/migrations/1-tables.sql
diff --git a/docker-compose.yml b/docker-compose.yml
index 241d540..6c6c218 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       MARIADB_PASSWORD: ${MARIADB_PASSWORD}
       MARIADB_DATABASE: ${MARIADB_DATABASE}
     volumes:
-      - debuglog:/usr/src/app/logs
+      - debug_log:/usr/src/app/logs
     depends_on:
       db:
         condition: service_healthy
@@ -30,8 +30,8 @@ services:
       MARIADB_PASSWORD: ${MARIADB_PASSWORD}
       MARIADB_DATABASE: ${MARIADB_DATABASE}
     volumes:
-      - ./db/init:/docker-entrypoint-initdb.d/
-      - dbdata:/var/lib/mysql/
+      - ./db/migrations:/docker-entrypoint-initdb.d/
+      - database:/var/lib/mysql/
     healthcheck:
       test: [ "CMD", "mariadb", "-h", "localhost", "-u", "${MARIADB_USER}", "-p${MARIADB_PASSWORD}", "-e", "SELECT 1" ]
       interval: 5s
@@ -45,5 +45,5 @@ services:
       - 8080:8080
 
 volumes:
-  dbdata:
-  debuglog:
+  database:
+  debug_log:
diff --git a/modules/misc/backup.py b/modules/misc/backup.py
index 640f030..ea7d384 100644
--- a/modules/misc/backup.py
+++ b/modules/misc/backup.py
@@ -30,11 +30,11 @@ async def create_db_backup(dbx, path="db/rcu.db"):
     backup_name += f"_lumi.sql"
 
     command = f"mariadb-dump --user={mariadb_user} --password={mariadb_password} " \
-              f"--host=db --single-transaction --all-databases > ./db/init/2-data.sql"
+              f"--host=db --single-transaction --all-databases > ./db/migrations/100-dump.sql"
 
     subprocess.check_output(command, shell=True)
 
-    with open("./db/init/2-data.sql", "rb") as f:
+    with open("./db/migrations/100-dump.sql", "rb") as f:
         dbx.files_upload(f.read(), f"/{backup_name}")