From 19b62a437010b06cce51836ba4722a7e0010f9d9 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Tue, 10 Dec 2019 18:56:15 +0100
Subject: [PATCH] Fix SeedDMS install

---
 lxc-apps/seeddms/install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lxc-apps/seeddms/install.sh b/lxc-apps/seeddms/install.sh
index 2b7dc7b..646b920 100755
--- a/lxc-apps/seeddms/install.sh
+++ b/lxc-apps/seeddms/install.sh
@@ -11,6 +11,10 @@ lxc-execute -n seeddms-postgres -- initdb -D /var/lib/postgresql
 cp postgres_data/postgresql.conf /srv/seeddms/postgres_data/postgresql.conf
 cp postgres_data/pg_hba.conf /srv/seeddms/postgres_data/pg_hba.conf
 
+# Copy existing files into persistent storage
+lxchelper extract seeddms /srv/seeddms/conf /srv/seeddms/seeddms_conf
+lxchelper extract seeddms /srv/seeddms/data /srv/seeddms/seeddms_data
+
 # Populate database
 export SEEDDMS_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
 service lxc-seeddms-postgres start
@@ -18,10 +22,6 @@ envsubst <createdb.sql | lxc-attach -u 5432 -g 5432 seeddms-postgres -- psql
 lxc-execute seeddms -- cat /srv/seeddms/create_tables-postgres.sql | lxc-attach seeddms-postgres -- sh -c "PGPASSWORD=${SEEDDMS_PWD} psql seeddms seeddms"
 cat custom.sql | lxc-attach -u 5432 -g 5432 seeddms-postgres -- psql seeddms
 
-# Copy existing files into persistent storage
-lxchelper extract seeddms /srv/seeddms/conf /srv/seeddms/seeddms_conf
-lxchelper extract seeddms /srv/seeddms/data /srv/seeddms/seeddms_data
-
 # Configure SeedDMS
 envsubst <seeddms_conf/settings.xml >/srv/seeddms/seeddms_conf/settings.xml
 export SEEDDMS_ADMIN_USER=admin