free
/
freedombone
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

sync user

Bob Mottram 9 vuotta sitten
vanhempi
46b2626ae5
commit
edcc47de22
6 muutettua tiedostoa jossa 32 lisäystä ja 32 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 2
    2
      src/freedombone
  2. 1
    1
      src/freedombone-archive-mail
  3. 2
    2
      src/freedombone-backup-remote
  4. 2
    2
      src/freedombone-controlpanel
  5. 13
    13
      src/freedombone-restore-local
  6. 12
    12
      src/freedombone-restore-remote

+ 2
- 2
src/freedombone Näytä tiedosto 

@@ -4778,7 +4778,7 @@ function spam_filtering {
4778 4778 
     echo '#!/bin/bash' > /usr/bin/filterspam
4779 4779 
     echo 'for d in /home/*/ ; do' >> /usr/bin/filterspam
4780 4780 
     echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/filterspam
4781 
-    echo '    if [[ $USERNAME != "git" && $USERNAME != "mirrors" ]]; then' >> /usr/bin/filterspam
4781 
+    echo '    if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then' >> /usr/bin/filterspam
4782 4782 
     echo '        MAILDIR=/home/$USERNAME/Maildir/.learn-spam' >> /usr/bin/filterspam
4783 4783 
     echo '        if [ ! -d "$MAILDIR" ]; then' >> /usr/bin/filterspam
4784 4784 
     echo '           exit' >> /usr/bin/filterspam
 
@@ -4800,7 +4800,7 @@ function spam_filtering {
4800 4800 
     echo '#!/bin/bash' > /usr/bin/filterham
4801 4801 
     echo 'for d in /home/*/ ; do' >> /usr/bin/filterham
4802 4802 
     echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/filterham
4803 
-    echo '    if [[ $USERNAME != "git" && $USERNAME != "mirrors" ]]; then' >> /usr/bin/filterham
4803 
+    echo '    if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then' >> /usr/bin/filterham
4804 4804 
     echo '        MAILDIR=/home/$USERNAME/Maildir/.learn-ham' >> /usr/bin/filterham
4805 4805 
     echo '        if [ ! -d "$MAILDIR" ]; then' >> /usr/bin/filterham
4806 4806 
     echo '            exit' >> /usr/bin/filterham

+ 1
- 1
src/freedombone-archive-mail Näytä tiedosto 

@@ -35,7 +35,7 @@ export TEXTDOMAINDIR="/usr/share/locale"
35 35
36 36 
 for d in /home/*/ ; do
37 37 
     USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
38 
-    if [[ $USERNAME != "git" && $USERNAME != "mirrors" ]]; then
38 
+    if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
39 39 
         # for every user who has a mail directory
40 40 
         if [ -d /home/$USERNAME/Maildir ]; then
41 41 
             MUTTRC=/home/$USERNAME/.muttrc

+ 2
- 2
src/freedombone-backup-remote Näytä tiedosto 

@@ -182,7 +182,7 @@ function backup_configuration {
182 182 
 function backup_users {
183 183 
     for d in /home/*/ ; do
184 184 
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
185 
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" ]]; then
185 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
186 186
187 187 
             # personal settings
188 188 
             if [ -d /home/$USERNAME/personal ]; then
 
@@ -650,7 +650,7 @@ do
650 650 
         # Social key management
651 651 
         for d in /home/*/ ; do
652 652 
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
653 
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" ]]; then
653 
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
654 654 
                 disperse_key_shares $USERNAME $REMOTE_DOMAIN $REMOTE_SSH_PORT "$REMOTE_PASSWORD" $REMOTE_SERVER
655 655 
             fi
656 656 
         done

+ 2
- 2
src/freedombone-controlpanel Näytä tiedosto 

@@ -417,7 +417,7 @@ function show_users {
417 417 
     echo '--------------------------------------------------------------------------'
418 418 
     for d in /home/*/ ; do
419 419 
         USRNAME=$(echo "$d" | awk -F '/' '{print $3}')
420 
-        if [[ $USRNAME != "git" && $USRNAME != "mirrors" ]]; then
420 
+        if [[ $USRNAME != "git" && $USRNAME != "mirrors" && $USRNAME != "sync" ]]; then
421 421 
             echo -n -e "$(pad_string ${USRNAME})"
422 422 
             # get the SIP extension
423 423 
             SIPEXT=
 
@@ -653,7 +653,7 @@ function irc_set_global_password {
653 653 
             # replace the password for all users
654 654 
             for d in /home/*/ ; do
655 655 
                 IRC_USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
656 
-                if [[ $IRC_USERNAME != "git" && $IRC_USERNAME != "mirrors" ]]; then
656 
+                if [[ $IRC_USERNAME != "git" && $IRC_USERNAME != "mirrors" && $IRC_USERNAME != "sync" ]]; then
657 657 
                     if [ -f /home/$IRC_USERNAME/.irssi/config ]; then
658 658 
                         sed -i "s|$EXISTING_IRC_PASSWORD|$NEW_IRC_PASSWORD|g" /home/$IRC_USERNAME/.irssi/config
659 659 
                         chown -R $IRC_USERNAME:$IRC_USERNAME /home/$IRC_USERNAME/.irssi

+ 13
- 13
src/freedombone-restore-local Näytä tiedosto 

@@ -121,7 +121,7 @@ function unmount_drive {
121 121 
 	echo $"Setting permissions"
122 122 
 	for d in /home/*/ ; do
123 123 
 		USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
124 
-		if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
124 
+		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
125 125 
 			chown -R $USERNAME:$USERNAME /home/$USERNAME
126 126 
 		fi
127 127 
 	done
 
@@ -395,7 +395,7 @@ function restore_mutt_settings {
395 395 
 	if [ -d $USB_MOUNT/backup/mutt ]; then
396 396 
 		for d in $USB_MOUNT/backup/mutt/*/ ; do
397 397 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
398 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
398 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
399 399 
 				if [ ! -d /home/$USERNAME ]; then
400 400 
 					${PROJECT_NAME}-adduser $USERNAME
401 401 
 				fi
 
@@ -427,7 +427,7 @@ function restore_gpg {
427 427 
 	if [ -d $USB_MOUNT/backup/gnupg ]; then
428 428 
 		for d in $USB_MOUNT/backup/gnupg/*/ ; do
429 429 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
430 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
430 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
431 431 
 				if [ ! -d /home/$USERNAME ]; then
432 432 
 					${PROJECT_NAME}-adduser $USERNAME
433 433 
 				fi
 
@@ -461,7 +461,7 @@ function restore_procmail {
461 461 
 	if [ -d $USB_MOUNT/backup/procmail ]; then
462 462 
 		for d in $USB_MOUNT/backup/procmail/*/ ; do
463 463 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
464 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
464 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
465 465 
 				if [ ! -d /home/$USERNAME ]; then
466 466 
 					${PROJECT_NAME}-adduser $USERNAME
467 467 
 				fi
 
@@ -488,7 +488,7 @@ function restore_spamassassin {
488 488 
 	if [ -d $USB_MOUNT/backup/spamassassin ]; then
489 489 
 		for d in $USB_MOUNT/backup/spamassassin/*/ ; do
490 490 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
491 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
491 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
492 492 
 				if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then
493 493 
 					if [ ! -d /home/$USERNAME ]; then
494 494 
 						${PROJECT_NAME}-adduser $USERNAME
 
@@ -564,7 +564,7 @@ function restore_user_ssh_keys {
564 564 
 	if [ -d $USB_MOUNT/backup/ssh ]; then
565 565 
 		for d in $USB_MOUNT/backup/ssh/*/ ; do
566 566 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
567 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
567 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
568 568 
 				if [ ! -d /home/$USERNAME ]; then
569 569 
 					${PROJECT_NAME}-adduser $USERNAME
570 570 
 				fi
 
@@ -591,7 +591,7 @@ function restore_user_config {
591 591 
 	if [ -d $USB_MOUNT/backup/config ]; then
592 592 
 		for d in $USB_MOUNT/backup/config/*/ ; do
593 593 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
594 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
594 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
595 595 
 				if [ ! -d /home/$USERNAME ]; then
596 596 
 					${PROJECT_NAME}-adduser $USERNAME
597 597 
 				fi
 
@@ -618,7 +618,7 @@ function restore_user_fin {
618 618 
 	if [ -d $USB_MOUNT/backup/fin ]; then
619 619 
 		for d in $USB_MOUNT/backup/fin/*/ ; do
620 620 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
621 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
621 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
622 622 
 				if [ ! -d /home/$USERNAME ]; then
623 623 
 					${PROJECT_NAME}-adduser $USERNAME
624 624 
 				fi
 
@@ -645,7 +645,7 @@ function restore_user_local {
645 645 
 	if [ -d $USB_MOUNT/backup/local ]; then
646 646 
 		for d in $USB_MOUNT/backup/local/*/ ; do
647 647 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
648 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
648 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
649 649 
 				if [ ! -d /home/$USERNAME ]; then
650 650 
 					${PROJECT_NAME}-adduser $USERNAME
651 651 
 				fi
 
@@ -715,7 +715,7 @@ function restore_personal_settings {
715 715 
 	if [ -d $USB_MOUNT/backup/personal ]; then
716 716 
 		for d in $USB_MOUNT/backup/personal/*/ ; do
717 717 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
718 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
718 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
719 719 
 				if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then
720 720 
 					if [ ! -d /home/$USERNAME ]; then
721 721 
 						${PROJECT_NAME}-adduser $USERNAME
 
@@ -862,7 +862,7 @@ function restore_owncloud {
862 862 
 		chown root:root $OWNCLOUD_PATH/config/config.php
863 863 
 		for d in /home/*/ ; do
864 864 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
865 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
865 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
866 866 
 				$OWNCLOUD_PATH/occ files:scan $USERNAME
867 867 
 			fi
868 868 
 		done
 
@@ -996,7 +996,7 @@ function restore_blog {
996 996 
 		fi
997 997 
 		for d in /home/*/ ; do
998 998 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
999 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
999 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
1000 1000 
 				if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then
1001 1001 
 					mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
1002 1002 
 				fi
 
@@ -1037,7 +1037,7 @@ function restore_email {
1037 1037 
 	if [ -d $USB_MOUNT/backup/mail ]; then
1038 1038 
 		for d in $USB_MOUNT/backup/mail/*/ ; do
1039 1039 
 			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
1040 
-			if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
1040 
+			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
1041 1041 
 				if [ ! -d /home/$USERNAME ]; then
1042 1042 
 					${PROJECT_NAME}-adduser $USERNAME
1043 1043 
 				fi

+ 12
- 12
src/freedombone-restore-remote Näytä tiedosto 

@@ -286,7 +286,7 @@ function restore_mutt_settings {
286 286 
     fi
287 287 
     for d in $SERVER_DIRECTORY/backup/mutt/*/ ; do
288 288 
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
289 
-        if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
289 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
290 290 
             if [ -d $SERVER_DIRECTORY/backup/mutt/$USERNAME ]; then
291 291 
                 if [ ! -d /home/$USERNAME ]; then
292 292 
                     ${PROJECT_NAME}-adduser $USERNAME
 
@@ -317,7 +317,7 @@ function restore_gpg {
317 317 
     fi
318 318 
     for d in $SERVER_DIRECTORY/backup/gnupg/*/ ; do
319 319 
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
320 
-        if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
320 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
321 321 
             if [ -d $SERVER_DIRECTORY/backup/gnupg/$USERNAME ]; then
322 322 
                 if [ ! -d /home/$USERNAME ]; then
323 323 
                     ${PROJECT_NAME}-adduser $USERNAME
 
@@ -349,7 +349,7 @@ function restore_procmail {
349 349 
     fi
350 350 
     for d in $SERVER_DIRECTORY/backup/procmail/*/ ; do
351 351 
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
352 
-        if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
352 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
353 353 
             if [ -d $SERVER_DIRECTORY/backup/procmail/$USERNAME ]; then
354 354 
                 if [ ! -d /home/$USERNAME ]; then
355 355 
                     ${PROJECT_NAME}-adduser $USERNAME
 
@@ -375,7 +375,7 @@ function restore_spamassassin {
375 375 
     fi
376 376 
     for d in $SERVER_DIRECTORY/backup/spamassassin/*/ ; do
377 377 
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
378 
-        if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
378 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
379 379 
             if [ -d $SERVER_DIRECTORY/backup/spamassassin/$USERNAME ]; then
380 380 
                 if [ ! -d /home/$USERNAME ]; then
381 381 
                     ${PROJECT_NAME}-adduser $USERNAME
 
@@ -437,7 +437,7 @@ function restore_ssh_keys {
437 437 
     fi
438 438 
     for d in $SERVER_DIRECTORY/backup/ssh/*/ ; do
439 439 
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
440 
-        if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
440 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
441 441 
             if [ -d $SERVER_DIRECTORY/backup/ssh/$USERNAME ]; then
442 442 
                 if [ ! -d /home/$USERNAME ]; then
443 443 
                     ${PROJECT_NAME}-adduser $USERNAME
 
@@ -463,7 +463,7 @@ function restore_user_config {
463 463 
     fi
464 464 
     for d in $SERVER_DIRECTORY/backup/config/*/ ; do
465 465 
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
466 
-        if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
466 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
467 467 
             if [ -d $SERVER_DIRECTORY/backup/config/$USERNAME ]; then
468 468 
                 if [ ! -d /home/$USERNAME ]; then
469 469 
                     ${PROJECT_NAME}-adduser $USERNAME
 
@@ -489,7 +489,7 @@ function restore_user_fin {
489 489 
     fi
490 490 
     for d in $SERVER_DIRECTORY/backup/fin/*/ ; do
491 491 
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
492 
-        if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
492 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
493 493 
             if [ -d $SERVER_DIRECTORY/backup/fin/$USERNAME ]; then
494 494 
                 if [ ! -d /home/$USERNAME ]; then
495 495 
                     ${PROJECT_NAME}-adduser $USERNAME
 
@@ -515,7 +515,7 @@ function restore_user_local {
515 515 
     fi
516 516 
     for d in $SERVER_DIRECTORY/backup/local/*/ ; do
517 517 
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
518 
-        if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
518 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
519 519 
             if [ -d $SERVER_DIRECTORY/backup/local/$USERNAME ]; then
520 520 
                 if [ ! -d /home/$USERNAME ]; then
521 521 
                     ${PROJECT_NAME}-adduser $USERNAME
 
@@ -582,7 +582,7 @@ function restore_personal_settings {
582 582 
     fi
583 583 
     for d in $SERVER_DIRECTORY/backup/personal/*/ ; do
584 584 
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
585 
-        if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
585 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
586 586 
             if [ -d $SERVER_DIRECTORY/backup/personal/$USERNAME ]; then
587 587 
                 if [ ! -d /home/$USERNAME ]; then
588 588 
                     ${PROJECT_NAME}-adduser $USERNAME
 
@@ -730,7 +730,7 @@ function restore_owncloud {
730 730 
         # re-index files
731 731 
         for d in /home/*/ ; do
732 732 
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
733 
-            if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
733 
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
734 734 
                 $OWNCLOUD_PATH/occ files:scan $USERNAME
735 735 
             fi
736 736 
         done
 
@@ -858,7 +858,7 @@ function restore_blog {
858 858 
         fi
859 859 
         for d in /home/*/ ; do
860 860 
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
861 
-            if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
861 
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
862 862 
                 if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then
863 863 
                     mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
864 864 
                 fi
 
@@ -950,7 +950,7 @@ function restore_email {
950 950 
     fi
951 951 
     for d in $SERVER_DIRECTORY/backup/mail/*/ ; do
952 952 
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
953 
-        if [[ $USERNAME != "git" && $USRNAME != "mirrors" ]]; then
953 
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
954 954 
             if [ -d $SERVER_DIRECTORY/backup/mail/$USERNAME ]; then
955 955 
                 if [ ! -d /home/$USERNAME ]; then
956 956 
                     ${PROJECT_NAME}-adduser $USERNAME