From 8ee70017f9a846eac4e8008f52d7653be5252206 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 21 Feb 2025 10:33:06 +0000 Subject: [PATCH] Symlinks --- webtop/CHANGELOG.md | 222 +----------------- webtop/Dockerfile | 123 +--------- webtop/README.md | 76 +----- webtop/apparmor.txt | 71 +----- webtop/rootfs | 1 + webtop/rootfs/etc/cont-init.d/20-folders.sh | 70 ------ .../etc/cont-init.d/80-configuration.sh | 49 ---- webtop/rootfs/etc/cont-init.d/90-ingress.sh | 29 --- webtop/rootfs/etc/cont-init.d/90-ssl.sh | 22 -- webtop/rootfs/etc/nginx/includes/mime.types | 96 -------- .../etc/nginx/includes/proxy_params.conf | 15 -- .../rootfs/etc/nginx/includes/resolver.conf | 1 - .../etc/nginx/includes/server_params.conf | 6 - .../rootfs/etc/nginx/includes/ssl_params.conf | 9 - .../rootfs/etc/nginx/includes/upstream.conf | 3 - 15 files changed, 5 insertions(+), 788 deletions(-) mode change 100644 => 120000 webtop/CHANGELOG.md mode change 100644 => 120000 webtop/Dockerfile mode change 100644 => 120000 webtop/README.md mode change 100644 => 120000 webtop/apparmor.txt create mode 120000 webtop/rootfs delete mode 100755 webtop/rootfs/etc/cont-init.d/20-folders.sh delete mode 100755 webtop/rootfs/etc/cont-init.d/80-configuration.sh delete mode 100755 webtop/rootfs/etc/cont-init.d/90-ingress.sh delete mode 100755 webtop/rootfs/etc/cont-init.d/90-ssl.sh delete mode 100644 webtop/rootfs/etc/nginx/includes/mime.types delete mode 100644 webtop/rootfs/etc/nginx/includes/proxy_params.conf delete mode 100644 webtop/rootfs/etc/nginx/includes/resolver.conf delete mode 100644 webtop/rootfs/etc/nginx/includes/server_params.conf delete mode 100644 webtop/rootfs/etc/nginx/includes/ssl_params.conf delete mode 100644 webtop/rootfs/etc/nginx/includes/upstream.conf diff --git a/webtop/CHANGELOG.md b/webtop/CHANGELOG.md deleted file mode 100644 index 29bf11b2b..000000000 --- a/webtop/CHANGELOG.md +++ /dev/null @@ -1,221 +0,0 @@ -## 4.16-r0-ls95-3 (29-01-2025) -- Minor bugs fixed - -## 4.16-r0-ls93 (07-12-2024) -- Update to latest version from linuxserver/docker-webtop (changelog : https://github.com/linuxserver/docker-webtop/releases) - -## 4.16-r0-ls95 (30-11-2024) -- Update to latest version from linuxserver/docker-webtop (changelog : https://github.com/linuxserver/docker-webtop/releases) - -## 4.16-r0-ls94 (23-11-2024) -- Update to latest version from linuxserver/docker-webtop (changelog : https://github.com/linuxserver/docker-webtop/releases) - -## 4.16-r0-ls93 (16-11-2024) -- Update to latest version from linuxserver/docker-webtop (changelog : https://github.com/linuxserver/docker-webtop/releases) - -## 4.16-r0-ls95 (09-11-2024) -- Update to latest version from linuxserver/docker-webtop (changelog : https://github.com/linuxserver/docker-webtop/releases) - -## 4.16-r0-ls94 (26-10-2024) -- Update to latest version from linuxserver/docker-webtop (changelog : https://github.com/linuxserver/docker-webtop/releases) -## ubuntu-xfce-33543f91-ls159 (04-09-2024) -- Minor bugs fixed - -## 5c8ffd24-ls153 (04-04-2024) -- Addition of other ports ; must be manually activated through the addon options - -## 4.16-r0-ls89-xfce12 (08-09-2023) - -- Minor bugs fixed - -## 4.16-r0-ls89-xfce11 (05-09-2023) - -- Minor bugs fixed - -## 4.16-r0-ls89-xfce3 (04-09-2023) - -- Ingress enabled - -## 4.16-r0-ls89-xfce (03-09-2023) - -- MAJOR REWORK : is now operational with Webtop 2.0 -- Based on Ubuntu XFCE - -## 4.16-r0-ls80 (06-12-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls79 (27-11-2022) - -- Update to latest version from linuxserver/docker-webtop -- WARNING : update to supervisor 2022.11 before installing - -## 4.16-r0-ls78 (22-11-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls77 (14-11-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls76 (08-11-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls75 (25-10-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls74 (20-10-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls73 (18-10-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls72 (04-10-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls71 (27-09-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls70 (20-09-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls69 (09-09-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls68 (30-08-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls67 (16-08-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls66 (09-08-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls65 (04-08-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls64 (26-07-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls63 (19-07-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls62 (05-07-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls61 (21-06-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls60 (14-06-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls59 (06-06-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls58 (31-05-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls57 (24-05-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls56 (17-05-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls55 (10-05-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls54 (01-05-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls53 (26-04-2022) - -- Update to latest version from linuxserver/docker-webtop -- Fix custom timezone - -## 4.16-r0-ls52 (19-04-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls51 (11-04-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls50 (05-04-2022) - -- Update to latest version from linuxserver/docker-webtop -- Devicetree feature removed as cause issue on some systems - -## 4.16-r0-ls49 (27-03-2022) - -- Update to latest version from linuxserver/docker-webtop -- Add codenotary sign - -## 4.16-r0-ls48 (22-03-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls47 (14-03-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls46 (06-03-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls45 (27-02-2022) - -- Update to latest version from linuxserver/docker-webtop -- Map device tree - -## 4.16-r0-ls44 (20-02-2022) - -- Update to latest version from linuxserver/docker-webtop - -## 4.16-r0-ls43 (13-02-2022) - -- Update to latest version from linuxserver/docker-webtop -- New feature : addition of ingress -- New feature : change password from addon options - -## 4.16-r0-ls42 (07-02-2022) - -- Update to latest version from linuxserver/docker-webtop -- Option to enable rpi graphic drivers -- Option to enable edge repositories -- Code improvement - -## 4.16-r0-ls40 (04-02-2022) - -- Update to latest version from linuxserver/docker-webtop -- Alpine KDE -- To update, uninstall and reinstall -- Add several custom repositories by default to increase installable apps - -## 4.16 (07-01-2022) - -- Update to latest version from linuxserver/docker-webtop -- New standardized logic for Dockerfile build and packages installation -- Initial release diff --git a/webtop/CHANGELOG.md b/webtop/CHANGELOG.md new file mode 120000 index 000000000..dadb8c0e2 --- /dev/null +++ b/webtop/CHANGELOG.md @@ -0,0 +1 @@ +../webtop_kde/CHANGELOG.md \ No newline at end of file diff --git a/webtop/Dockerfile b/webtop/Dockerfile deleted file mode 100644 index 548582460..000000000 --- a/webtop/Dockerfile +++ /dev/null @@ -1,122 +0,0 @@ -#============================# -# ALEXBELGIUM'S DOCKERFILE # -#============================# -# _.------. -# _.-` ('>.-`"""-. -# '.--'` _'` _ .--.) -# -' '-.-';` ` -# ' - _.' ``'--. -# '---` .-'""` -# /` -#=== Home Assistant Addon ===# - -################# -# 1 Build Image # -################# - -ARG BUILD_FROM -ARG BUILD_VERSION -FROM ${BUILD_FROM} - -################## -# 2 Modify Image # -################## - -# Set S6 wait time -ENV S6_CMD_WAIT_FOR_SERVICES=1 \ - S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ - S6_SERVICES_GRACETIME=0 - - -# load volume -VOLUME [ "/sys/fs/cgroup" ] - -# Allow UID and GID setting -# hadolint ignore=SC2015,DL4006,SC2013,SC2086 -RUN \ - # Change home folder location - usermod --home /share/webtop_kde abc - -# Global LSIO modifications -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh" -ARG CONFIGLOCATION="/share/webtop_kde" -RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh - -################## -# 3 Install apps # -################## - -# Add rootfs -COPY rootfs/ / - -# Uses /bin for compatibility purposes -# hadolint ignore=DL4005 -RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \ - if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi - -# Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-dns_set.sh" - -# Automatic modules download -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" -RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh - -# Manual apps -ENV PACKAGES="nginx engrampa" - -# Automatic apps & bashio -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" -RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh - -################ -# 4 Entrypoint # -################ - -# Add entrypoint -ENV S6_STAGE2_HOOK=/ha_entrypoint.sh -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" - -# Entrypoint modifications -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh" -RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh - -# -#WORKDIR / -#ENTRYPOINT [ "/usr/bin/env" ] -#CMD [ "/ha_entrypoint.sh" ] -#SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -############ -# 5 Labels # -############ - -ARG BUILD_ARCH -ARG BUILD_DATE -ARG BUILD_DESCRIPTION -ARG BUILD_NAME -ARG BUILD_REF -ARG BUILD_REPOSITORY -ARG BUILD_VERSION -ENV BUILD_VERSION="${BUILD_VERSION}" -LABEL \ - io.hass.name="${BUILD_NAME}" \ - io.hass.description="${BUILD_DESCRIPTION}" \ - io.hass.arch="${BUILD_ARCH}" \ - io.hass.type="addon" \ - io.hass.version=${BUILD_VERSION} \ - maintainer="alexbelgium (https://github.com/alexbelgium)" \ - org.opencontainers.image.title="${BUILD_NAME}" \ - org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ - org.opencontainers.image.vendor="Home Assistant Add-ons" \ - org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.url="https://github.com/alexbelgium" \ - org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ - org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ - org.opencontainers.image.created=${BUILD_DATE} \ - org.opencontainers.image.revision=${BUILD_REF} \ - org.opencontainers.image.version=${BUILD_VERSION} - -#################### -# 6 HealthcheckNOT # -#################### diff --git a/webtop/Dockerfile b/webtop/Dockerfile new file mode 120000 index 000000000..9996ecb2c --- /dev/null +++ b/webtop/Dockerfile @@ -0,0 +1 @@ +../webtop_kde/Dockerfile \ No newline at end of file diff --git a/webtop/README.md b/webtop/README.md deleted file mode 100644 index 54881b431..000000000 --- a/webtop/README.md +++ /dev/null @@ -1,75 +0,0 @@ -# Home assistant add-on: Webtop KDE Alpine - -[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) -[![Donate][paypal-badge]](https://www.paypal.com/donate/?hosted_button_id=DZFULJZTP3UQA) - -![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fwebtop_kde%2Fconfig.json) -![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fwebtop_kde%2Fconfig.json) -![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fwebtop_kde%2Fconfig.json) - -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade) -[![GitHub Super-Linter](https://img.shields.io/github/actions/workflow/status/alexbelgium/hassio-addons/weekly-supelinter.yaml?label=Lint%20code%20base)](https://github.com/alexbelgium/hassio-addons/actions/workflows/weekly-supelinter.yaml) -[![Builder](https://img.shields.io/github/actions/workflow/status/alexbelgium/hassio-addons/onpush_builder.yaml?label=Builder)](https://github.com/alexbelgium/hassio-addons/actions/workflows/onpush_builder.yaml) - -[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee%20(no%20paypal)-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white -[paypal-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee%20with%20Paypal-0070BA?logo=paypal&style=flat&logoColor=white - -_Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ - -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) - -![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/webtop_kde/stats.png) - -## About - -[webtop](https://github.com/webtop/webtop) is a full desktop environments accessible via any modern web browser. -This addon is based on the docker image https://github.com/linuxserver/docker-webtop - -## Configuration - -Webui can be found with ingress or at . The port is by default disabled but can be enabled through the addon options. - -By default the image is based around the abc user and we recommend using this user as all of the init/config is based around it. The default password is also abc . If you want to change this password and require authentication when accessing the interface simply issue passwd inside a gui terminal in the webtop. Then when accessing the web interface use the path: - -http://localhost:3000/?login=true - -Apps installations are not remanent, you need to do it via addon options. Their config, however, is. - -If graphics don't work, use the DRINODE feature to select your graphic device. - -See all potential ENV variables here : https://docs.linuxserver.io/images/docker-webtop#optional-environment-variables - -```yaml -TZ: timezone ; Country/City according to https://manpages.ubuntu.com/manpages/trusty/man3/DateTime::TimeZone::Catalog.3pm.html -additional_apps: engrampa,thunderbird # Allows installation of apps, as they are not persistent -DRINODE: specify a custom graphic device, default is /dev/dri/renderD128 -DNS_servers: 8.8.8.8,1.1.1.1 # Keep blank to use router’s DNS, or set custom DNS to avoid spamming in case of local DNS ad-remover -localdisks: sda1 #put the hardware name of your drive to mount separated by commas, or its label. ex. sda1, sdb1, MYNAS... -networkdisks: "//SERVER/SHARE" # optional, list of smb servers to mount, separated by commas -cifsusername: "username" # optional, smb username, same for all smb shares -cifspassword: "password" # optional, smb password -cifsdomain: "domain" # optional, allow setting the domain for the smb share -``` - -## Installation - -The installation of this add-on is pretty straightforward and not different in comparison to installing any other add-on. - -1. Add my add-ons repository to your home assistant instance (in supervisor addons store at top right, or click button below if you have configured my HA) - [![Open your Home Assistant instance and show the add add-on repository dialog with a specific repository URL pre-filled.](https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Falexbelgium%2Fhassio-addons) -1. Install this add-on. -1. Click the `Save` button to store your configuration. -1. Set the add-on options to your preferences -1. Start the add-on. -1. Check the logs of the add-on to see if everything went well. -1. Open the webUI and adapt the software options - -## Support - -Create an issue on github - -## Illustration - -![illustration](https://www.linuxserver.io/user/pages/content/images/2021/05/menu.png) - -[repository]: https://github.com/alexbelgium/hassio-addons diff --git a/webtop/README.md b/webtop/README.md new file mode 120000 index 000000000..f89d0b987 --- /dev/null +++ b/webtop/README.md @@ -0,0 +1 @@ +../webtop_kde/README.md \ No newline at end of file diff --git a/webtop/apparmor.txt b/webtop/apparmor.txt deleted file mode 100644 index a896c3c93..000000000 --- a/webtop/apparmor.txt +++ /dev/null @@ -1,70 +0,0 @@ -#include - -profile webtop_kde_addon flags=(attach_disconnected,mediate_deleted) { - #include - - capability, - file, - signal, - mount, - umount, - remount, - network udp, - network tcp, - network dgram, - network stream, - network inet, - network inet6, - network netlink raw, - network unix dgram, - - capability setgid, - capability setuid, - capability sys_admin, - capability dac_read_search, - capability dac_override, - # capability sys_rawio, - -# S6-Overlay - /init ix, - /run/{s6,s6-rc*,service}/** ix, - /package/** ix, - /command/** ix, - /run/{,**} rwk, - /dev/tty rw, - /bin/** ix, - /usr/bin/** ix, - /usr/lib/bashio/** ix, - /etc/s6/** rix, - /run/s6/** rix, - /etc/services.d/** rwix, - /etc/cont-init.d/** rwix, - /etc/cont-finish.d/** rwix, - /init rix, - /var/run/** mrwkl, - /var/run/ mrwkl, - /dev/i2c-1 mrwkl, - # Files required - /dev/fuse mrwkl, - /dev/sda1 mrwkl, - /dev/sdb1 mrwkl, - /dev/nvme0 mrwkl, - /dev/nvme1 mrwkl, - /dev/mmcblk0p1 mrwkl, - /dev/* mrwkl, - /udev/* mrwkl, - /tmp/** mrkwl, - /dev/fuse/** mrkwl, - /dev/** mrkwl, - /sys/firmware/** mrkwl, - - # Data access - /data/** rw, - - # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container - ptrace (trace,read) peer=docker-default, - - # docker daemon confinement requires explict allow rule for signal - signal (receive) set=(kill,term) peer=/usr/bin/docker, - -} diff --git a/webtop/apparmor.txt b/webtop/apparmor.txt new file mode 120000 index 000000000..1273c882f --- /dev/null +++ b/webtop/apparmor.txt @@ -0,0 +1 @@ +../webtop_kde/apparmor.txt \ No newline at end of file diff --git a/webtop/rootfs b/webtop/rootfs new file mode 120000 index 000000000..5cdce711d --- /dev/null +++ b/webtop/rootfs @@ -0,0 +1 @@ +../webtop_kde/rootfs \ No newline at end of file diff --git a/webtop/rootfs/etc/cont-init.d/20-folders.sh b/webtop/rootfs/etc/cont-init.d/20-folders.sh deleted file mode 100755 index 7a4f0142d..000000000 --- a/webtop/rootfs/etc/cont-init.d/20-folders.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -# shellcheck disable=SC2046 -set -e - -# 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="/share/webtop_kde" - 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" - -# Correct home locations -for file in /etc/s6-overlay/s6-rc.d/*/run; do - if [ "$(sed -n '1{/bash/p};q' "$file")" ]; then - sed -i "1a export HOME=$LOCATION" "$file" - sed -i "1a export FM_HOME=$LOCATION" "$file" - fi -done - -# Correct home location -for folders in /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d; do - if [ -d "$folders" ]; then - sed -i "s|/share/webtop_kde|$LOCATION|g" $(find "$folders" -type f) &>/dev/null || true - fi -done - -# Change user home -usermod --home "$LOCATION" abc - -# Add environment variables -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\n" "HOME=\"$LOCATION\"" - printf "%s\n" "FM_HOME=\"$LOCATION\"" -} >> ~/.bashrc - -# Create folder -echo "Creating $LOCATION" -mkdir -p "$LOCATION" - -# Set ownership -bashio::log.info "Setting ownership to $PUID:$PGID" -chown -R "$PUID":"$PGID" "$LOCATION" -chmod -R 755 "$LOCATION" diff --git a/webtop/rootfs/etc/cont-init.d/80-configuration.sh b/webtop/rootfs/etc/cont-init.d/80-configuration.sh deleted file mode 100755 index a71f72e29..000000000 --- a/webtop/rootfs/etc/cont-init.d/80-configuration.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -# shellcheck disable=SC2015 -set -e - -# 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 packagestoinstall in ${NEWAPPS//,/ }; do - bashio::log.green "... $packagestoinstall" - if command -v "apk" &>/dev/null; then - apk add --no-cache "$packagestoinstall" &>/dev/null || (bashio::log.fatal "Error : $packagestoinstall not found") - elif command -v "apt" &>/dev/null; then - apt-get install -yqq --no-install-recommends "$packagestoinstall" &>/dev/null || (bashio::log.fatal "Error : $packagestoinstall not found") - elif command -v "pacman" &>/dev/null; then - pacman --noconfirm -S "$packagestoinstall" &>/dev/null || (bashio::log.fatal "Error : $packagestoinstall not found") - fi - 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 || (bashio::log.fatal "Error : $TIMEZONE not found. Here is a list of valid timezones : https://manpages.ubuntu.com/manpages/focal/man3/DateTime::TimeZone::Catalog.3pm.html") - -# Set keyboard -if bashio::config.has_value 'KEYBOARD'; then - KEYBOARD=$(bashio::config 'KEYBOARD') - bashio::log.info "Setting keyboard to $KEYBOARD" - if [ -d /var/run/s6/container_environment ]; then printf "%s" "$KEYBOARD" > /var/run/s6/container_environment/KEYBOARD; fi - printf "%s\n" "KEYBOARD=\"$KEYBOARD\"" >> ~/.bashrc -fi || true - -# 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 -elif ! bashio::config.has_value 'PASSWORD' && [[ -n "$(bashio::addon.port "3000")" ]] && [[ -n $(bashio::addon.port "3001") ]]; then - bashio::log.warning "SEVERE RISK IDENTIFIED" - bashio::log.warning "You are opening an external port but your password is not defined" - bashio::log.warning "You risk being hacked ! Please disable the external ports, or use a password" -fi diff --git a/webtop/rootfs/etc/cont-init.d/90-ingress.sh b/webtop/rootfs/etc/cont-init.d/90-ingress.sh deleted file mode 100755 index 789c69061..000000000 --- a/webtop/rootfs/etc/cont-init.d/90-ingress.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e - -# nginx Path -NGINX_CONFIG=/etc/nginx/sites-available/ingress.conf -SUBFOLDER="$(bashio::addon.ingress_entry)" - -# Copy template -cp /defaults/default.conf "${NGINX_CONFIG}" -# Remove ssl part -awk -v n=4 '/server/{n--}; n > 0' "${NGINX_CONFIG}" > tmpfile -mv tmpfile "${NGINX_CONFIG}" - -# Remove ipv6 -sed -i '/listen \[::\]/d' "${NGINX_CONFIG}" -# Add ingress parameters -sed -i "s|3000|$(bashio::addon.ingress_port)|g" "${NGINX_CONFIG}" -sed -i '/proxy_buffering/a proxy_set_header Accept-Encoding "";' "${NGINX_CONFIG}" -sed -i '/proxy_buffering/a sub_filter_once off;' "${NGINX_CONFIG}" -sed -i '/proxy_buffering/a sub_filter_types *;' "${NGINX_CONFIG}" -sed -i '/proxy_buffering/a sub_filter "vnc/index.html?autoconnect" "vnc/index.html?path=%%path%%/websockify?autoconnect";' "${NGINX_CONFIG}" -sed -i "s|%%path%%|${SUBFOLDER:1}|g" "${NGINX_CONFIG}" - -# Correct image -sed -i "s|SUBFOLDERwebsockify|/websockify|g" "${NGINX_CONFIG}" - -# Enable ingress -cp "${NGINX_CONFIG}" /etc/nginx/sites-enabled diff --git a/webtop/rootfs/etc/cont-init.d/90-ssl.sh b/webtop/rootfs/etc/cont-init.d/90-ssl.sh deleted file mode 100755 index 5d011d509..000000000 --- a/webtop/rootfs/etc/cont-init.d/90-ssl.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e - -if bashio::config.true 'use_own_certs'; then - bashio::log.green "Using referenced ssl certificates to connect with https. Please remember to open the ssl port in the addon options" - CERTFILE="$(bashio::config 'certfile')" - KEYFILE="$(bashio::config 'keyfile')" - NGINX_CONFIG="/defaults/default.conf" - - #Check if files exist - echo "... checking if referenced files exist" - if [ -f /ssl/"$CERTFILE" ] && [ -f /ssl/"$KEYFILE" ]; then - # Add ssl file - sed -i "s|/config/data/ssl/cert.pem|/ssl/$CERTFILE|g" "$NGINX_CONFIG" - sed -i "s|/config/data/ssl/cert.key|/ssl/$KEYFILE|g" "$NGINX_CONFIG" - echo "... done" - else - bashio::log.warning "... certificate /ssl/$CERTFILE and /ssl/$KEYFILE and not found, using self-generated certificates" - fi - -fi diff --git a/webtop/rootfs/etc/nginx/includes/mime.types b/webtop/rootfs/etc/nginx/includes/mime.types deleted file mode 100644 index 7c7cdef2d..000000000 --- a/webtop/rootfs/etc/nginx/includes/mime.types +++ /dev/null @@ -1,96 +0,0 @@ -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/webtop/rootfs/etc/nginx/includes/proxy_params.conf b/webtop/rootfs/etc/nginx/includes/proxy_params.conf deleted file mode 100644 index 1990d4959..000000000 --- a/webtop/rootfs/etc/nginx/includes/proxy_params.conf +++ /dev/null @@ -1,15 +0,0 @@ -proxy_http_version 1.1; -proxy_ignore_client_abort off; -proxy_read_timeout 86400s; -proxy_redirect off; -proxy_send_timeout 86400s; -proxy_max_temp_file_size 0; - -proxy_set_header Accept-Encoding ""; -proxy_set_header Connection $connection_upgrade; -proxy_set_header Host $http_host; -proxy_set_header Upgrade $http_upgrade; -proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -proxy_set_header X-Forwarded-Proto $scheme; -proxy_set_header X-NginX-Proxy true; -proxy_set_header X-Real-IP $remote_addr; diff --git a/webtop/rootfs/etc/nginx/includes/resolver.conf b/webtop/rootfs/etc/nginx/includes/resolver.conf deleted file mode 100644 index 70f4982b9..000000000 --- a/webtop/rootfs/etc/nginx/includes/resolver.conf +++ /dev/null @@ -1 +0,0 @@ -resolver 127.0.0.11 ipv6=off; diff --git a/webtop/rootfs/etc/nginx/includes/server_params.conf b/webtop/rootfs/etc/nginx/includes/server_params.conf deleted file mode 100644 index 09c06543e..000000000 --- a/webtop/rootfs/etc/nginx/includes/server_params.conf +++ /dev/null @@ -1,6 +0,0 @@ -root /dev/null; -server_name $hostname; - -add_header X-Content-Type-Options nosniff; -add_header X-XSS-Protection "1; mode=block"; -add_header X-Robots-Tag none; diff --git a/webtop/rootfs/etc/nginx/includes/ssl_params.conf b/webtop/rootfs/etc/nginx/includes/ssl_params.conf deleted file mode 100644 index 6f1500599..000000000 --- a/webtop/rootfs/etc/nginx/includes/ssl_params.conf +++ /dev/null @@ -1,9 +0,0 @@ -ssl_protocols TLSv1.2; -ssl_prefer_server_ciphers on; -ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; -ssl_ecdh_curve secp384r1; -ssl_session_timeout 10m; -ssl_session_cache shared:SSL:10m; -ssl_session_tickets off; -ssl_stapling on; -ssl_stapling_verify on; diff --git a/webtop/rootfs/etc/nginx/includes/upstream.conf b/webtop/rootfs/etc/nginx/includes/upstream.conf deleted file mode 100644 index b292326bd..000000000 --- a/webtop/rootfs/etc/nginx/includes/upstream.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream backend { - server 127.0.0.1:8080; -}