From fbd10f2331bf8f1ef09fe02a906b0a5c41066640 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Mon, 11 Jul 2022 15:09:22 +0200
Subject: [PATCH] fixed useragents db
---
build/fpm/entrypoint/validate_laravel.sh | 8 ++++++--
chart/templates/deployment.yaml | 6 ++++++
metager/config/database.php | 4 ++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/build/fpm/entrypoint/validate_laravel.sh b/build/fpm/entrypoint/validate_laravel.sh
index dff1cb240..55ee21b01 100755
--- a/build/fpm/entrypoint/validate_laravel.sh
+++ b/build/fpm/entrypoint/validate_laravel.sh
@@ -12,8 +12,12 @@ if [ ! -f "$BASE_DIR/config/sumasEn.json" ]; then
cp $BASE_DIR/config/sumas.json.example $BASE_DIR/config/sumasEn.json
fi
-if [ ! -f "$BASE_DIR/database/database.sqlite" ]; then
- touch $BASE_DIR/database/database.sqlite
+if [ ! -d "$BASE_DIR/database/databases/" ]; then
+ mkdir -p "$BASE_DIR/database/databases/"
+fi
+
+if [ ! -f "$BASE_DIR/database/databases/database.sqlite" ]; then
+ touch "$BASE_DIR/database/databases/database.sqlite"
fi
if [ ! -d "$BASE_DIR/storage/logs/metager" ]; then
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 02d463dc1..61de6a02e 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -37,6 +37,8 @@ spec:
- name: redis-config
configMap:
name: {{ include "chart.fullname" . }}-redis-container-config
+ - name: sqlite-databases
+ emptyDir: {}
containers:
- name: fpm
securityContext:
@@ -80,6 +82,8 @@ spec:
- name: mglogs-persistent-storage
mountPath: /metager/metager_app/storage/logs/metager
readOnly: false
+ - name: sqlite-databases
+ mountPath: /metager/metager_app/database/databases
ports:
- name: http
containerPort: 8080
@@ -122,6 +126,8 @@ spec:
- name: mglogs-persistent-storage
mountPath: /metager/metager_app/storage/logs/metager
readOnly: false
+ - name: sqlite-databases
+ mountPath: /metager/metager_app/database/databases
ports:
- name: http
containerPort: 8080
diff --git a/metager/config/database.php b/metager/config/database.php
index 7f63636da..7f5302ac0 100644
--- a/metager/config/database.php
+++ b/metager/config/database.php
@@ -48,12 +48,12 @@ return [
'sqlite' => [
'driver' => 'sqlite',
- 'database' => database_path(env('SQLITE_DATABASE', 'database.sqlite')),
+ 'database' => database_path('databases/' . env('SQLITE_DATABASE', 'database.sqlite')),
'prefix' => '',
],
'useragents' => [
'driver' => 'sqlite',
- 'database' => database_path(env('SQLITE_DATABASE', 'database.sqlite')),
+ 'database' => database_path('databases/' . env('SQLITE_DATABASE', 'database.sqlite')),
'prefix' => '',
],
'mysql' => [
--
GitLab