Merge pull request #4 from geniusdynamics/dev

correct HOST
geniusdynamics · Jul 30, 2024 · 5f9571f · 5f9571f
2 parents b816be5 + a25680e
commit 5f9571f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/imageroot/actions/configure-module/10configure_environment_vars b/imageroot/actions/configure-module/10configure_environment_vars
@@ -17,8 +17,7 @@ data = json.load(sys.stdin)
 
 # Configure HOST
 HOST = data.get('host')
-SERVER_HOST = "https://"+host
-agent.set_env('APP_URL', SERVER_HOST)
+SERVER_HOST = "https://"+HOST
 
 rdb = agent.redis_connect(use_replica=True)
 smtp_settings = agent.get_smarthost_settings(rdb)
@@ -42,7 +41,8 @@ smtp_config = {
     'SMTP_HOST': SMTP_HOST,
     'SMTP_PORT': SMTP_PORT,
     'SMTP_USERNAME': SMTP_USERNAME,
-    'SMTP_PASSWORD': SMTP_PASSWORD
+    'SMTP_PASSWORD': SMTP_PASSWORD,
+    'APP_URL': SERVER_HOST
 }
 agent.write_envfile("smtp-config.env",smtp_config)
 

diff --git a/imageroot/etc/state-include.conf b/imageroot/etc/state-include.conf
@@ -5,7 +5,7 @@
 # List here what you want to save during backup : volumes or file Path
 
 
-state/docmost.sql
+state/docmost.pg_dump
 state/database.env
 state/app.env
 state/smtp-config.env

diff --git a/imageroot/systemd/user/docmost-app.service b/imageroot/systemd/user/docmost-app.service
@@ -24,7 +24,6 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/docmost-app.pid \
     --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} \
     ${DOCMOST_IMAGE}
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/docmost-app.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP docmost-app

diff --git a/ui/src/assets/module_default_logo.png b/ui/src/assets/module_default_logo.png