From 6cba257903b56ba786525537b58e3af14c642815 Mon Sep 17 00:00:00 2001 From: Cody Cook Date: Mon, 1 Oct 2018 16:36:35 -0700 Subject: [PATCH] 6.9.4 update --- share_lun_ui_fix.sh | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/share_lun_ui_fix.sh b/share_lun_ui_fix.sh index ce67a69..3c3cce6 100755 --- a/share_lun_ui_fix.sh +++ b/share_lun_ui_fix.sh @@ -14,9 +14,9 @@ share_create() { mkdir -p "$path" echo "share" > "$path"/datasettype.conf echo "0,0" > "$path"/recycle.conf - echo "#dashboard:available=0 \"/$volume/$item\" 127.0.0.1(ro,insecure,insecure_locks,no_subtree_check,crossmnt,anongid=99,anonuid=99,root_squash,async)" > "$path"/nfs.conf + echo "#dashboard:available=0 \"/$volume/$item\" 127.0.0.1(insecure,insecure_locks,no_subtree_check,crossmnt,anonuid=99,anongid=99,root_squash,ro,async)" > "$path"/nfs.conf echo "" > "$path"/snapdir.conf - echo "0 0 0 * * * 0" > "$path"/snapshot.conf + echo "1 0 0 * * * 0" > "$path"/snapshot.conf cat > "$path"/afp.conf << EOF [$item] available = 1 @@ -43,6 +43,7 @@ EOF cat > "$path"/fs.conf << EOF compression = 0 bitrotprotection = 0 +autodefrag = 0 refquota = 0 EOF cat > "$path"/ftp.conf << EOF @@ -61,7 +62,7 @@ EOF cat > "$path"/samba.conf << EOF [$item] path = /$volume/$item - comment = "$item folder" + comment = "" spotlight = 0 guest ok = 1 admin users = +admin @@ -71,9 +72,35 @@ EOF cd "$path" chown root.root datasettype.conf recycle.conf snapdir.conf snapshot.conf chown admin.admin afp.conf fs.conf ftp.conf nfs.conf samba.conf custom_snapshot_management.conf custom_snapshot_schedule.conf + chmod 644 datasettype.conf recycle.conf snapdir.conf snapshot.conf afp.conf fs.conf ftp.conf nfs.conf samba.conf custom_snapshot_management.conf custom_snapshot_schedule.conf echo " done with /$volume/$item." } +check_existing_backups() { + + if [ -d "/var/backups/shares/" ]; then + echo "NOTE: This version of readynasd creates share backups in /var/backups/shares." + echo " When possible, you should try and restore a valid backup config from this directory." + echo " This share config gets rebuilt every time readynasd restarts. Because of this, we'll make a backup of the existing share backups before proceeding." + sleep 3 + echo -n "Generating backup config..." && sleep 1 && tar -cf "/var/backups/backup_share_configs.$(date +%s).tar" /var/backups/shares 2>/dev/null && sleep 1 && echo "... done! Backup complete!" + sleep 3 + echo "=============================================" + echo "====== Listing Available Share Backups ======" + echo "=============================================" + sleep 2 + ls -lah /var/backups/shares/ + sleep 1 + echo "=============================================" + echo "See the last modified dates and determine if you can restore from that config or not instead of using this script." + echo "It is best to pick a date before the shares disappeared from readynasd." + echo "=============================================" + sleep 5 + echo "If you want to cancel and manually restore from one of these configs, CTRL-C now..." + echo -n "Otherwise, continuing in 10..."; sleep 1; echo -n " 9..."; sleep 1; echo -n " 8..."; sleep 1; echo -n " 7..."; sleep 1; echo -n " 6..."; sleep 1; echo -n " 5..."; sleep 1; echo -n " 4..."; sleep 1; echo -n " 3..."; sleep 1; echo -n " 2..."; sleep 1; echo -n " 1..."; sleep 1 ; echo " 0..."; sleep 1 + fi +} + iscsi_create() { iscsi=$((iscsi+1)) found=$((found+1)) @@ -101,9 +128,7 @@ EOF ........................ ........................ EOF - cat > "$path"/snapshot.conf << EOF -0 0 0 * 0 0 0 -EOF + echo "0 0 0 * 0 0 0" > "$path"/snapshot.conf echo " done with /$volume/$item." } @@ -113,8 +138,11 @@ tar -cf "/var/backups/$volume_sharelunconfig.$(date +%s).tar" ./* 2>/dev/null } echo "===============================" -echo "Share and iSCSI Rebuild v6.8.0" +echo "Share and iSCSI Rebuild v6.9.4" echo "===============================" + +check_existing_backups + echo "Querying readynasd for list of volumes..." x=$(rn_nml -g volumes 2>/dev/null) # find if readynasd is running @@ -144,7 +172,7 @@ else if [[ $? == 2 ]]; then echo "No shares or LUNs found." else - objects=$(echo $objects |egrep -v "^.apps\/$|^home\/$|^.purge\/$|^._share\/$|^.timemachine\/$|^.vault\/$|^.TemporaryItems\/$" | sed 's/\/$//') + objects=$(echo "$objects" |egrep -v "^.apps\/$|^home\/$|^.purge\/$|^._share\/$|^.timemachine\/$|^.vault\/$|^.TemporaryItems\/$" | sed 's/\/$//') echo "= Objects found:" $objects backup_configs for item in $objects; do