From 15174fabcdceba8b096ae26739a83785823146c1 Mon Sep 17 00:00:00 2001
From: rnsrk <robert@nasarek.org>
Date: Sat, 10 May 2025 13:18:04 +0200
Subject: [PATCH] fix postgres wrong mount

---
 core/docker-compose.yml            |  8 ++------
 create_infra.bash                  |  2 +-
 nextcloud/custom/custom-config.php | 31 ++++++++++++++++++------------
 nextcloud/docker-compose.yml       |  3 ++-
 nextcloud/reverse-proxy/nginx.conf |  5 +++++
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/core/docker-compose.yml b/core/docker-compose.yml
index 7e7cae1..53116fb 100644
--- a/core/docker-compose.yml
+++ b/core/docker-compose.yml
@@ -30,7 +30,7 @@ services:
     labels:
       - "traefik.enable=false"
     volumes:
-      - mariadb-data:/var/lib/mysql
+      - ./volumes/mariadb/data:/var/lib/mysql
     networks:
       - database
     restart: unless-stopped
@@ -42,7 +42,7 @@ services:
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     volumes:
-      - postgres-data:/var/lib/postgresql
+      - ./volumes/postgres/data:/var/lib/postgresql/data
     networks:
       - database
     restart: unless-stopped
@@ -116,10 +116,6 @@ services:
     restart: unless-stopped
 
 volumes:
-  mariadb-data:
-    name: mariadb-data
-  postgres-data:
-    name: postgres-data
   server-certificates:
     name: server-certificates
 
diff --git a/create_infra.bash b/create_infra.bash
index 5eaf528..7f2e828 100755
--- a/create_infra.bash
+++ b/create_infra.bash
@@ -17,7 +17,7 @@ else
 fi
 
 echo "Creating Hedgehog infrastructure..."
-source ./hedgehog/.env
+source ./hedgedoc/.env
 docker exec postgres psql -U $POSTGRES_USER -d postgres -c "CREATE USER $HEDGEDOC_DB_USER WITH PASSWORD '$HEDGEDOC_DB_PASSWORD';"
 docker exec postgres psql -U $POSTGRES_USER -d postgres -c "CREATE DATABASE $HEDGEDOC_DB_NAME OWNER $HEDGEDOC_DB_USER;"
 docker exec postgres psql -U $POSTGRES_USER -d $HEDGEDOC_DB_NAME -c "GRANT ALL PRIVILEGES ON DATABASE $HEDGEDOC_DB_NAME TO $HEDGEDOC_DB_USER;"
diff --git a/nextcloud/custom/custom-config.php b/nextcloud/custom/custom-config.php
index f7e0d30..22cf41d 100644
--- a/nextcloud/custom/custom-config.php
+++ b/nextcloud/custom/custom-config.php
@@ -1,14 +1,21 @@
 <?php
 $CONFIG = array (
-  'maintenance_window_start' => 1,
-  'memcache.local' => '\OC\Memcache\APCu',
-  'memcache.locking' => '\OC\Memcache\Redis',
-  'redis' => [
-    'host' => 'redis',
-    'port' => 6379,
-  ],
-  'default_phone_region' => 'DE',
-  'hsts' => true,
-  'hstsMaxAge' => 15552000,
-  'hstsIncludeSubdomains' => true,
-);
+  'memcache.local' => '\\OC\\Memcache\\APCu',
+  'memcache.distributed' => '\\OC\\Memcache\\Redis',
+  'memcache.locking' => '\\OC\\Memcache\\Redis',
+  'trusted_proxies' => 
+  array (
+          0 => 'traefik',
+          1 => '172.16.0.0/12', 
+          2 => '192.168.0.0/16', 
+          3 => '10.0.0.0/8',
+  ),
+  'trusted_domains' => 
+  array (
+    0 => 'localhost',
+    1 => 'nasarek.dev',
+    2 => 'drive.nasarek.dev',
+    3 => 'nextcloud-reverse-proxy',
+    4 => 'onlyoffice-documentserver',
+  ),
+);
\ No newline at end of file
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index dd5871d..d775f89 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -23,7 +23,8 @@ services:
       - "traefik.enable=false"
     volumes:
       - nextcloud-data:/var/www/html
-      #- ./hooks/post-installation:/docker-entrypoint-hooks.d/post-installation
+      - ./hooks/post-installation:/docker-entrypoint-hooks.d/post-installation
+      #- ./custom/custom-config.php:/var/www/html/config/custom-config.php
     expose:
       - 80
       - 9000
diff --git a/nextcloud/reverse-proxy/nginx.conf b/nextcloud/reverse-proxy/nginx.conf
index fcc67f6..249933c 100644
--- a/nextcloud/reverse-proxy/nginx.conf
+++ b/nextcloud/reverse-proxy/nginx.conf
@@ -17,6 +17,11 @@ http {
 
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
+    
+    # Add custom MIME type for .mjs files
+    types {
+        text/javascript  mjs;
+    }
 
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '