Bläddra i källkod

Change mount point

Bob Mottram 10 år sedan
förälder
incheckning
93fbee2085
1 ändrade filer med 4 tillägg och 3 borttagningar
  1. 4
    3
      install-freedombone.sh

+ 4
- 3
install-freedombone.sh Visa fil

215
 USB_DRIVE=/dev/sda1
215
 USB_DRIVE=/dev/sda1
216
 
216
 
217
 # Location where the USB drive is mounted to
217
 # Location where the USB drive is mounted to
218
-USB_MOUNT=/media/usb
218
+USB_MOUNT=/mnt/usb
219
 
219
 
220
 # Name of a script used to create a backup of the system on usb drive
220
 # Name of a script used to create a backup of the system on usb drive
221
 BACKUP_SCRIPT_NAME="backup"
221
 BACKUP_SCRIPT_NAME="backup"
466
           chmod 640 /etc/ssl/certs/*
466
           chmod 640 /etc/ssl/certs/*
467
           chmod 400 /etc/ssl/private/*
467
           chmod 400 /etc/ssl/private/*
468
           # change ownership of some certificates
468
           # change ownership of some certificates
469
-          if [ -f /etc/ssl/private/xmpp.key ]; then
469
+          if [ -d /etc/prosody ]; then
470
               chown prosody:prosody /etc/ssl/private/xmpp.*
470
               chown prosody:prosody /etc/ssl/private/xmpp.*
471
               chown prosody:prosody /etc/ssl/certs/xmpp.*
471
               chown prosody:prosody /etc/ssl/certs/xmpp.*
472
           fi
472
           fi
473
-          if [ -f /etc/ssl/private/dovecot.key ]; then
473
+          if [ -d /etc/dovecot ]; then
474
               chown root:dovecot /etc/ssl/certs/dovecot.*
474
               chown root:dovecot /etc/ssl/certs/dovecot.*
475
               chown root:dovecot /etc/ssl/private/dovecot.*
475
               chown root:dovecot /etc/ssl/private/dovecot.*
476
           fi
476
           fi
1677
   EMAIL_COMPLETE_MSG='  *** Freedombone mailbox installation is complete ***'
1677
   EMAIL_COMPLETE_MSG='  *** Freedombone mailbox installation is complete ***'
1678
   if grep -Fxq "import_email" $COMPLETION_FILE; then
1678
   if grep -Fxq "import_email" $COMPLETION_FILE; then
1679
       if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" ]]; then
1679
       if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" ]]; then
1680
+		  echo ''
1680
           echo $EMAIL_COMPLETE_MSG
1681
           echo $EMAIL_COMPLETE_MSG
1681
           if [ -d $USB_MOUNT ]; then
1682
           if [ -d $USB_MOUNT ]; then
1682
               umount $USB_MOUNT
1683
               umount $USB_MOUNT