From 063ae588df8064044a279ca45fcc8a86e21622ab Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Wed, 30 Aug 2023 11:20:39 +0200
Subject: [PATCH] Some fixes

---
 Dockerfile         |  8 +-------
 createdatabase.sql |  4 +++-
 init.properties    | 16 +++++++++++-----
 start.sh           |  6 ++++++
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 58c5ab2..57006bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,15 +9,9 @@ RUN mkdir /opt/tomcat \
     && wget https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.75/bin/apache-tomcat-9.0.75.tar.gz \
     && tar xvzf apache-tomcat-9.0.75.tar.gz --strip-components 1 --directory /opt/tomcat 
 COPY re3gistry/dist  /opt/re3gistry
-COPY init.properties /opt/re3gistry/
 COPY start.sh /opt/re3gistry/
 COPY httpd-vhosts.conf /etc/apache2/conf.d/
 COPY httpd.conf /etc/apache2/
 WORKDIR /opt/re3gistry
-RUN sh ./init-config.sh \
-    && cp -R app/* /opt/tomcat/webapps/ \
-    && cp -R webapp/public_html/* /var/www/localhost/htdocs/ \
-    && chmod +x start.sh \
-    && touch /opt/tomcat/webapps/re3gistry2/WEB-INF/classes/configurations_files/system.installed
-
+RUN chmod +x start.sh     
 ENTRYPOINT [ "/opt/re3gistry/start.sh"  ]
diff --git a/createdatabase.sql b/createdatabase.sql
index 9966972..f5e1797 100644
--- a/createdatabase.sql
+++ b/createdatabase.sql
@@ -1,6 +1,8 @@
+CREATE ROLE re3gistry LOGIN PASSWORD 're3gistry'
+      VALID UNTIL 'infinity';
 CREATE DATABASE re3gistry
     WITH
-    OWNER = farmmaps
+    OWNER = re3gistry
     ENCODING = 'UTF8'
     LC_COLLATE = 'en_US.utf8'
     LC_CTYPE = 'en_US.utf8'
diff --git a/init.properties b/init.properties
index 35d78ce..b8d0e78 100644
--- a/init.properties
+++ b/init.properties
@@ -3,9 +3,15 @@ dbport=5432
 dbname=re3gistry
 dbuser=re3gistry
 dbpassword=test123
-statusbaseuri=https://test-uri.eu
+statusbaseuri=https://localhost:8093/
 solrurl=http://localhost:8983/solr/
-smtphost=smtp.test-url.eu
-applicationrooturl=http://test-url.eu/r3egistry2
-rsspath=/path/to/rss/file
-diskcachepath=/path/to/cache
\ No newline at end of file
+smtphost=smtp.sendgrid.net
+smtpport=587
+smtpauth=true
+smtpstarttls=false
+smtpuser=apikey
+smtppassword=G.ZP0wtTCPSPCIHjJfDThaGg.HOGBsuBP0xoDj5cq0y0zjZNeOwhBAXoxMks8e-aIohQ
+smtpsender=francisco.salas@akkerweb.nl
+applicationrooturl=https://localhost:8093/r3egistry2
+rsspath=/var/efsdata/re3gistry/rss
+diskcachepath=/var/efsdata/re3gistry/cache
\ No newline at end of file
diff --git a/start.sh b/start.sh
index f2d46b7..58f5e4a 100644
--- a/start.sh
+++ b/start.sh
@@ -1,3 +1,9 @@
 #!/bin/sh
+ln -sf /mnt/init.properties init.properties
+. ./init-config.sh
+cp -R app/* /opt/tomcat/webapps/ 
+cp -R webapp/public_html/* /var/www/localhost/htdocs/ 
+chmod +x start.sh 
+#touch /opt/tomcat/webapps/re3gistry2/WEB-INF/classes/configurations_files/system.installed
 /opt/tomcat/bin/catalina.sh start
 exec /usr/sbin/httpd -DFOREGROUND
\ No newline at end of file