avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-14 19:41:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Bruvv
2021-12-27 14:08:34 +01:00
parent 92305f7110
commit 92fabd1942
5 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lidarr/rootfs/etc/cont-init.d/20-folders.sh
View File

@@ -11,16 +11,3 @@ if [ ! -d /share/downloads ]; then
mkdir -p /share/downloads mkdir -p /share/downloads
chown -R abc:abc /share/downloads chown -R abc:abc /share/downloads
fi fi
if [ -d /config/lidarr ]; then
echo "Moving to new location /config/addons_config/lidarr"
mkdir -p /config/addons_config/lidarr
chown -R abc:abc /config/addons_config/lidarr
mv /config/lidarr/* /config/addons_config/lidarr/
fi
if [ ! -d /config/addons_config/lidarr ]; then
echo "Creating /config/addons_config/lidarr"
mkdir -p /config/addons_config/lidarr
chown -R abc:abc /config/addons_config/lidarr
fi

2
radarr/rootfs/etc/cont-init.d/00-ha-env.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bashio #!/usr/bin/with-contenv bashio
for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do
printf "$(bashio::config $k)" >/var/run/s6/container_environment/$k printf "$(bashio::config "$k")" >/var/run/s6/container_environment/"$k"
done done

10
radarr/rootfs/etc/cont-init.d/92-local_mounts.sh
View File

@@ -17,15 +17,15 @@ if bashio::config.has_value 'localdisks'; then
devpath=/dev devpath=/dev
# Mount as label # Mount as label
[ ${disk:0:2} != "sd" ] && devpath=/dev/disk/by-label [ "${disk:0:2}" != "sd" ] && devpath=/dev/disk/by-label
# Creates dir # Creates dir
mkdir -p /mnt/$disk mkdir -p /mnt/"$disk"
chown -R $(id -u):$(id -g) /mnt/$disk chown -R "$(id -u):$(id -g)" /mnt/"$disk"
# Legacy mounting : mount to share if still exists (avoid breaking changes) # Legacy mounting : mount to share if still exists (avoid breaking changes)
[ -d /share/$disk ] && mount $devpath/$disk /share/$disk || true [ -d /share/"$disk" ] && mount $devpath/"$disk" /share/"$disk" || true
# Mount # 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) 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 done

20
radarr/rootfs/etc/cont-init.d/92-smb_mounts.sh
View File

@@ -26,7 +26,7 @@ if bashio::config.has_value 'networkdisks'; then
for disk in ${MOREDISKS//,/ }; do # Separate comma separated values for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
# Clean name of network share # Clean name of network share
disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name disk=$(echo "$disk" | sed "s,/$,,") # Remove / at end of name
diskname=${disk//\\//} #replace \ with / diskname=${disk//\\//} #replace \ with /
diskname=${diskname##*/} # Get only last part of the name diskname=${diskname##*/} # Get only last part of the name
@@ -37,18 +37,18 @@ if bashio::config.has_value 'networkdisks'; then
fi fi
# Prepare mount point # Prepare mount point
mkdir -p /mnt/$diskname mkdir -p /mnt/"$diskname"
chown -R root:root /mnt/$diskname chown -R root:root /mnt/"$diskname"
#Tries to mount with default options #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 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 Fail test different smb and sec versions
if [ $MOUNTED = false ]; then 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 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 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 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 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
done done
fi fi
@@ -56,7 +56,7 @@ if bashio::config.has_value 'networkdisks'; then
# Messages # Messages
if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
#Test write permissions #Test write permissions
touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && touch /mnt/"$diskname"/testaze && rm /mnt/"$diskname"/testaze &&
bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || 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" 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"
@@ -68,15 +68,15 @@ if bashio::config.has_value 'networkdisks'; then
# Provide debugging info # Provide debugging info
smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
#smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true #smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true
smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true smbclient -L "$disk" -U "$CIFS_USERNAME"%"$CIFS_PASSWORD" || true
# Error code # Error code
bashio::log.fatal "Error read : $(<ERRORCODE)" bashio::log.fatal "Error read : $(<ERRORCODE)"
rm ERRORCODE rm ERRORCODE
# clean folder # clean folder
umount /mnt/$diskname 2>/dev/null || true umount /mnt/"$diskname" 2>/dev/null || true
rmdir /mnt/$diskname || true rmdir /mnt/"$diskname" || true
fi fi
done done

4
whoogle/rootfs/scripts/90-config_yaml.sh
View File

@@ -73,7 +73,7 @@ while IFS= read -r line; do
secret=${line#*secret } secret=${line#*secret }
# Check if single match # Check if single match
secretnum=$(sed -n "/$secret:/=" /config/secrets.yaml) secretnum=$(sed -n "/$secret:/=" /config/secrets.yaml)
[[ $(echo $secretnum) == *' '* ]] && bashio::exit.nok "There are multiple matches for your password name. Please check your secrets.yaml file" [[ $(echo "$secretnum") == *' '* ]] && bashio::exit.nok "There are multiple matches for your password name. Please check your secrets.yaml file"
# Get text # Get text
secret=$(sed -n "/$secret:/p" /config/secrets.yaml) secret=$(sed -n "/$secret:/p" /config/secrets.yaml)
secret=${secret#*: } secret=${secret#*: }
@@ -81,7 +81,7 @@ while IFS= read -r line; do
fi fi
# Data validation # Data validation
if [[ $line =~ ^.+[=].+$ ]]; then if [[ $line =~ ^.+[=].+$ ]]; then
export "$line" export "{$line}"
# Export the variable # Export the variable
sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || true sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || true
sed -i "1a export $line" /scripts/*run* 2>/dev/null || true sed -i "1a export $line" /scripts/*run* 2>/dev/null || true