Page MenuHomeDevCentral

No OneTemporary

diff --git a/entrypoint.sh b/entrypoint.sh
index 51b4e33..f031e8a 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,59 +1,63 @@
#!/bin/bash
set -e
+##
+# directory structure migration
+##
+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
+
+## done!
+
# create openfire data dir
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}/etc ]; then
mv /etc/openfire ${OPENFIRE_DATA_DIR}/etc
fi
rm -rf /etc/openfire
ln -sf ${OPENFIRE_DATA_DIR}/etc /etc/openfire
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}/lib /var/lib/openfire
# create version file
CURRENT_VERSION=
[[ -f ${OPENFIRE_DATA_DIR}/VERSION ]] && CURRENT_VERSION=$(cat ${OPENFIRE_DATA_DIR}/VERSION)
if [[ ${OPENFIRE_VERSION} != ${CURRENT_VERSION} ]]; then
echo -n "${OPENFIRE_VERSION}" | sudo -HEu ${OPENFIRE_USER} tee ${OPENFIRE_DATA_DIR}/VERSION >/dev/null
fi
# 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

Mime Type
text/x-diff
Expires
Thu, Sep 18, 02:18 (20 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2989880
Default Alt Text
(2 KB)

Event Timeline