Merge 1.5.3 changes back to master.

guacamole-docker/bin/start.sh

@@ -942,6 +942,19 @@ associate_json() {
     # Add required .jar files to GUACAMOLE_EXT
     ln -s /opt/guacamole/json/guacamole-auth-*.jar "$GUACAMOLE_EXT"
 }
+
+##  
+## Adds properties to guacamole.properties which configure the recording
+## storage extension.
+##  
+associate_recordings() {
+    # Update config file
+    set_property "recording-search-path" "$RECORDING_SEARCH_PATH"
+    
+    # Add required .jar files to GUACAMOLE_EXT
+    ln -s /opt/guacamole/recordings/guacamole-history-recording-storage-*.jar "$GUACAMOLE_EXT"
+}
+
 ##
 ## Sets up Tomcat's remote IP valve that allows gathering the remote IP
 ## from headers set by a remote proxy
@@ -1171,6 +1184,11 @@ if [ -n "$JSON_SECRET_KEY" ]; then
     INSTALLED_AUTH="$INSTALLED_AUTH json"
 fi
 
+# Add in the history recording storage extension if configured
+if [ -n "$RECORDING_SEARCH_PATH" ]; then
+    associate_recordings
+fi
+
 #
 # Validate that at least one authentication backend is installed
 #