Merge pull request #3 from geniusdynamics/dev

Dev
geniusdynamics · Jul 30, 2024 · b816be5 · b816be5
2 parents dc5f7c4 + 18c1635
commit b816be5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/imageroot/actions/restore-module/40restore_database b/imageroot/actions/restore-module/40restore_database
@@ -11,7 +11,7 @@ exec 1>&2 # Redirect any output to the journal (stderr)
 mkdir -vp restore
 cat - >restore/docmost_restore.sh <<'EOS'
 # Read dump file from standard input:
-pg_restore --no-owner --no-privileges -U postgres -d docmost
+pg_restore --no-owner --no-privileges -U docmost -d docmost
 ec=$?
 docker_temp_server_stop
 exit $ec
@@ -27,9 +27,7 @@ podman run \
     --volume=./restore:/docker-entrypoint-initdb.d/:Z \
     --volume=postgres-data:/var/lib/postgresql/data:Z \
     --replace --name=restore_db \
-    --env POSTGRES_USER=postgres \
-    --env POSTGRES_PASSWORD=Nethesis,1234 \
-    --env POSTGRES_DB=docmost \
+    --env-file database.env \
     --env TZ=UTC \
     "${POSTGRES_IMAGE}" < docmost.pg_dump
 

diff --git a/imageroot/actions/restore-module/80start_services b/imageroot/actions/restore-module/80start_services
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+#
+# Copyright (C) 2023 Nethesis S.r.l.
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+set -e
+
+# Redirect any output to the journal (stderr)
+exec 1>&2
+
+# If the control reaches this step, the service can be enabled and started
+
+touch smarthost.env
+
+systemctl --user enable docmost.service
+systemctl --user restart docmost.service
diff --git a/imageroot/etc/state-include.conf b/imageroot/etc/state-include.conf
@@ -6,5 +6,8 @@
 
 
 state/docmost.sql
+state/database.env
+state/app.env
+state/smtp-config.env
 volumes/docmost-app
 
diff --git a/imageroot/systemd/user/docmost-app.service b/imageroot/systemd/user/docmost-app.service
@@ -21,7 +21,7 @@ ExecStartPre=-runagent discover-smarthost
 ExecStart=/usr/bin/podman run --conmon-pidfile %t/docmost-app.pid \
     --cidfile %t/docmost-app.ctr-id --cgroups=no-conmon \
     --pod-id-file %t/docmost.pod-id --replace -d --name  docmost-app \
-    --volume docmost:/app/data/storage:Z \
+    --volume docmost-app:/app/data/storage:Z \
     --env-file=%S/state/app.env \
     --env-file=%S/state/smtp-config.env \
     --env APP_URL=${APP_URL} \