revert

https://github.com/alexbelgium/hassio-addons/issues/932#issuecomment-1665475039
2026-06-10 09:35:58 +02:00 · 2023-08-04 19:52:58 +02:00
parent db84b93323
commit 4a51302b65
21 changed files with 668 additions and 73 deletions
--- a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh
+++ b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/with-contenv bashio
+# shellcheck shell=bash
+# shellcheck disable=SC2046
+
+# Define user
+PUID=$(bashio::config "PUID")
+PGID=$(bashio::config "PGID")
+
+# Check data location
+LOCATION=$(bashio::config 'data_location')
+
+if [[ "$LOCATION" = "null" || -z "$LOCATION" ]]; then
+    # Default location
+    LOCATION="/share/webtop_kde"
+else
+    bashio::log.warning "Warning : a custom data location was selected, but the previous folder will NOT be copied. You need to do it manually"
+
+    # Check if config is located in an acceptable location
+    LOCATIONOK=""
+    for location in "/share" "/config" "/data" "/mnt"; do
+        if [[ "$LOCATION" == "$location"* ]]; then
+            LOCATIONOK=true
+        fi
+    done
+
+    if [ -z "$LOCATIONOK" ]; then
+        LOCATION=/config/addons_config/${HOSTNAME#*-}
+        bashio::log.fatal "Your data_location value can only be set in /share, /config or /data (internal to addon). It will be reset to the default location : $LOCATION"
+    fi
+
+fi
+
+# Set data location
+bashio::log.info "Setting data location to $LOCATION"
+
+sed -i "1a export HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run || true
+sed -i "1a export FM_HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run || true
+sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /defaults -type f) || true
+sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/cont-init.d -type f) || true
+sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/services.d -type f) || true
+sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/s6-overlay/s6-rc.d -type f) || true
+if [ -d /var/run/s6/container_environment ]; then printf "%s" "$LOCATION" > /var/run/s6/container_environment/HOME; fi
+if [ -d /var/run/s6/container_environment ]; then printf "%s" "$LOCATION" > /var/run/s6/container_environment/FM_HOME; fi
+{
+    printf "%s" "HOME=\"$LOCATION\""
+    printf "%s" "FM_HOME=\"$LOCATION\""
+} >> ~/.bashrc
+
+usermod --home "$LOCATION" abc
+
+# Create folder
+echo "Creating $LOCATION"
+mkdir -p "$LOCATION"
+
+# Set ownership
+bashio::log.info "Setting ownership to $PUID:$PGID"
+chown "$PUID":"$PGID" "$LOCATION"
--- a/webtop_kde/rootfs/etc/cont-init.d/20-folders.sh
+++ b/webtop_kde/rootfs/etc/cont-init.d/20-folders.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/with-contenv bashio
+# shellcheck shell=bash
+
+# Define home
+HOME="/share/webtop_kde"
+mkdir -p $HOME
+chown -R abc:abc $HOME
+
+#adduser USERNAME
+#useradd -m abc -p abc
--- a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh
+++ b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/with-contenv bashio
+# shellcheck shell=bash
+# shellcheck disable=SC2015
+
+# Add Edge repositories
+if bashio::config.true 'edge_repositories'; then
+    bashio::log.info "Changing app repositories to edge"
+    { echo "https://dl-cdn.alpinelinux.org/alpine/edge/community";
+        echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing";
+    echo "https://dl-cdn.alpinelinux.org/alpine/edge/main"; } > /etc/apk/repositories
+fi
+
+# Install rpi video drivers
+if bashio::config.true 'rpi_video_drivers'; then
+    bashio::log.info "Installing Rpi graphic drivers"
+    apk add --no-cache mesa-dri-vc4 mesa-dri-swrast mesa-gbm xf86-video-fbdev >/dev/null && bashio::log.green "... done" ||
+    bashio::log.red "... not successful. Are you on a rpi?"
+fi
+
+# Fix mate software center
+if [ -f /usr/lib/dbus-1.0/dbus-daemon-launch-helper ]; then
+    echo "Allow software center"
+    chmod u+s /usr/lib/dbus-1.0/dbus-daemon-launch-helper
+    service dbus restart
+fi
+
+# Install specific apps
+if bashio::config.has_value 'additional_apps'; then
+    bashio::log.info "Installing additional apps :"
+    # hadolint ignore=SC2005
+    NEWAPPS=$(bashio::config 'additional_apps')
+    for APP in ${NEWAPPS//,/ }; do
+        bashio::log.green "... $APP"
+        # shellcheck disable=SC2015
+        apk add --no-cache "$APP" >/dev/null || bashio::log.red "... not successful, please check package name"
+    done
+fi
+
+# Set TZ
+if bashio::config.has_value 'TZ'; then
+    TIMEZONE=$(bashio::config 'TZ')
+    bashio::log.info "Setting timezone to $TIMEZONE"
+    ln -snf /usr/share/zoneinfo/"$TIMEZONE" /etc/localtime && echo "$TIMEZONE" >/etc/timezone
+fi
+
+# Set keyboard
+if bashio::config.has_value 'KEYBOARD'; then
+    KEYBOARD=$(bashio::config 'KEYBOARD')
+    bashio::log.info "Setting keyboard to $KEYBOARD"
+    sed -i "1a export KEYBOARD=$KEYBOARD" /etc/s6-overlay/s6-rc.d/svc-web/run
+    if [ -d /var/run/s6/container_environment ]; then printf "%s" "$KEYBOARD" > /var/run/s6/container_environment/KEYBOARD; fi
+    printf "%s" "KEYBOARD=\"$KEYBOARD\"" >> ~/.bashrc
+fi
+
+# Set password
+if bashio::config.has_value 'PASSWORD'; then
+    bashio::log.info "Setting password to the value defined in options"
+    PASSWORD=$(bashio::config 'PASSWORD')
+    passwd -d abc
+    echo -e "$PASSWORD\n$PASSWORD" | passwd abc
+fi
--- a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh
+++ b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/with-contenv bashio
+# shellcheck shell=bash
+
+#################
+# NGINX SETTING #
+#################
+declare port
+declare certfile
+declare ingress_interface
+declare ingress_port
+declare keyfile
+
+port=$(bashio::addon.port 80)
+if bashio::var.has_value "${port}"; then
+    bashio::config.require.ssl
+
+    if bashio::config.true 'ssl'; then
+        certfile=$(bashio::config 'certfile')
+        keyfile=$(bashio::config 'keyfile')
+
+        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
+        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
+        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
+
+    else
+        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
+    fi
+fi
+
+ingress_port=$(bashio::addon.ingress_port)
+ingress_interface=$(bashio::addon.ip_address)
+sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
+sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
+
+# Implement SUBFOLDER value
+sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/s6-overlay/s6-rc.d/svc-autostart/run