diff --git a/src/freedombone b/src/freedombone index 957d23d7..b632e94a 100755 --- a/src/freedombone +++ b/src/freedombone @@ -4778,7 +4778,7 @@ function spam_filtering { echo '#!/bin/bash' > /usr/bin/filterspam echo 'for d in /home/*/ ; do' >> /usr/bin/filterspam echo ' USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/filterspam - echo ' if [[ $USERNAME != "git" && $USERNAME != "mirrors" ]]; then' >> /usr/bin/filterspam + echo ' if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then' >> /usr/bin/filterspam echo ' MAILDIR=/home/$USERNAME/Maildir/.learn-spam' >> /usr/bin/filterspam echo ' if [ ! -d "$MAILDIR" ]; then' >> /usr/bin/filterspam echo ' exit' >> /usr/bin/filterspam @@ -4800,7 +4800,7 @@ function spam_filtering { echo '#!/bin/bash' > /usr/bin/filterham echo 'for d in /home/*/ ; do' >> /usr/bin/filterham echo ' USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/filterham - echo ' if [[ $USERNAME != "git" && $USERNAME != "mirrors" ]]; then' >> /usr/bin/filterham + echo ' if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then' >> /usr/bin/filterham echo ' MAILDIR=/home/$USERNAME/Maildir/.learn-ham' >> /usr/bin/filterham echo ' if [ ! -d "$MAILDIR" ]; then' >> /usr/bin/filterham echo ' exit' >> /usr/bin/filterham diff --git a/src/freedombone-archive-mail b/src/freedombone-archive-mail index 973c0148..b9c9c67e 100755 --- a/src/freedombone-archive-mail +++ b/src/freedombone-archive-mail @@ -35,7 +35,7 @@ export TEXTDOMAINDIR="/usr/share/locale" for d in /home/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USERNAME != "git" && $USERNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then # for every user who has a mail directory if [ -d /home/$USERNAME/Maildir ]; then MUTTRC=/home/$USERNAME/.muttrc diff --git a/src/freedombone-backup-remote b/src/freedombone-backup-remote index 954e531f..50b708bc 100755 --- a/src/freedombone-backup-remote +++ b/src/freedombone-backup-remote @@ -182,7 +182,7 @@ function backup_configuration { function backup_users { for d in /home/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USERNAME != "git" && $USERNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then # personal settings if [ -d /home/$USERNAME/personal ]; then @@ -650,7 +650,7 @@ do # Social key management for d in /home/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USERNAME != "git" && $USERNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then disperse_key_shares $USERNAME $REMOTE_DOMAIN $REMOTE_SSH_PORT "$REMOTE_PASSWORD" $REMOTE_SERVER fi done diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel index 6c84ff72..ac03bb6f 100755 --- a/src/freedombone-controlpanel +++ b/src/freedombone-controlpanel @@ -417,7 +417,7 @@ function show_users { echo '--------------------------------------------------------------------------' for d in /home/*/ ; do USRNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USRNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USRNAME != "git" && $USRNAME != "mirrors" && $USRNAME != "sync" ]]; then echo -n -e "$(pad_string ${USRNAME})" # get the SIP extension SIPEXT= @@ -653,7 +653,7 @@ function irc_set_global_password { # replace the password for all users for d in /home/*/ ; do IRC_USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $IRC_USERNAME != "git" && $IRC_USERNAME != "mirrors" ]]; then + if [[ $IRC_USERNAME != "git" && $IRC_USERNAME != "mirrors" && $IRC_USERNAME != "sync" ]]; then if [ -f /home/$IRC_USERNAME/.irssi/config ]; then sed -i "s|$EXISTING_IRC_PASSWORD|$NEW_IRC_PASSWORD|g" /home/$IRC_USERNAME/.irssi/config chown -R $IRC_USERNAME:$IRC_USERNAME /home/$IRC_USERNAME/.irssi diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local index 798046c9..5b5c689f 100755 --- a/src/freedombone-restore-local +++ b/src/freedombone-restore-local @@ -121,7 +121,7 @@ function unmount_drive { echo $"Setting permissions" for d in /home/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then chown -R $USERNAME:$USERNAME /home/$USERNAME fi done @@ -395,7 +395,7 @@ function restore_mutt_settings { if [ -d $USB_MOUNT/backup/mutt ]; then for d in $USB_MOUNT/backup/mutt/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME fi @@ -427,7 +427,7 @@ function restore_gpg { if [ -d $USB_MOUNT/backup/gnupg ]; then for d in $USB_MOUNT/backup/gnupg/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME fi @@ -461,7 +461,7 @@ function restore_procmail { if [ -d $USB_MOUNT/backup/procmail ]; then for d in $USB_MOUNT/backup/procmail/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME fi @@ -488,7 +488,7 @@ function restore_spamassassin { if [ -d $USB_MOUNT/backup/spamassassin ]; then for d in $USB_MOUNT/backup/spamassassin/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -564,7 +564,7 @@ function restore_user_ssh_keys { if [ -d $USB_MOUNT/backup/ssh ]; then for d in $USB_MOUNT/backup/ssh/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME fi @@ -591,7 +591,7 @@ function restore_user_config { if [ -d $USB_MOUNT/backup/config ]; then for d in $USB_MOUNT/backup/config/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME fi @@ -618,7 +618,7 @@ function restore_user_fin { if [ -d $USB_MOUNT/backup/fin ]; then for d in $USB_MOUNT/backup/fin/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME fi @@ -645,7 +645,7 @@ function restore_user_local { if [ -d $USB_MOUNT/backup/local ]; then for d in $USB_MOUNT/backup/local/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME fi @@ -715,7 +715,7 @@ function restore_personal_settings { if [ -d $USB_MOUNT/backup/personal ]; then for d in $USB_MOUNT/backup/personal/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -862,7 +862,7 @@ function restore_owncloud { chown root:root $OWNCLOUD_PATH/config/config.php for d in /home/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then $OWNCLOUD_PATH/occ files:scan $USERNAME fi done @@ -996,7 +996,7 @@ function restore_blog { fi for d in /home/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post fi @@ -1037,7 +1037,7 @@ function restore_email { if [ -d $USB_MOUNT/backup/mail ]; then for d in $USB_MOUNT/backup/mail/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME fi diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote index e0ebc08c..e13f6891 100755 --- a/src/freedombone-restore-remote +++ b/src/freedombone-restore-remote @@ -286,7 +286,7 @@ function restore_mutt_settings { fi for d in $SERVER_DIRECTORY/backup/mutt/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $SERVER_DIRECTORY/backup/mutt/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -317,7 +317,7 @@ function restore_gpg { fi for d in $SERVER_DIRECTORY/backup/gnupg/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $SERVER_DIRECTORY/backup/gnupg/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -349,7 +349,7 @@ function restore_procmail { fi for d in $SERVER_DIRECTORY/backup/procmail/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $SERVER_DIRECTORY/backup/procmail/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -375,7 +375,7 @@ function restore_spamassassin { fi for d in $SERVER_DIRECTORY/backup/spamassassin/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $SERVER_DIRECTORY/backup/spamassassin/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -437,7 +437,7 @@ function restore_ssh_keys { fi for d in $SERVER_DIRECTORY/backup/ssh/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $SERVER_DIRECTORY/backup/ssh/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -463,7 +463,7 @@ function restore_user_config { fi for d in $SERVER_DIRECTORY/backup/config/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $SERVER_DIRECTORY/backup/config/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -489,7 +489,7 @@ function restore_user_fin { fi for d in $SERVER_DIRECTORY/backup/fin/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $SERVER_DIRECTORY/backup/fin/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -515,7 +515,7 @@ function restore_user_local { fi for d in $SERVER_DIRECTORY/backup/local/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $SERVER_DIRECTORY/backup/local/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -582,7 +582,7 @@ function restore_personal_settings { fi for d in $SERVER_DIRECTORY/backup/personal/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $SERVER_DIRECTORY/backup/personal/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME @@ -730,7 +730,7 @@ function restore_owncloud { # re-index files for d in /home/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then $OWNCLOUD_PATH/occ files:scan $USERNAME fi done @@ -858,7 +858,7 @@ function restore_blog { fi for d in /home/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post fi @@ -950,7 +950,7 @@ function restore_email { fi for d in $SERVER_DIRECTORY/backup/mail/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $6}') - if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then + if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then if [ -d $SERVER_DIRECTORY/backup/mail/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then ${PROJECT_NAME}-adduser $USERNAME