free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quotes

This commit is contained in:
Bob Mottram 2016-10-01 10:48:07 +01:00
parent 55a446e0b3
commit 907791ddbb
15 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedombone-app-blog
View File

@ -244,7 +244,7 @@ function restore_local_blog {
fi fi
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; 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 mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
fi fi
@ -296,7 +296,7 @@ function restore_remote_blog {
fi fi
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; 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 mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
fi fi

4
src/freedombone-app-emacs
View File

@ -49,7 +49,7 @@ function upgrade_emacs {
function backup_local_emacs { function backup_local_emacs {
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d /home/$USERNAME/.emacs.d ]; then if [ -d /home/$USERNAME/.emacs.d ]; then
echo $"Backing up Emacs config for $USERNAME" echo $"Backing up Emacs config for $USERNAME"
if [ -f /home/$USERNAME/.emacs ]; then if [ -f /home/$USERNAME/.emacs ]; then
@ -67,7 +67,7 @@ function restore_local_emacs {
if [ -d $USB_MOUNT/backup/emacs ]; then if [ -d $USB_MOUNT/backup/emacs ]; then
for d in $USB_MOUNT/backup/emacs/*/ ; do for d in $USB_MOUNT/backup/emacs/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi

2
src/freedombone-app-irc
View File

@ -61,7 +61,7 @@ function irc_set_global_password {
# replace the password for all users # replace the password for all users
for d in /home/*/ ; do for d in /home/*/ ; do
IRC_USERNAME=$(echo "$d" | awk -F '/' '{print $3}') IRC_USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $IRC_USERNAME) == "1" ]]; then if [[ $(is_valid_user "$IRC_USERNAME") == "1" ]]; then
if [ -f /home/$IRC_USERNAME/.irssi/config ]; then if [ -f /home/$IRC_USERNAME/.irssi/config ]; then
sed -i "s|$EXISTING_IRC_PASSWORD|$NEW_IRC_PASSWORD|g" /home/$IRC_USERNAME/.irssi/config 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 chown -R $IRC_USERNAME:$IRC_USERNAME /home/$IRC_USERNAME/.irssi

4
src/freedombone-app-syncthing
View File

@ -278,7 +278,7 @@ function restore_local_syncthing {
if [ -d $USB_MOUNT/backup/syncthing ]; then if [ -d $USB_MOUNT/backup/syncthing ]; then
for d in $USB_MOUNT/backup/syncthing/*/ ; do for d in $USB_MOUNT/backup/syncthing/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi
@ -366,7 +366,7 @@ function restore_remote_syncthing {
if [ -d $SERVER_DIRECTORY/backup/syncthing ]; then if [ -d $SERVER_DIRECTORY/backup/syncthing ]; then
for d in $SERVER_DIRECTORY/backup/syncthing/*/ ; do for d in $SERVER_DIRECTORY/backup/syncthing/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi

2
src/freedombone-app-tahoelafs
View File

@ -50,7 +50,7 @@ function change_password_tahoelafs {
function reconfigure_tahoelafs { function reconfigure_tahoelafs {
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d /home/$USERNAME/.tahoe ]; then if [ -d /home/$USERNAME/.tahoe ]; then
su -c "$TAHOE_COMMAND stop" - $USERNAME su -c "$TAHOE_COMMAND stop" - $USERNAME
rm -rf /home/$USERNAME/.tahoe rm -rf /home/$USERNAME/.tahoe

2
src/freedombone-app-xmpp
View File

@ -246,7 +246,7 @@ function remove_xmpp {
function xmpp_email_headers { function xmpp_email_headers {
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -f /home/$USERNAME/.muttrc ]; then if [ -f /home/$USERNAME/.muttrc ]; then
if ! grep -q "Jabber-ID" /home/$USERNAME/.muttrc; then if ! grep -q "Jabber-ID" /home/$USERNAME/.muttrc; then
echo "my_hdr Jabber-ID: ${USERNAME}@${HOSTNAME}" >> /home/$USERNAME/.muttrc echo "my_hdr Jabber-ID: ${USERNAME}@${HOSTNAME}" >> /home/$USERNAME/.muttrc

2
src/freedombone-archive-mail
View File

@ -37,7 +37,7 @@ source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-validation
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
# for every user who has a mail directory # for every user who has a mail directory
if [ -d /home/$USERNAME/Maildir ]; then if [ -d /home/$USERNAME/Maildir ]; then
MUTTRC=/home/$USERNAME/.muttrc MUTTRC=/home/$USERNAME/.muttrc

2
src/freedombone-backup-local
View File

@ -98,7 +98,7 @@ function backup_users {
# Backup user files # Backup user files
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
# Backup any gpg keys # Backup any gpg keys
if [ -d /home/$USERNAME/.gnupg ]; then if [ -d /home/$USERNAME/.gnupg ]; then

4
src/freedombone-backup-remote
View File

@ -122,7 +122,7 @@ function backup_configuration {
function backup_users { function backup_users {
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
# personal settings # personal settings
if [ -d /home/$USERNAME/personal ]; then if [ -d /home/$USERNAME/personal ]; then
@ -451,7 +451,7 @@ do
# Social key management # Social key management
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
disperse_key_shares $USERNAME $REMOTE_DOMAIN $REMOTE_SSH_PORT "$REMOTE_PASSWORD" $REMOTE_SERVER disperse_key_shares $USERNAME $REMOTE_DOMAIN $REMOTE_SSH_PORT "$REMOTE_PASSWORD" $REMOTE_SERVER
fi fi
done done

2
src/freedombone-controlpanel
View File

@ -459,7 +459,7 @@ function show_users {
echo '--------------------------------------------------------------------------' echo '--------------------------------------------------------------------------'
for d in /home/*/ ; do for d in /home/*/ ; do
USRNAME=$(echo "$d" | awk -F '/' '{print $3}') USRNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USRNAME) == "1" ]]; then if [[ $(is_valid_user "$USRNAME") == "1" ]]; then
echo -n -e "$(pad_string ${USRNAME})" echo -n -e "$(pad_string ${USRNAME})"
# get the SIP extension # get the SIP extension
SIPEXT= SIPEXT=

22
src/freedombone-restore-local
View File

@ -238,7 +238,7 @@ function restore_mutt_settings {
if [ -d $USB_MOUNT/backup/mutt ]; then if [ -d $USB_MOUNT/backup/mutt ]; then
for d in $USB_MOUNT/backup/mutt/*/ ; do for d in $USB_MOUNT/backup/mutt/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi
@ -272,7 +272,7 @@ function restore_gpg {
if [ -d $USB_MOUNT/backup/gnupg ]; then if [ -d $USB_MOUNT/backup/gnupg ]; then
for d in $USB_MOUNT/backup/gnupg/*/ ; do for d in $USB_MOUNT/backup/gnupg/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi
@ -309,7 +309,7 @@ function restore_procmail {
if [ -d $USB_MOUNT/backup/procmail ]; then if [ -d $USB_MOUNT/backup/procmail ]; then
for d in $USB_MOUNT/backup/procmail/*/ ; do for d in $USB_MOUNT/backup/procmail/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi
@ -338,7 +338,7 @@ function restore_spamassassin {
if [ -d $USB_MOUNT/backup/spamassassin ]; then if [ -d $USB_MOUNT/backup/spamassassin ]; then
for d in $USB_MOUNT/backup/spamassassin/*/ ; do for d in $USB_MOUNT/backup/spamassassin/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -399,7 +399,7 @@ function restore_user_ssh_keys {
if [ -d $USB_MOUNT/backup/ssh ]; then if [ -d $USB_MOUNT/backup/ssh ]; then
for d in $USB_MOUNT/backup/ssh/*/ ; do for d in $USB_MOUNT/backup/ssh/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi
@ -428,7 +428,7 @@ function restore_user_config {
if [ -d $USB_MOUNT/backup/config ]; then if [ -d $USB_MOUNT/backup/config ]; then
for d in $USB_MOUNT/backup/config/*/ ; do for d in $USB_MOUNT/backup/config/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi
@ -469,7 +469,7 @@ function restore_user_monkeysphere {
if [ -d $USB_MOUNT/backup/monkeysphere ]; then if [ -d $USB_MOUNT/backup/monkeysphere ]; then
for d in $USB_MOUNT/backup/monkeysphere/*/ ; do for d in $USB_MOUNT/backup/monkeysphere/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi
@ -508,7 +508,7 @@ function restore_user_fin {
if [ -d $USB_MOUNT/backup/fin ]; then if [ -d $USB_MOUNT/backup/fin ]; then
for d in $USB_MOUNT/backup/fin/*/ ; do for d in $USB_MOUNT/backup/fin/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi
@ -537,7 +537,7 @@ function restore_user_local {
if [ -d $USB_MOUNT/backup/local ]; then if [ -d $USB_MOUNT/backup/local ]; then
for d in $USB_MOUNT/backup/local/*/ ; do for d in $USB_MOUNT/backup/local/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi
@ -610,7 +610,7 @@ function restore_personal_settings {
if [ -d $USB_MOUNT/backup/personal ]; then if [ -d $USB_MOUNT/backup/personal ]; then
for d in $USB_MOUNT/backup/personal/*/ ; do for d in $USB_MOUNT/backup/personal/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -663,7 +663,7 @@ function restore_email {
if [ -d $USB_MOUNT/backup/mail ]; then if [ -d $USB_MOUNT/backup/mail ]; then
for d in $USB_MOUNT/backup/mail/*/ ; do for d in $USB_MOUNT/backup/mail/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
fi fi

22
src/freedombone-restore-remote
View File

@ -227,7 +227,7 @@ function restore_mutt_settings {
fi fi
for d in $SERVER_DIRECTORY/backup/mutt/*/ ; do for d in $SERVER_DIRECTORY/backup/mutt/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/mutt/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/mutt/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -259,7 +259,7 @@ function restore_gpg {
fi fi
for d in $SERVER_DIRECTORY/backup/gnupg/*/ ; do for d in $SERVER_DIRECTORY/backup/gnupg/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/gnupg/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/gnupg/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -292,7 +292,7 @@ function restore_procmail {
fi fi
for d in $SERVER_DIRECTORY/backup/procmail/*/ ; do for d in $SERVER_DIRECTORY/backup/procmail/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/procmail/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/procmail/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -319,7 +319,7 @@ function restore_spamassassin {
fi fi
for d in $SERVER_DIRECTORY/backup/spamassassin/*/ ; do for d in $SERVER_DIRECTORY/backup/spamassassin/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/spamassassin/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/spamassassin/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -365,7 +365,7 @@ function restore_ssh_keys {
fi fi
for d in $SERVER_DIRECTORY/backup/ssh/*/ ; do for d in $SERVER_DIRECTORY/backup/ssh/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/ssh/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/ssh/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -392,7 +392,7 @@ function restore_user_config {
fi fi
for d in $SERVER_DIRECTORY/backup/config/*/ ; do for d in $SERVER_DIRECTORY/backup/config/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/config/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/config/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -431,7 +431,7 @@ function restore_user_monkeysphere {
fi fi
for d in $SERVER_DIRECTORY/backup/monkeysphere/*/ ; do for d in $SERVER_DIRECTORY/backup/monkeysphere/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/monkeysphere/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/monkeysphere/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -468,7 +468,7 @@ function restore_user_fin {
fi fi
for d in $SERVER_DIRECTORY/backup/fin/*/ ; do for d in $SERVER_DIRECTORY/backup/fin/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/fin/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/fin/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -495,7 +495,7 @@ function restore_user_local {
fi fi
for d in $SERVER_DIRECTORY/backup/local/*/ ; do for d in $SERVER_DIRECTORY/backup/local/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/local/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/local/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -563,7 +563,7 @@ function restore_personal_settings {
fi fi
for d in $SERVER_DIRECTORY/backup/personal/*/ ; do for d in $SERVER_DIRECTORY/backup/personal/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/personal/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/personal/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME
@ -610,7 +610,7 @@ function restore_email {
fi fi
for d in $SERVER_DIRECTORY/backup/mail/*/ ; do for d in $SERVER_DIRECTORY/backup/mail/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $6}') USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -d $SERVER_DIRECTORY/backup/mail/$USERNAME ]; then if [ -d $SERVER_DIRECTORY/backup/mail/$USERNAME ]; then
if [ ! -d /home/$USERNAME ]; then if [ ! -d /home/$USERNAME ]; then
${PROJECT_NAME}-adduser $USERNAME ${PROJECT_NAME}-adduser $USERNAME

4
src/freedombone-sec
View File

@ -338,7 +338,7 @@ function send_monkeysphere_server_keys_to_users {
monkeysphere_server_keys=$(monkeysphere-host show-key | grep $"OpenPGP fingerprint" | awk -F ' ' '{print $3}') monkeysphere_server_keys=$(monkeysphere-host show-key | grep $"OpenPGP fingerprint" | awk -F ' ' '{print $3}')
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ ! -d /home/$USERNAME/.monkeysphere ]; then if [ ! -d /home/$USERNAME/.monkeysphere ]; then
mkdir /home/$USERNAME/.monkeysphere mkdir /home/$USERNAME/.monkeysphere
fi fi
@ -956,7 +956,7 @@ function export_settings {
function refresh_gpg_keys { function refresh_gpg_keys {
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
su -c 'gpg --refresh-keys' - $USERNAME su -c 'gpg --refresh-keys' - $USERNAME
fi fi
done done

10
src/freedombone-syncthing
View File

@ -99,7 +99,7 @@ function create_syncthing_config {
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
echo " <folder id=\"$USERNAME\" path=\"/home/$USERNAME/Sync/\" ro=\"false\" rescanIntervalS=\"60\" ignorePerms=\"false\" autoNormalize=\"true\">" >> $SYNCTHING_CONFIG_FILE echo " <folder id=\"$USERNAME\" path=\"/home/$USERNAME/Sync/\" ro=\"false\" rescanIntervalS=\"60\" ignorePerms=\"false\" autoNormalize=\"true\">" >> $SYNCTHING_CONFIG_FILE
# include any specified device IDs for this user # include any specified device IDs for this user
if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
@ -139,7 +139,7 @@ function create_syncthing_config {
echo "" > $TEMP_IDS_FILE echo "" > $TEMP_IDS_FILE
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
while read -r line || [[ -n "$line" ]]; do while read -r line || [[ -n "$line" ]]; do
line2="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" line2="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
@ -179,7 +179,7 @@ function create_syncthing_config {
echo "" > $TEMP_IDS_FILE echo "" > $TEMP_IDS_FILE
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
while read -r line || [[ -n "$line" ]]; do while read -r line || [[ -n "$line" ]]; do
line2="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" line2="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
@ -238,7 +238,7 @@ function create_syncthing_config {
# This allows it to appear within the user control panel # This allows it to appear within the user control panel
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
echo "$SYNCTHING_ID" > /home/$USERNAME/.syncthing-server-id echo "$SYNCTHING_ID" > /home/$USERNAME/.syncthing-server-id
chown $USERNAME:$USERNAME /home/$USERNAME/.syncthing-server-id chown $USERNAME:$USERNAME /home/$USERNAME/.syncthing-server-id
fi fi
@ -259,7 +259,7 @@ function user_devices_changed {
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
if [ -f /home/$USERNAME/$SYNCTHING_UPDATE_FILE ]; then if [ -f /home/$USERNAME/$SYNCTHING_UPDATE_FILE ]; then
CHANGED=1 CHANGED=1
fi fi

2
src/freedombone-utils-backup
View File

@ -275,7 +275,7 @@ function set_user_permissions {
echo $"Setting permissions" echo $"Setting permissions"
for d in /home/*/ ; do for d in /home/*/ ; do
USERNAME=$(echo "$d" | awk -F '/' '{print $3}') USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user $USERNAME) == "1" ]]; then if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
chown -R $USERNAME:$USERNAME /home/$USERNAME chown -R $USERNAME:$USERNAME /home/$USERNAME
fi fi
done done