From 9415fcb4588d19d3a6649a7eec32714a10acfe04 Mon Sep 17 00:00:00 2001
From: rnsrk <robert@nasarek.org>
Date: Tue, 22 Apr 2025 23:33:39 +0200
Subject: [PATCH] back to origin

---
 .example-env       |  8 ------
 docker-compose.yml | 69 +++++++++++++++++++++++++---------------------
 2 files changed, 37 insertions(+), 40 deletions(-)
 delete mode 100644 .example-env

diff --git a/.example-env b/.example-env
deleted file mode 100644
index 0c2e617..0000000
--- a/.example-env
+++ /dev/null
@@ -1,8 +0,0 @@
-ONLYOFFICE_JWT_SECRET=
-ONLYOFFICE_DB_HOST=postgres
-ONLYOFFICE_DB_NAME=
-ONLYOFFICE_DB_PASSWORD=
-ONLYOFFICE_DB_PORT=5432
-ONLYOFFICE_DB_TYPE=postgres
-ONLYOFFICE_DB_USER=
-
diff --git a/docker-compose.yml b/docker-compose.yml
index daaeb20..27670cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,50 +1,55 @@
 services:
-  onlyoffice-document-server:
+  onlyoffice-documentserver:
     build:
       context: .
-    container_name: onlyoffice-document-server
+    container_name: onlyoffice-documentserver
     depends_on:
+      - onlyoffice-postgresql
       - onlyoffice-rabbitmq
     environment:
-      - DB_TYPE=${ONLYOFFICE_DB_TYPE}
-      - DB_HOST=${ONLYOFFICE_DB_HOST}
-      - DB_PORT=${ONLYOFFICE_DB_PORT}
-      - DB_NAME=${ONLYOFFICE_DB_NAME}
-      - DB_USER=${ONLYOFFICE_DB_USER}
-      - DB_PWD=${ONLYOFFICE_DB_PASSWORD}
+      - DB_TYPE=postgres
+      - DB_HOST=onlyoffice-postgresql
+      - DB_PORT=5432
+      - DB_NAME=onlyoffice
+      - DB_USER=onlyoffice
       - AMQP_URI=amqp://guest:guest@onlyoffice-rabbitmq
       # Uncomment strings below to enable the JSON Web Token validation.
-      - JWT_ENABLED=true
-      - JWT_SECRET=${ONLYOFFICE_JWT_SECRET}
-      - JWT_HEADER=Authorization
-      - JWT_IN_BODY=true
+      #- JWT_ENABLED=true
+      #- JWT_SECRET=secret
+      #- JWT_HEADER=Authorization
+      #- JWT_IN_BODY=true
+    ports:
+      - '80:80'
+      - '443:443'
     stdin_open: true
+    restart: always
     stop_grace_period: 60s
     volumes:
-      - /var/www/onlyoffice/Data
-      - /var/log/onlyoffice
-      - /var/lib/onlyoffice/documentserver/App_Data/cache/files
-      - /var/www/onlyoffice/documentserver-example/public/files
-      - /usr/share/fonts
-    networks:
-      - database
-      - nextcloud
-      - onlyoffice
-    restart: unless-stopped
+       - /var/www/onlyoffice/Data
+       - /var/log/onlyoffice
+       - /var/lib/onlyoffice/documentserver/App_Data/cache/files
+       - /var/www/onlyoffice/documentserver-example/public/files
+       - /usr/share/fonts
 
   onlyoffice-rabbitmq:
     container_name: onlyoffice-rabbitmq
     image: rabbitmq
-    restart: unless-stopped
+    restart: always
     expose:
       - '5672'
-    networks:
-      - onlyoffice
 
-networks:
-  database:
-    external: true
-  nextcloud:
-    external: true
-  onlyoffice:
-    name: onlyoffice
+  onlyoffice-postgresql:
+    container_name: onlyoffice-postgresql
+    image: postgres:12
+    environment:
+      - POSTGRES_DB=onlyoffice
+      - POSTGRES_USER=onlyoffice
+      - POSTGRES_HOST_AUTH_METHOD=trust
+    restart: always
+    expose:
+      - '5432'
+    volumes:
+      - postgresql_data:/var/lib/postgresql
+
+volumes:
+  postgresql_data: