From 0f2ba5c36a227812d3cf3478f873f91461a08593 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 30 Nov 2023 21:12:45 +0100 Subject: [PATCH] Update and rename 00-run.sh to 99-run.sh --- omada/rootfs/etc/cont-init.d/00-run.sh | 51 ------------------------ omada/rootfs/etc/cont-init.d/99-run.sh | 55 ++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 51 deletions(-) delete mode 100755 omada/rootfs/etc/cont-init.d/00-run.sh create mode 100755 omada/rootfs/etc/cont-init.d/99-run.sh diff --git a/omada/rootfs/etc/cont-init.d/00-run.sh b/omada/rootfs/etc/cont-init.d/00-run.sh deleted file mode 100755 index 37ca034ad..000000000 --- a/omada/rootfs/etc/cont-init.d/00-run.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# shellcheck shell=bash -set -e - -CONFIGSOURCE="/config" - -# Use ssl -if [ -d /ssl ]; then - mkdir -p /cert - cp -r /ssl/* /cert - chown -R 508:508 /cert -fi - -# Create directory -if [ ! -f "$CONFIGSOURCE" ]; then - echo "Creating directory" - mkdir -p "$CONFIGSOURCE" -fi - -# Create new global directory -mkdir -p /opt/tplink/EAPController2 -cp -rnf /opt/tplink/EAPController /opt/tplink/EAPController2 -rm -r /opt/tplink/EAPController || true - -# Migrate data -if [ -d /data/db ]; then - mv /data/* "$CONFIGSOURCE"/ - mv "$CONFIGSOURCE"/options.json /data/ -fi - -# Ensure structure is correct -cp -rnf /opt/tplink/EAPController/data/* "$CONFIGSOURCE/" - -# Symlink data folder -echo "Creating symlink" -rm -r /opt/tplink/EAPController2/data || true -ln -s "$CONFIGSOURCE" /opt/tplink/EAPController2/data - -# Make sure permissions are right -echo "Updating permissions" -chmod -R 777 "$CONFIGSOURCE" -chown -R "508:508" "$CONFIGSOURCE" -chown -R "508:508" "/opt/tplink/EAPController2" - -echo "" -echo "" -echo "Recommendation : please backup your database and migrated to this addon https://github.com/jkunczik/home-assistant-omada" -echo "" -echo "" - -exec /usr/bin/java -server -Xms128m -Xmx1024m -XX:MaxHeapFreeRatio=60 -XX:MinHeapFreeRatio=30 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/tplink/EAPController/logs/java_heapdump.hprof -Djava.awt.headless=true -cp /opt/tplink/EAPController/lib/*::/opt/tplink/EAPController/properties: com.tplink.smb.omada.starter.OmadaLinuxMain /entrypoint.sh diff --git a/omada/rootfs/etc/cont-init.d/99-run.sh b/omada/rootfs/etc/cont-init.d/99-run.sh new file mode 100755 index 000000000..d76b9d071 --- /dev/null +++ b/omada/rootfs/etc/cont-init.d/99-run.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# shellcheck shell=bash + +set -e +CONFIGSOURCE="/config" + +# Use ssl +if [ -d /ssl ]; then + mkdir -p /cert + cp -r /ssl/* /cert + chown -R 508:508 /cert +fi + +# Create directory +if [ ! -f "$CONFIGSOURCE" ]; then + echo "Creating directory" + mkdir -p "$CONFIGSOURCE" +fi + +# Migrate previous files +mkdir -p /config/data +mv /data/* /config/data + +# Copy container files +cp -rnf /opt/tplink/EAPController/data/* "$CONFIGSOURCE" +rm -r /opt/tplink/EAPController/data/* + +# Create symlinks +echo "Creating symlink" + +# Create potentially missing folers +for folders in html keystore pdf db portal; do + mkdir -p "$CONFIGSOURCE/$folders" +done +touch /config/LAST_RAN_OMADA_VER.txt + +# Create symlinks for all files in /data +for item in "$CONFIGSOURCE"/*; do + # Get the base name of the file or folder + base_name=$(basename "$item") + # Create a symbolic link in the current working directory + ln -s "$item" /opt/tplink/EAPController/data/"$base_name" + echo "Created symlink for '$base_name'" +done + +# Make sure permissions are right +echo "Updating permissions" +chmod -R 777 "$CONFIGSOURCE" +chown -R "508:508" "$CONFIGSOURCE" + +echo "" +echo "" +echo "Recommendation : please backup your database and migrated to this addon https://github.com/jkunczik/home-assistant-omada" +echo "" +echo ""