From 0e9d5fffca2c53e9929832c7202827b6474e132c Mon Sep 17 00:00:00 2001
From: Bystroushaak <bystrousak@kitakitsune.org>
Date: Wed, 16 Mar 2016 12:29:25 +0100
Subject: [PATCH] #4: Install scripts restructured.

---
 resolver/docker/scripts/install_resolver.sh   | 32 -------------------
 .../docker/scripts/install_resolver2_root.sh  | 19 +++++++++++
 .../scripts/install_resolver_postgres.sh      |  9 ++++++
 3 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100755 resolver/docker/scripts/install_resolver.sh
 create mode 100755 resolver/docker/scripts/install_resolver2_root.sh
 create mode 100755 resolver/docker/scripts/install_resolver_postgres.sh

diff --git a/resolver/docker/scripts/install_resolver.sh b/resolver/docker/scripts/install_resolver.sh
deleted file mode 100755
index 6394c9c..0000000
--- a/resolver/docker/scripts/install_resolver.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /usr/bin/env bash
-
-# instalace resolveru
-yum -y install unzip
-
-chmod 777 /usr/share/tomcat/webapps
-
-su postgres
-mkdir /tmp/czidlo
-cd /tmp/czidlo
-
-wget https://github.com/NLCR/CZIDLO/releases/download/v4.3.alpha/CZIDLO_4.3.alpha-installation.zip.zip
-unzip CZIDLO_4.3.alpha-installation.zip.zip
-
-psql -a -f initDatabase_4.3.alpha.sql
-cp *.war /usr/share/tomcat/webapps
-
-cat > /usr/share/tomcat/conf/context.xml <<EOF
-<Context antiJARLocking="true" path="/api">
-<Resource auth="Container"
- driverClassName="org.postgresql.Driver"
- maxActive="100" maxIdle="30" maxWait="200"
- name="jdbc/postgres"
- username="testuser"
- password="testpass"
- type="javax.sql.DataSource"
- url="jdbc:postgresql://localhost:5432/czidlo_core"
- />
-</Context>
-EOF
-
-systemctl restart tomcat
\ No newline at end of file
diff --git a/resolver/docker/scripts/install_resolver2_root.sh b/resolver/docker/scripts/install_resolver2_root.sh
new file mode 100755
index 0000000..f46fef8
--- /dev/null
+++ b/resolver/docker/scripts/install_resolver2_root.sh
@@ -0,0 +1,19 @@
+#! /usr/bin/env bash
+
+cp /tmp/czidlo/*.war /usr/share/tomcat7/webapps
+
+cat > /usr/share/tomcat7/conf/context.xml <<EOF
+<Context antiJARLocking="true" path="/api">
+<Resource auth="Container"
+ driverClassName="org.postgresql.Driver"
+ maxActive="100" maxIdle="30" maxWait="200"
+ name="jdbc/postgres"
+ username="testuser"
+ password="testpass"
+ type="javax.sql.DataSource"
+ url="jdbc:postgresql://localhost:5432/czidlo_core"
+ />
+</Context>
+EOF
+
+# systemctl restart tomcat
diff --git a/resolver/docker/scripts/install_resolver_postgres.sh b/resolver/docker/scripts/install_resolver_postgres.sh
new file mode 100755
index 0000000..d1801cf
--- /dev/null
+++ b/resolver/docker/scripts/install_resolver_postgres.sh
@@ -0,0 +1,9 @@
+#! /usr/bin/env bash
+
+mkdir /tmp/czidlo
+cd /tmp/czidlo
+
+wget https://github.com/NLCR/CZIDLO/releases/download/v4.3.alpha/CZIDLO_4.3.alpha-installation.zip.zip
+unzip CZIDLO_4.3.alpha-installation.zip.zip
+
+psql -a -f initDatabase_4.3.alpha.sql