Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F11724817
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/entrypoint.sh b/entrypoint.sh
index e18af8e..4a1f37a 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,45 +1,52 @@
#!/bin/bash
set -e
# create openfire data dir
-mkdir -p ${OPENFIRE_DATA_DIR}/openfire
-chmod -R 0755 ${OPENFIRE_DATA_DIR}/openfire
-chown -R ${OPENFIRE_USER}:${OPENFIRE_USER} ${OPENFIRE_DATA_DIR}/openfire
+mkdir -p ${OPENFIRE_DATA_DIR}
+chmod -R 0755 ${OPENFIRE_DATA_DIR}
+chown -R ${OPENFIRE_USER}:${OPENFIRE_USER} ${OPENFIRE_DATA_DIR}
# create openfire log dir
mkdir -p ${OPENFIRE_LOG_DIR}
chmod -R 0755 ${OPENFIRE_LOG_DIR}
chown -R ${OPENFIRE_USER}:${OPENFIRE_USER} ${OPENFIRE_LOG_DIR}
+# migrate old directory structure
+if [ -d ${OPENFIRE_DATA_DIR}/openfire ]; then
+ mv ${OPENFIRE_DATA_DIR}/openfire/etc ${OPENFIRE_DATA_DIR}/etc
+ mv ${OPENFIRE_DATA_DIR}/openfire/lib ${OPENFIRE_DATA_DIR}/lib
+ rm -rf ${OPENFIRE_DATA_DIR}/openfire
+fi
+
# populate default openfire configuration if it does not exist
-if [ ! -d ${OPENFIRE_DATA_DIR}/openfire/etc ]; then
- mv /etc/openfire ${OPENFIRE_DATA_DIR}/openfire/etc
+if [ ! -d ${OPENFIRE_DATA_DIR}/etc ]; then
+ mv /etc/openfire ${OPENFIRE_DATA_DIR}/etc
fi
rm -rf /etc/openfire
-ln -sf ${OPENFIRE_DATA_DIR}/openfire/etc /etc/openfire
+ln -sf ${OPENFIRE_DATA_DIR}/etc /etc/openfire
-if [ ! -d ${OPENFIRE_DATA_DIR}/openfire/lib ]; then
- mv /var/lib/openfire ${OPENFIRE_DATA_DIR}/openfire/lib
+if [ ! -d ${OPENFIRE_DATA_DIR}/lib ]; then
+ mv /var/lib/openfire ${OPENFIRE_DATA_DIR}/lib
fi
rm -rf /var/lib/openfire
-ln -sf ${OPENFIRE_DATA_DIR}/openfire/lib /var/lib/openfire
+ln -sf ${OPENFIRE_DATA_DIR}/lib /var/lib/openfire
# allow arguments to be passed to openfire launch
if [[ ${1:0:1} = '-' ]]; then
EXTRA_ARGS="$@"
set --
fi
# default behaviour is to launch openfire
if [[ -z ${1} ]]; then
exec start-stop-daemon --start --chuid ${OPENFIRE_USER}:${OPENFIRE_USER} --exec /usr/bin/java -- \
-server \
-DopenfireHome=/usr/share/openfire \
-Dopenfire.lib.dir=/usr/share/openfire/lib \
-classpath /usr/share/openfire/lib/startup.jar \
-jar /usr/share/openfire/lib/startup.jar ${EXTRA_ARGS}
else
exec "$@"
fi
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Thu, Sep 18, 17:58 (6 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2991195
Default Alt Text
(2 KB)
Attached To
Mode
rDO Docker image for Openfire
Attached
Detach File
Event Timeline
Log In to Comment