From e57a3e2d898a9476d781c5052a8852960e61c023 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 4 Dec 2021 16:02:06 +0100 Subject: [PATCH] add mounts --- resiliosync/CHANGELOG.md | 2 + resiliosync/Dockerfile | 12 ++- resiliosync/README.md | 6 ++ resiliosync/config.json | 26 +++++- .../cont-init.d/00-aaa_dockerfile_backup.sh | 36 ++++++++ .../rootfs/etc/cont-init.d/00-banner.sh | 39 +++++++++ .../rootfs/etc/cont-init.d/92-local_mounts.sh | 32 +++++++ .../rootfs/etc/cont-init.d/92-smb_mounts.sh | 83 +++++++++++++++++++ 8 files changed, 231 insertions(+), 5 deletions(-) create mode 100644 resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh create mode 100644 resiliosync/rootfs/etc/cont-init.d/00-banner.sh create mode 100644 resiliosync/rootfs/etc/cont-init.d/92-local_mounts.sh create mode 100644 resiliosync/rootfs/etc/cont-init.d/92-smb_mounts.sh diff --git a/resiliosync/CHANGELOG.md b/resiliosync/CHANGELOG.md index f3e8205e6..111d2751b 100644 --- a/resiliosync/CHANGELOG.md +++ b/resiliosync/CHANGELOG.md @@ -1,5 +1,7 @@ +- Add local & smb mounts (see readme) - Config changed from /config/resiliosync to /share/resiliosync_config ## 2.7.2.1375 (30-06-2021) + - Update to latest version from linuxserver/docker-resilio-sync - :arrow_up: Initial release diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 40db051eb..4f21cfb3e 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -30,13 +30,14 @@ RUN \ && mv /tmp/bashio/lib /usr/lib/bashio \ && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ && rm -fr \ - /tmp/* \ - \ + /tmp/* + +RUN \ ############### # Adapt image # ############### # Allow UID and GID setting - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ + 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 \ \ @@ -48,7 +49,10 @@ RUN \ # Correct sync folder && grep -rl "/sync/" /etc/cont-init.d | xargs sed -i 's|/sync/|/share/resiliosync|g' || true \ && grep -rl " /sync" /etc/cont-init.d | xargs sed -i 's| /sync| /share/resiliosync|g' || true \ - && sed -i 's=/sync/=/share/resiliosync/=g' /defaults || true + && sed -i 's=/sync/=/share/resiliosync/=g' /defaults + +# Copy root filesystem +COPY rootfs / VOLUME [ "/data" ] diff --git a/resiliosync/README.md b/resiliosync/README.md index 0b1f47a53..cf76a943a 100644 --- a/resiliosync/README.md +++ b/resiliosync/README.md @@ -36,6 +36,12 @@ Webui can be found at . ```yaml GUID: user GPID: user +TZ: timezone +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 ``` ## Support diff --git a/resiliosync/config.json b/resiliosync/config.json index 0ac7a6dd3..8bb9b493d 100644 --- a/resiliosync/config.json +++ b/resiliosync/config.json @@ -2,6 +2,23 @@ "arch": ["aarch64", "amd64", "armhf", "armv7"], "boot": "auto", "description": "Self-hosted file share and collaboration platform on the web", + "devices": [ + "/dev/net/tun", + "/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" + ], "environment": {}, "map": ["share:rw", "config:rw"], "name": "ResilioSync", @@ -17,9 +34,16 @@ "8888/tcp": "Web interface", "55555/tcp": "Sync Port" }, + "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH", "NET_ADMIN"], "schema": { "PUID": "int", - "PGID": "int" + "PGID": "int", + "TZ": "str", + "localdisks": "str?", + "networkdisks": "str?", + "cifsusername": "str?", + "cifspassword": "str?", + "cifsdomain": "str?" }, "slug": "resiliosync", "upstream": "2.7.2.1375", diff --git a/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..515a80175 --- /dev/null +++ b/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +# If dockerfile failed install manually +if [ ! -f "/usr/bin/bashio" ]; then + echo "Bashio does not exist, executing script" + ( + ################ + # Install apps # + ################ + apt-get clean \ + apt-get update \ + apt-get install -y --no-install-recommends \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba \ + smbclient + + ################## + # Install bashio # + ################## + curl -J -L -o /tmp/bashio.tar.gz \ + "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" && + mkdir /tmp/bashio && + tar zxvf \ + /tmp/bashio.tar.gz \ + --strip 1 -C /tmp/bashio && + mv /tmp/bashio/lib /usr/lib/bashio && + ln -s /usr/lib/bashio/bashio /usr/bin/bashio && + rm -fr \ + /tmp/* + + ) >/dev/null + +fi diff --git a/resiliosync/rootfs/etc/cont-init.d/00-banner.sh b/resiliosync/rootfs/etc/cont-init.d/00-banner.sh new file mode 100644 index 000000000..0ac294e9a --- /dev/null +++ b/resiliosync/rootfs/etc/cont-init.d/00-banner.sh @@ -0,0 +1,39 @@ +#!/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/resiliosync/rootfs/etc/cont-init.d/92-local_mounts.sh b/resiliosync/rootfs/etc/cont-init.d/92-local_mounts.sh new file mode 100644 index 000000000..0920d68bd --- /dev/null +++ b/resiliosync/rootfs/etc/cont-init.d/92-local_mounts.sh @@ -0,0 +1,32 @@ +#!/usr/bin/with-contenv bashio + +###################### +# MOUNT LOCAL SHARES # +###################### + +# Mount local Share if configured +if bashio::config.has_value 'localdisks'; then + + MOREDISKS=$(bashio::config 'localdisks') + echo "Local Disks mounting..." + + # Separate comma separated values + for disk in ${MOREDISKS//,/ }; do + + # Mount by device as default + devpath=/dev + + # Mount as label + [ ${disk:0:2} != "sd" ] && devpath=/dev/disk/by-label + + # Creates dir + mkdir -p /mnt/$disk + chown -R $(id -u):$(id -g) /mnt/$disk + # Legacy mounting : mount to share if still exists (avoid breaking changes) + [ -d /share/$disk ] && mount $devpath/$disk /share/$disk || true + # Mount + mount $devpath/$disk /mnt/$disk && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) + + done + +fi diff --git a/resiliosync/rootfs/etc/cont-init.d/92-smb_mounts.sh b/resiliosync/rootfs/etc/cont-init.d/92-smb_mounts.sh new file mode 100644 index 000000000..06410e554 --- /dev/null +++ b/resiliosync/rootfs/etc/cont-init.d/92-smb_mounts.sh @@ -0,0 +1,83 @@ +#!/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