avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-05-01 14:50:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed config location for jacket and for bashio fix

Browse Source
This commit is contained in:
Bruvv
2022-01-01 10:59:37 +01:00
parent bb12946786
commit d55f37705d
93 changed files with 104 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/with-contenv bashio
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

9
jackett/rootfs/etc/cont-init.d/20-folders.sh
View File

@@ -1,10 +1,4 @@
#!/bin/bash
if [ ! -d /share/storage/movies ]; then
echo "Creating /share/storage/movies"
mkdir -p /share/storage/movies
chown -R abc:abc /share/storage/movies
fi
#!/usr/bin/with-contenv bashio
if [ ! -d /share/downloads ]; then
echo "Creating /share/downloads"
@@ -18,6 +12,7 @@ if [ -d /config/Jackett ] && [ ! -d /config/addons_config/Jackett ]; then
chown -R abc:abc /config/addons_config/Jackett
mv /config/Jackett/* /config/addons_config/Jackett/
rm -r /config/Jackett
rm -r /config/jackett
fi
if [ ! -d /config/addons_config/Jackett ]; then

20
jackett/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
# 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=${diskname##*/} # Get only last part of the name
@@ -37,18 +37,18 @@ if bashio::config.has_value 'networkdisks'; then
fi
# Prepare mount point
mkdir -p /mnt/$diskname
chown -R root:root /mnt/$diskname
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
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
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
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
@@ -56,7 +56,7 @@ if bashio::config.has_value 'networkdisks'; then
# Messages
if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
#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.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
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
smbclient -L "$disk" -U "$CIFS_USERNAME"%"$CIFS_PASSWORD" || true
# Error code
bashio::log.fatal "Error read : $(<ERRORCODE)"
rm ERRORCODE
# clean folder
umount /mnt/$diskname 2>/dev/null || true
rmdir /mnt/$diskname || true
umount /mnt/"$diskname" 2>/dev/null || true
rmdir /mnt/"$diskname" || true
fi
done