From a425984d290f99ffc2fb4157dfbc2cdb972330f2 Mon Sep 17 00:00:00 2001
From: Dennis Schwerdel <schwerdel@informatik.uni-kl.de>
Date: Wed, 25 Jan 2017 10:51:18 +0100
Subject: [PATCH] More fixes

---
 CHANGELOG             | 17 -----------------
 CloudronManifest.json |  4 ++--
 Dockerfile            | 14 ++++++++++----
 POSTINSTALL.md        |  4 +++-
 start.sh              | 26 ++++++++++++++------------
 5 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bde8699..0b6ac06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,19 +1,2 @@
 [0.1.0]
 * Initial version
-
-[0.1.1]
-* Update to upstream version 1.10.2.143
-
-[0.1.2]
-* Update base image
-* Update to upstream version 1.10.3.151
-
-[0.1.3]
-* Update post install
- 
-[0.2.0]
-* Update RainLoop to 1.10.4.183
-
-[0.3.0]
-* Update RainLoop to 1.10.5.192
-
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 91085fd..0480033 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -12,7 +12,7 @@
      "mysql": {},
      "ldap": {}
   },
-  "developmentMode": false,
+  "memoryLimit": 2048,
   "manifestVersion": 1,
   "website": "http://guacamole.incubator.apache.org/",
   "contactEmail": "support@cloudron.io",
@@ -21,7 +21,7 @@
     "vnc", "rdp", "ssh", "rdesktop"
   ],
   "mediaLinks": [
-    "file:///screenshots/1.jpg"
+    "http://www.example.com"
   ],
   "postInstallMessage": "file://POSTINSTALL.md"
 }
diff --git a/Dockerfile b/Dockerfile
index 4ca3ffd..6f1f21d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,16 +41,22 @@ RUN mkdir -p /app/code/lib \
     && rm -rf mysql-connector-java-${MYSQL_CONNECTOR_VERSION}
 
 # Get WAR app
-RUN mkdir -p /app/code/war \
-    && wget "$DOWNLOAD_URL/binary/guacamole-${VERSION}.war" -O /app/code/war/ROOT.war \
-    && ln -s /app/code/war /usr/share/tomcat8/webapps
+RUN wget "$DOWNLOAD_URL/binary/guacamole-${VERSION}.war" -O /app/code/guacamole.war \
+    && mkdir /app/code/guacamole-web \
+    && cd /app/code/guacamole-web \
+    && unzip /app/code/guacamole.war \
+    && rm /app/code/guacamole.war
 
 # Configure Tomcat
 RUN ln -s /run/tomcat/temp /usr/share/tomcat8/temp \
+    && ln -s /run/tomcat/logs /usr/share/tomcat8/logs \
+    && ln -s /run/tomcat/work /usr/share/tomcat8/work \
     && ln -s /etc/tomcat8 /usr/share/tomcat8/conf \
-    && ln -s /run/guacamole/guacamole.properties /app/code/guacamole.properties
+    && ln -s /run/guacamole/guacamole.properties /app/code/guacamole.properties \
+    && ln -s /run/tomcat/webapps /usr/share/tomcat8/webapps
     
 ENV GUACAMOLE_HOME /app/code
+ENV JAVA_OPTS "-Djava.awt.headless=true -server -Xmx512M -Djava.security.egd=file:/dev/urandom"
 
 ADD start.sh /app/code/start.sh
 
diff --git a/POSTINSTALL.md b/POSTINSTALL.md
index 3aa57f9..7e88c92 100644
--- a/POSTINSTALL.md
+++ b/POSTINSTALL.md
@@ -5,4 +5,6 @@ To store connection data of custom permissions for Cloudron users, a Guacamole a
 There is a default admin user in Guacamole with the following credentials:
 
 * Username: `guacadmin`
-* Password: `guacadmin` (please change that password immediatly)
+* Password: `guacadmin` 
+
+**Please change the admin password on first login**
diff --git a/start.sh b/start.sh
index 82764f2..9e63296 100755
--- a/start.sh
+++ b/start.sh
@@ -4,21 +4,23 @@ set -eu
 
 mkdir -p /run/guacamole
 cat > /run/guacamole/guacamole.properties <<EOF
-ldap-hostname=${LDAP_SERVER}
-ldap-port=${LDAP_PORT}
-ldap-search-bind-dn=${LDAP_BIND_DN}
-ldap-search-bind-password=${LDAP_BIND_PASSWORD}
-ldap-user-base-dn=${LDAP_USERS_BASE_DN}
-ldap-group-base-dn=${LDAP_GROUPS_BASE_DN}
+ldap-hostname:${LDAP_SERVER}
+ldap-port:${LDAP_PORT}
+ldap-search-bind-dn:${LDAP_BIND_DN}
+ldap-search-bind-password:${LDAP_BIND_PASSWORD}
+ldap-user-base-dn:${LDAP_USERS_BASE_DN}
+ldap-group-base-dn:${LDAP_GROUPS_BASE_DN}
 ldap-username-attribute:username
-mysql-hostname=${MYSQL_HOST}
-mysql-port=${MYSQL_PORT}
-mysql-database=${MYSQL_DATABASE}
-mysql-username=${MYSQL_USERNAME}
-mysql-password=${MYSQL_PASSWORD}
+mysql-hostname:${MYSQL_HOST}
+mysql-port:${MYSQL_PORT}
+mysql-database:${MYSQL_DATABASE}
+mysql-username:${MYSQL_USERNAME}
+mysql-password:${MYSQL_PASSWORD}
 EOF
 
-mkdir -p /run/tomcat/temp
+mkdir -p /run/tomcat/temp /run/tomcat/logs /run/tomcat/work /run/tomcat/webapps
+cp -a /app/code/guacamole-web /run/tomcat/webapps/ROOT
+
 
 MYSQL="mysql -u ${MYSQL_USERNAME} -p${MYSQL_PASSWORD} -h ${MYSQL_HOST} --port ${MYSQL_PORT} --database ${MYSQL_DATABASE}"