diff --git a/jellyfin_test/CHANGELOG.md b/jellyfin_test/CHANGELOG.md deleted file mode 100644 index 23d206078..000000000 --- a/jellyfin_test/CHANGELOG.md +++ /dev/null @@ -1,38 +0,0 @@ -- Added watchdog feature -- Allow mounting of devices up to sdg2 -- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename - -## 10.7.7-1-ls130 (06-09-2021) - -- Update to latest version from linuxserver/docker-jellyfin - -## 10.7.6-1-ls118 (19-06-2021) - -- Update to latest version from linuxserver/docker-jellyfin - -## 10.7.5-1-ls113 (20-05-2021) - -- Update to latest version from linuxserver/docker-jellyfin -- Add banner to log - -## 10.7.5-1-ls112 (14-05-2021) - -- Update to latest version from linuxserver/docker-jellyfin - -## 10.7.5-1-ls111 (06-05-2021) - -- Update to latest version from linuxserver/docker-jellyfin - -## 10.7.2-1-ls110 (30-04-2021) - -- Update to latest version from linuxserver/docker-jellyfin - -## 10.7.2-1-ls109 - -- Update to latest version from linuxserver/docker-jellyfin -- Enables PUID/GUID options -- New feature : mount smb share in protected mode -- New feature : mount multiple smb shares -- New config/feature : mount smbv1 -- Changed path : changed smb mount path from /storage/externalcifs to /mnt/$NAS name -- Removed feature : ability to remove protection and mount local hdd, to increase the addon score diff --git a/jellyfin_test/Dockerfile b/jellyfin_test/Dockerfile deleted file mode 100644 index 4cb618b60..000000000 --- a/jellyfin_test/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -ARG BUILD_FROM -ARG BUILD_VERSION -FROM ${BUILD_FROM} - -# Set shell -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -ARG BASHIO_VERSION=0.14.3 - -RUN apt-get update \ - \ - && apt-get install -y --no-install-recommends \ - jq \ - samba \ - smbclient \ - nginx \ - \ - && apt-get -y upgrade cifs-utils \ - \ - ################## - # Install bashio # - ################## - && mkdir -p /tmp/bashio \ - && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \ - | tar -xzf - --strip 1 -C /tmp/bashio \ - && mv /tmp/bashio/lib /usr/lib/bashio \ - && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ - && rm -rf /tmp/bashio \ - \ - # Allow UID and GID setting - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ - && sed -i "s|/config|/config/jellyfin|g" /etc/services.d/jellyfin/run \ - && sed -i "s|/config|/config/jellyfin|g" /etc/cont-init.d/10-adduser \ - && sed -i "s|/config|/config/jellyfin|g" /etc/cont-init.d/30-config \ - && chmod g+rw /dev/video10 /dev/video11 /dev/video12 /dev/video13 /dev/video14 /dev/video15 /dev/video16 \ - || true - -# copy local files -COPY root/ / - -### LABELS -ARG BUILD_ARCH -ARG BUILD_DATE -ARG BUILD_DESCRIPTION -ARG BUILD_NAME -ARG BUILD_REF -ARG BUILD_REPOSITORY -ARG 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} diff --git a/jellyfin_test/README.md b/jellyfin_test/README.md deleted file mode 100644 index b7d2e7b91..000000000 --- a/jellyfin_test/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# Home assistant add-on: jellyfin - -[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) - -[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white - -![Supports - Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield] - -_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://reporoster.com/stars/alexbelgium/hassio-addons)](https://github.com/alexbelgium/hassio-addons/stargazers) - -## About - -Forked to add latest beta versions, smb and local hdd mount. - -- Inital version : https://github.com/petersendev/hassio-addons -- CIFS code : https://github.com/dianlight/hassio-addons - -[jellyfin](https://jellyfin.media/) organizes video, music, live TV, and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone jellyfin Media Server. - -This addon is based on the [docker image](https://github.com/linuxserver/docker-jellyfin) from linuxserver.io. - -## Installation - -The installation of this add-on is pretty straightforward and not different in -comparison to installing any other Hass.io add-on. - -1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance. -1. Install this add-on. -1. Click the `Save` button to store your configuration. -1. Start the add-on. -1. Check the logs of the add-on to see if everything went well. -1. Carefully configure the add-on to your preferences, see the official documentation for for that. - -## Configuration - -Webui can be found at `:8096`. - -[smb-shield]: https://img.shields.io/badge/SMB--green?style=plastic.svg -[repository]: https://github.com/alexbelgium/hassio-addons -[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg -[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg -[armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg -[armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg diff --git a/jellyfin_test/apparmor.txt b/jellyfin_test/apparmor.txt deleted file mode 100644 index f7ee4ef2b..000000000 --- a/jellyfin_test/apparmor.txt +++ /dev/null @@ -1,49 +0,0 @@ -#include - -profile addon_db21ed7f_jellyfin_nas flags=(attach_disconnected,mediate_deleted) { - #include - - capability, - file, - mount, - umount, - remount, - - capability setgid, - capability setuid, - capability sys_admin, - capability dac_read_search, - # capability dac_override, - # capability sys_rawio, - -# S6-Overlay - /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/sda1 mrwkl, - /dev/sdb1 mrwkl, - /dev/mmcblk0p1 mrwkl, - /dev/ttyUSB0 mrwkl, - /dev/* mrwkl, - /tmp/** 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/jellyfin_test/build.json b/jellyfin_test/build.json deleted file mode 100644 index ebde6af63..000000000 --- a/jellyfin_test/build.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "build_from": { - "armv7": "linuxserver/jellyfin:arm32v7-latest", - "armhf": "linuxserver/jellyfin:arm32v7-latest", - "aarch64": "linuxserver/jellyfin:arm64v8-latest", - "amd64": "linuxserver/jellyfin:amd64-latest" - } -} diff --git a/jellyfin_test/config.json b/jellyfin_test/config.json deleted file mode 100644 index 31507f0b3..000000000 --- a/jellyfin_test/config.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "apparmor": true, - "arch": ["aarch64", "amd64", "armv7", "armhf"], - "boot": "auto", - "description": "A Free Software Media System that puts you in control of managing and streaming your media.", - "devices": [ - "/dev/ttyUSB0", - "/dev/dri", - "/dev/video10", - "/dev/video11", - "/dev/video12", - "/dev/video13", - "/dev/video14", - "/dev/video15", - "/dev/video16", - "/dev/sda", - "/dev/sdb", - "/dev/sdc", - "/dev/sdd", - "/dev/sde", - "/dev/sdf", - "/dev/sdg", - "/dev/nvme", - "/dev/mmcblk", - "/dev/sda1", - "/dev/sdb1", - "/dev/sdc1", - "/dev/sdd1", - "/dev/sde1", - "/dev/sdf1", - "/dev/sdg1", - "/dev/sda2", - "/dev/sdb2", - "/dev/sdc2", - "/dev/sdd2", - "/dev/sde2", - "/dev/sdf2", - "/dev/sdg2", - "/dev/nvme0", - "/dev/nvme1", - "/dev/nvme2", - "/dev/mmcblk0", - "/dev/mmcblk0p1" - ], - "map": ["config:rw", "share:rw", "media:rw", "ssl"], - "name": "Jellyfin_test DO NOT USE", - "host_dbus": true, - "ingress": true, - "ingress_port": 8099, - "panel_icon": "mdi:jellyfin", - "options": { - "PUID": 0, - "PGID": 0 - }, - "ports": { - "8096/tcp": 8096, - "8920/tcp": 8920, - "7359/udp": null, - "1900/udp": null - }, - "ports_description": { - "8096/tcp": "web interface", - "8920/tcp": "https web interface (optional)", - "7359/udp": "udp server discover (optional)", - "1900/udp": "dlna (optional)" - }, - "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH", "NET_ADMIN"], - "schema": { - "PUID": "int", - "PGID": "int", - "TZ": "str?", - "networkdisks": "str?", - "cifsusername": "str?", - "cifspassword": "str?", - "smbv1": "bool?" - }, - "slug": "jellyfin_test", - "startup": "services", - "upstream": "10.7.7-1-ls130", - "url": "https://github.com/alexbelgium/hassio-addons", - "version": "10.7.7-1-ls130-4", - "watchdog": "http://[HOST]:[PORT:8096]", - "webui": "http://[HOST]:[PORT:8096]" -} diff --git a/jellyfin_test/icon.png b/jellyfin_test/icon.png deleted file mode 100644 index c0bc82605..000000000 Binary files a/jellyfin_test/icon.png and /dev/null differ diff --git a/jellyfin_test/logo.png b/jellyfin_test/logo.png deleted file mode 100644 index c0bc82605..000000000 Binary files a/jellyfin_test/logo.png and /dev/null differ diff --git a/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index c0475abfe..000000000 --- a/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ ! -f "/usr/bin/bashio" ]; then - echo "Bashio does not exist, executing script" - ( - ################ - # Install apps # - ################ - apt-get update - apt-get install -y --no-install-recommends \ - jq \ - samba \ - smbclient \ - nginx - apt-get -y upgrade cifs-utils - - # Allow UID and GID setting - sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser - sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser - sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser - sed -i "s|/config|/config/jellyfin|g" /etc/services.d/jellyfin/run - sed -i "s|/config|/config/jellyfin|g" /etc/cont-init.d/10-adduser - sed -i "s|/config|/config/jellyfin|g" /etc/cont-init.d/30-config - - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.14.3 - mkdir -p /tmp/bashio - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | - tar -xzf - --strip 1 -C /tmp/bashio - mv /tmp/bashio/lib /usr/lib/bashio - ln -s /usr/lib/bashio/bashio /usr/bin/bashio - rm -rf /tmp/bashio - ) >/dev/null - -fi diff --git a/jellyfin_test/root/etc/cont-init.d/00-banner.sh b/jellyfin_test/root/etc/cont-init.d/00-banner.sh deleted file mode 100644 index f0c4ef9dd..000000000 --- a/jellyfin_test/root/etc/cont-init.d/00-banner.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/with-contenv bashio - -# ============================================================================== -# Displays a simple add-on banner on startup -# ============================================================================== - -if bashio::supervisor.ping; then - bashio::log.blue \ - '-----------------------------------------------------------' - bashio::log.blue " Add-on: $(bashio::addon.name)" - bashio::log.blue " $(bashio::addon.description)" - bashio::log.blue \ - '-----------------------------------------------------------' - - bashio::log.blue " Add-on version: $(bashio::addon.version)" - if bashio::var.true "$(bashio::addon.update_available)"; then - bashio::log.magenta ' There is an update available for this add-on!' - bashio::log.magenta \ - " Latest add-on version: $(bashio::addon.version_latest)" - bashio::log.magenta ' Please consider upgrading as soon as possible.' - else - bashio::log.green ' You are running the latest version of this add-on.' - fi - - bashio::log.blue " System: $(bashio::info.operating_system)" \ - " ($(bashio::info.arch) / $(bashio::info.machine))" - bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)" - bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)" - - bashio::log.blue \ - '-----------------------------------------------------------' - bashio::log.blue \ - ' Please, share the above information when looking for help' - bashio::log.blue \ - ' or support in, e.g., GitHub, forums' - bashio::log.green \ - ' https://github.com/alexbelgium/hassio-addons' - bashio::log.blue \ - '-----------------------------------------------------------' -fi diff --git a/jellyfin_test/root/etc/cont-init.d/00-ha-env b/jellyfin_test/root/etc/cont-init.d/00-ha-env deleted file mode 100644 index 3b3e69246..000000000 --- a/jellyfin_test/root/etc/cont-init.d/00-ha-env +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bashio - -for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do - printf "$(bashio::config $k)" > /var/run/s6/container_environment/$k -done \ No newline at end of file diff --git a/jellyfin_test/root/etc/cont-init.d/20-folders b/jellyfin_test/root/etc/cont-init.d/20-folders deleted file mode 100644 index c13d1313b..000000000 --- a/jellyfin_test/root/etc/cont-init.d/20-folders +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/with-contenv bash - -echo "chmod of devices" -chmod g+rw /dev/video10 /dev/video11 /dev/video12 /dev/video13 /dev/video14 /dev/video15 /dev/video16 - - -if [ ! -d /jellyfin ]; then - echo "Creating /jellyfin" - mkdir -p /jellyfin - chown -R abc:abc /jellyfin -fi - -if [ ! -d /share/storage/tv ]; then - echo "Creating /share/storage/tv" - mkdir -p /share/storage/tv - chown -R abc:abc /share/storage/tv -fi - -if [ ! -d /share/storage/movies ]; then - echo "Creating /share/storage/movies" - mkdir -p /share/storage/movies - chown -R abc:abc /share/storage/movies -fi - -if [ ! -d /share/jellyfin ]; then - echo "Creating /share/jellyfin" - mkdir -p /share/jellyfin - chown -R abc:abc /share/jellyfin -fi - -if [ ! -d /config/jellyfin ]; then - echo "Creating /config/jellyfin" - mkdir -p /config/jellyfin - chown -R abc:abc /config/jellyfin -fi - -# links - -if [ ! -d /jellyfin/cache ]; then - echo "Creating link for /jellyfin/cache" - mkdir -p /share/jellyfin/cache - chown -R abc:abc /share/jellyfin/cache - ln -s /share/jellyfin/cache /jellyfin/cache -fi - -if [ ! -d /jellyfin/config ]; then - echo "Creating link for /jellyfin/config" - mkdir -p /config/jellyfin - chown -R abc:abc /config/jellyfin - ln -s /config/jellyfin /jellyfin/config -fi - -if [ ! -d /jellyfin/data ]; then - echo "Creating link for /jellyfin/data" - mkdir -p /share/jellyfin/data - chown -R abc:abc /share/jellyfin/data - ln -s /share/jellyfin/data /jellyfin/data -fi - -if [ ! -d /jellyfin/logs ]; then - echo "Creating link for /jellyfin/logs" - mkdir -p /share/jellyfin/logs - chown -R abc:abc /share/jellyfin/logs - ln -s /share/jellyfin/logs /jellyfin/logs -fi - -if [ ! -d /jellyfin/metadata ]; then - echo "Creating link for /jellyfin/metadata" - mkdir -p /share/jellyfin/metadata - chown -R abc:abc /share/jellyfin/metadata - ln -s /share/jellyfin/metadata /jellyfin/metadata -fi - -if [ ! -d /jellyfin/plugins ]; then - echo "Creating link for /jellyfin/plugins" - mkdir -p /share/jellyfin/plugins - chown -R abc:abc /share/jellyfin/plugins - ln -s /share/jellyfin/plugins /jellyfin/plugins -fi - -if [ ! -d /jellyfin/root ]; then - echo "Creating link for /jellyfin/root" - mkdir -p /share/jellyfin/root - chown -R abc:abc /share/jellyfin/root - ln -s /share/jellyfin/root /jellyfin/root -fi diff --git a/jellyfin_test/root/etc/cont-init.d/32-nginx.sh b/jellyfin_test/root/etc/cont-init.d/32-nginx.sh deleted file mode 100644 index 4204ba072..000000000 --- a/jellyfin_test/root/etc/cont-init.d/32-nginx.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/with-contenv bashio - -################# -# 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 diff --git a/jellyfin_test/root/etc/cont-init.d/92-smb_mounts.sh b/jellyfin_test/root/etc/cont-init.d/92-smb_mounts.sh deleted file mode 100644 index 06410e554..000000000 --- a/jellyfin_test/root/etc/cont-init.d/92-smb_mounts.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/with-contenv bashio - -######################### -# MOUNT SMB SHARES v1.6 # -######################### -if bashio::config.has_value 'networkdisks'; then - - # Define variables - MOREDISKS=$(bashio::config 'networkdisks') - CIFS_USERNAME=$(bashio::config 'cifsusername') - CIFS_PASSWORD=$(bashio::config 'cifspassword') - MOUNTED=false - SMBVERS="" - SECVERS="" - - # Mount CIFS Share if configured and if Protection Mode is active - echo 'Mounting smb share(s)...' - - if bashio::config.has_value 'cifsdomain'; then - DOMAIN=",domain=$(bashio::config 'cifsdomain')" - else - DOMAIN="" - fi - - # Mounting disks - for disk in ${MOREDISKS//,/ }; do # Separate comma separated values - - # Clean name of network share - disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name - diskname=${disk//\\//} #replace \ with / - diskname=${diskname##*/} # Get only last part of the name - - # Data validation - if [[ ! $disk =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then - bashio::log.fatal "The structure of your \"networkdisks\" option : \"$disk\" doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2. If you don't use it, you can simply remove the text, this will avoid this error message in the future." - exit 0 - fi - - # Prepare mount point - mkdir -p /mnt/$diskname - chown -R root:root /mnt/$diskname - - #Tries to mount with default options - mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false - - # if Fail test different smb and sec versions - if [ $MOUNTED = false ]; then - for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do - mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false - for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do - mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false - done - done - fi - - # Messages - if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then - #Test write permissions - touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && - bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || - bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw" - - else - # Mounting failed messages - bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" - bashio::log.fatal "Here is some debugging info :" - - # Provide debugging info - smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client - #smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true - smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true - - # Error code - bashio::log.fatal "Error read : $(/dev/null || true - rmdir /mnt/$diskname || true - fi - - done -fi diff --git a/jellyfin_test/root/etc/nginx/includes/mime.types b/jellyfin_test/root/etc/nginx/includes/mime.types deleted file mode 100644 index 7c7cdef2d..000000000 --- a/jellyfin_test/root/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/jellyfin_test/root/etc/nginx/includes/proxy_params.conf b/jellyfin_test/root/etc/nginx/includes/proxy_params.conf deleted file mode 100644 index 1990d4959..000000000 --- a/jellyfin_test/root/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/jellyfin_test/root/etc/nginx/includes/resolver.conf b/jellyfin_test/root/etc/nginx/includes/resolver.conf deleted file mode 100644 index 6485af141..000000000 --- a/jellyfin_test/root/etc/nginx/includes/resolver.conf +++ /dev/null @@ -1 +0,0 @@ -resolver 127.0.0.11; diff --git a/jellyfin_test/root/etc/nginx/includes/server_params.conf b/jellyfin_test/root/etc/nginx/includes/server_params.conf deleted file mode 100644 index 09c06543e..000000000 --- a/jellyfin_test/root/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/jellyfin_test/root/etc/nginx/includes/ssl_params.conf b/jellyfin_test/root/etc/nginx/includes/ssl_params.conf deleted file mode 100644 index 6f1500599..000000000 --- a/jellyfin_test/root/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/jellyfin_test/root/etc/nginx/includes/upstream.conf b/jellyfin_test/root/etc/nginx/includes/upstream.conf deleted file mode 100644 index a640ef18c..000000000 --- a/jellyfin_test/root/etc/nginx/includes/upstream.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream backend { - server 127.0.0.1:8096; -} diff --git a/jellyfin_test/root/etc/nginx/nginx.conf b/jellyfin_test/root/etc/nginx/nginx.conf deleted file mode 100644 index 7e5bc6f7c..000000000 --- a/jellyfin_test/root/etc/nginx/nginx.conf +++ /dev/null @@ -1,56 +0,0 @@ -# Run nginx in foreground. -daemon off; - -# This is run inside Docker. -user root; - -# Pid storage location. -pid /var/run/nginx.pid; - -# Set number of worker processes. -worker_processes 1; - -# Enables the use of JIT for regular expressions to speed-up their processing. -pcre_jit on; - -# Write error log to Hass.io add-on log. -error_log /proc/1/fd/1 error; - -# Load allowed environment vars -env HASSIO_TOKEN; - -# Load dynamic modules. -include /etc/nginx/modules/*.conf; - -# Max num of simultaneous connections by a worker process. -events { - worker_connections 512; -} - -http { - include /etc/nginx/includes/mime.types; - - log_format hassio '[$time_local] $status ' - '$http_x_forwarded_for($remote_addr) ' - '$request ($http_user_agent)'; - - access_log /proc/1/fd/1 hassio; - client_max_body_size 4G; - default_type application/octet-stream; - gzip on; - keepalive_timeout 65; - sendfile on; - server_tokens off; - tcp_nodelay on; - tcp_nopush on; - - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } - - include /etc/nginx/includes/resolver.conf; - include /etc/nginx/includes/upstream.conf; - - include /etc/nginx/servers/*.conf; -} diff --git a/jellyfin_test/root/etc/nginx/servers/ingress.conf b/jellyfin_test/root/etc/nginx/servers/ingress.conf deleted file mode 100644 index 585171939..000000000 --- a/jellyfin_test/root/etc/nginx/servers/ingress.conf +++ /dev/null @@ -1,24 +0,0 @@ -server { - listen %%interface%%:%%port%% default_server; - - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; - - client_max_body_size 0; - - location / { - proxy_pass http://127.0.0.1:8096/; -proxy_pass_request_headers on; -proxy_set_header Host $host; -proxy_set_header X-Real-IP $remote_addr; -proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -proxy_set_header X-Forwarded-Proto $scheme; -proxy_set_header X-Forwarded-Host $http_host; -proxy_set_header Upgrade $http_upgrade; -proxy_set_header Connection $http_connection; -# Disable buffering when the nginx proxy gets very resource heavy upon streaming -proxy_buffering off; - - } - -} diff --git a/jellyfin_test/root/etc/services.d/nginx/finish b/jellyfin_test/root/etc/services.d/nginx/finish deleted file mode 100644 index 444240135..000000000 --- a/jellyfin_test/root/etc/services.d/nginx/finish +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/execlineb -S0 -# ============================================================================== -# Take down the S6 supervision tree when Nginx fails -# ============================================================================== -if { s6-test ${1} -ne 0 } -if { s6-test ${1} -ne 256 } - -s6-svscanctl -t /var/run/s6/services diff --git a/jellyfin_test/root/etc/services.d/nginx/run b/jellyfin_test/root/etc/services.d/nginx/run deleted file mode 100644 index 6baa32ea5..000000000 --- a/jellyfin_test/root/etc/services.d/nginx/run +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== - -# Wait for transmission to become available -bashio::net.wait_for 8096 localhost 900 - -bashio::log.info "Starting NGinx..." - -exec nginx