Browse Source

Tidy up initial loading of some files from usb

Bob Mottram 8 years ago
parent
commit
43c5e1dd15
3 changed files with 20 additions and 34 deletions
  1. 19
    2
      src/freedombone-app-xmpp
  2. 0
    15
      src/freedombone-base-email
  3. 1
    17
      src/freedombone-utils-setup

+ 19
- 2
src/freedombone-app-xmpp View File

345
             check_certificates xmpp
345
             check_certificates xmpp
346
         fi
346
         fi
347
     fi
347
     fi
348
-    chown prosody:prosody /etc/ssl/private/xmpp.key
349
-    chown prosody:prosody /etc/ssl/certs/xmpp.*
348
+    if [ -f /etc/ssl/private/xmpp.key ]; then
349
+        chown prosody:prosody /etc/ssl/private/xmpp.key
350
+    fi
351
+    if [ -f /etc/ssl/certs/xmpp.crt ]; then
352
+        chown prosody:prosody /etc/ssl/certs/xmpp.crt
353
+    fi
354
+    if [ -f /etc/ssl/certs/xmpp.dhparam ]; then
355
+        chown prosody:prosody /etc/ssl/certs/xmpp.dhparam
356
+    fi
357
+    if [ -f /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key ]; then
358
+        chown prosody:prosody /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key
359
+    fi
360
+    if [ -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
361
+        chown prosody:prosody /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem
362
+    fi
363
+    if [ -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam ]; then
364
+        chown prosody:prosody /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam
365
+    fi
366
+
350
     cp -a /etc/prosody/conf.avail/example.com.cfg.lua /etc/prosody/conf.avail/xmpp.cfg.lua
367
     cp -a /etc/prosody/conf.avail/example.com.cfg.lua /etc/prosody/conf.avail/xmpp.cfg.lua
351
 
368
 
352
     if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
369
     if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then

+ 0
- 15
src/freedombone-base-email View File

60
 # optionally specify your public key ID
60
 # optionally specify your public key ID
61
 MY_GPG_PUBLIC_KEY_ID=
61
 MY_GPG_PUBLIC_KEY_ID=
62
 
62
 
63
-# If you have existing mail within a Maildir
64
-# you can specify the directory here and the files
65
-# will be imported
66
-IMPORT_MAILDIR=
67
-
68
 EXIM_ONION_REPO="https://github.com/petterreinholdtsen/exim4-smtorp"
63
 EXIM_ONION_REPO="https://github.com/petterreinholdtsen/exim4-smtorp"
69
 
64
 
70
 # automatic archiving of email
65
 # automatic archiving of email
624
         fi
619
         fi
625
         return
620
         return
626
     fi
621
     fi
627
-    if [ $IMPORT_MAILDIR ]; then
628
-        if [ -d $IMPORT_MAILDIR ]; then
629
-            echo $'Transfering email files'
630
-            cp -r $IMPORT_MAILDIR /home/$MY_USERNAME
631
-            chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Maildir
632
-        else
633
-            echo $"Email import directory $IMPORT_MAILDIR not found"
634
-            exit 9
635
-        fi
636
-    fi
637
     mark_completed $FUNCNAME
622
     mark_completed $FUNCNAME
638
     if [[ $SYSTEM_TYPE == "mail"* ]]; then
623
     if [[ $SYSTEM_TYPE == "mail"* ]]; then
639
         function_check backup_to_friends_servers
624
         function_check backup_to_friends_servers

+ 1
- 17
src/freedombone-utils-setup View File

176
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
176
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
177
         return
177
         return
178
     fi
178
     fi
179
+    detect_usb_drive
179
     if [ -b $USB_DRIVE ]; then
180
     if [ -b $USB_DRIVE ]; then
180
         if [ ! -d $USB_MOUNT ]; then
181
         if [ ! -d $USB_MOUNT ]; then
181
             echo $'Mounting USB drive'
182
             echo $'Mounting USB drive'
182
             mkdir $USB_MOUNT
183
             mkdir $USB_MOUNT
183
             mount $USB_DRIVE $USB_MOUNT
184
             mount $USB_DRIVE $USB_MOUNT
184
         fi
185
         fi
185
-        if [ -d $USB_MOUNT/Maildir ]; then
186
-            echo $'Maildir found on USB drive'
187
-            IMPORT_MAILDIR=$USB_MOUNT/Maildir
188
-        fi
189
         if [ -d $USB_MOUNT/.gnupg ]; then
186
         if [ -d $USB_MOUNT/.gnupg ]; then
190
             echo $'Importing GPG keyring'
187
             echo $'Importing GPG keyring'
191
             cp -r $USB_MOUNT/.gnupg /home/$MY_USERNAME
188
             cp -r $USB_MOUNT/.gnupg /home/$MY_USERNAME
197
             fi
194
             fi
198
         fi
195
         fi
199
 
196
 
200
-        if [ -f $USB_MOUNT/.procmailrc ]; then
201
-            echo $'Importing procmail settings'
202
-            cp $USB_MOUNT/.procmailrc /home/$MY_USERNAME
203
-            chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.procmailrc
204
-        fi
205
-
206
         if [ -f $USB_MOUNT/private_key.gpg ]; then
197
         if [ -f $USB_MOUNT/private_key.gpg ]; then
207
             echo $'GPG private key found on USB drive'
198
             echo $'GPG private key found on USB drive'
208
             MY_GPG_PRIVATE_KEY=$USB_MOUNT/private_key.gpg
199
             MY_GPG_PRIVATE_KEY=$USB_MOUNT/private_key.gpg
212
             MY_GPG_PUBLIC_KEY=$USB_MOUNT/public_key.gpg
203
             MY_GPG_PUBLIC_KEY=$USB_MOUNT/public_key.gpg
213
         fi
204
         fi
214
 
205
 
215
-        if [ -d $USB_MOUNT/prosody ]; then
216
-            if [ ! -d $XMPP_DIRECTORY ]; then
217
-                mkdir $XMPP_DIRECTORY
218
-            fi
219
-            cp -r $USB_MOUNT/prosody/* $XMPP_DIRECTORY
220
-            chown -R prosody:prosody $XMPP_DIRECTORY
221
-        fi
222
         if [ -d $USB_MOUNT/.ssh ]; then
206
         if [ -d $USB_MOUNT/.ssh ]; then
223
             echo $'Importing ssh keys'
207
             echo $'Importing ssh keys'
224
             cp -r $USB_MOUNT/.ssh /home/$MY_USERNAME
208
             cp -r $USB_MOUNT/.ssh /home/$MY_USERNAME