diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel index 66286dea..45fe614d 100755 --- a/src/freedombone-controlpanel +++ b/src/freedombone-controlpanel @@ -954,22 +954,23 @@ function restore_from_usb { 11 $"IPFS" off \ 12 $"SSH keys" off \ 13 $"User configuration files" off \ - 14 $"SSL/TLS certificates" off \ - 15 $"Personal settings" off \ - 16 $"Mailing List" off \ - 17 $"XMPP chat" off \ - 18 $"GNU Social" off \ - 19 $"Hubzilla" off \ - 20 $"Owncloud" off \ - 21 $"Gogs" off \ - 22 $"Wiki" off \ - 23 $"Blog" off \ - 24 $"CJDNS" off \ - 25 $"Email" off \ - 26 $"DLNA" off \ - 27 $"VoIP" off \ - 28 $"RSS reader" off \ - 29 $"Tox" off 2> $data + 14 $"User fin files" off \ + 15 $"SSL/TLS certificates" off \ + 16 $"Personal settings" off \ + 17 $"Mailing List" off \ + 18 $"XMPP chat" off \ + 19 $"GNU Social" off \ + 20 $"Hubzilla" off \ + 21 $"Owncloud" off \ + 22 $"Gogs" off \ + 23 $"Wiki" off \ + 24 $"Blog" off \ + 25 $"CJDNS" off \ + 26 $"Email" off \ + 27 $"DLNA" off \ + 28 $"VoIP" off \ + 29 $"RSS reader" off \ + 30 $"Tox" off 2> $data sel=$? case $sel in 1) break;; @@ -989,22 +990,23 @@ function restore_from_usb { 11) ${PROJECT_NAME}-restore-local $USB_DRIVE ipfs;; 12) ${PROJECT_NAME}-restore-local $USB_DRIVE ssh;; 13) ${PROJECT_NAME}-restore-local $USB_DRIVE userconfig;; - 14) ${PROJECT_NAME}-restore-local $USB_DRIVE certs;; - 15) ${PROJECT_NAME}-restore-local $USB_DRIVE personal;; - 16) ${PROJECT_NAME}-restore-local $USB_DRIVE mailinglist;; - 17) ${PROJECT_NAME}-restore-local $USB_DRIVE xmpp;; - 18) ${PROJECT_NAME}-restore-local $USB_DRIVE gnusocial;; - 19) ${PROJECT_NAME}-restore-local $USB_DRIVE hubzilla;; - 20) ${PROJECT_NAME}-restore-local $USB_DRIVE owncloud;; - 21) ${PROJECT_NAME}-restore-local $USB_DRIVE gogs;; - 22) ${PROJECT_NAME}-restore-local $USB_DRIVE wiki;; - 23) ${PROJECT_NAME}-restore-local $USB_DRIVE blog;; - 24) ${PROJECT_NAME}-restore-local $USB_DRIVE cjdns;; - 25) ${PROJECT_NAME}-restore-local $USB_DRIVE email;; - 26) ${PROJECT_NAME}-restore-local $USB_DRIVE dlna;; - 27) ${PROJECT_NAME}-restore-local $USB_DRIVE voip;; - 28) ${PROJECT_NAME}-restore-local $USB_DRIVE ttrss;; - 29) ${PROJECT_NAME}-restore-local $USB_DRIVE tox;; + 14) ${PROJECT_NAME}-restore-local $USB_DRIVE userfin;; + 15) ${PROJECT_NAME}-restore-local $USB_DRIVE certs;; + 16) ${PROJECT_NAME}-restore-local $USB_DRIVE personal;; + 17) ${PROJECT_NAME}-restore-local $USB_DRIVE mailinglist;; + 18) ${PROJECT_NAME}-restore-local $USB_DRIVE xmpp;; + 19) ${PROJECT_NAME}-restore-local $USB_DRIVE gnusocial;; + 20) ${PROJECT_NAME}-restore-local $USB_DRIVE hubzilla;; + 21) ${PROJECT_NAME}-restore-local $USB_DRIVE owncloud;; + 22) ${PROJECT_NAME}-restore-local $USB_DRIVE gogs;; + 23) ${PROJECT_NAME}-restore-local $USB_DRIVE wiki;; + 24) ${PROJECT_NAME}-restore-local $USB_DRIVE blog;; + 25) ${PROJECT_NAME}-restore-local $USB_DRIVE cjdns;; + 26) ${PROJECT_NAME}-restore-local $USB_DRIVE email;; + 27) ${PROJECT_NAME}-restore-local $USB_DRIVE dlna;; + 28) ${PROJECT_NAME}-restore-local $USB_DRIVE voip;; + 29) ${PROJECT_NAME}-restore-local $USB_DRIVE ttrss;; + 30) ${PROJECT_NAME}-restore-local $USB_DRIVE tox;; esac done any_key @@ -1193,13 +1195,13 @@ function security_settings { } function reset_tripwire { - clear - echo $'Resetting the Tripwire...' - echo ' ' - echo ' + clear + echo $'Resetting the Tripwire...' + echo ' ' + echo ' ' | reset-tripwire - any_key + any_key } function hubzilla_renew_cert { @@ -1213,9 +1215,9 @@ function hubzilla_renew_cert { esac HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}') if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME/htdocs ]; then - dialog --title $"Renew SSL certificate" \ - --msgbox $"Hubzilla install directory not found" 6 40 - return + dialog --title $"Renew SSL certificate" \ + --msgbox $"Hubzilla install directory not found" 6 40 + return fi ${PROJECT_NAME}-renew-cert -h $HUBZILLA_DOMAIN_NAME -p 'letsencrypt' if [ ! "$?" = "0" ]; then @@ -1228,15 +1230,15 @@ function hubzilla_renew_cert { function hubzilla_channel_directory_server { if ! grep -q "Hubzilla domain" $COMPLETION_FILE; then - dialog --title $"Hubzilla channel directory server" \ - --msgbox $"Hubzilla is not installed on this system" 6 40 - return + dialog --title $"Hubzilla channel directory server" \ + --msgbox $"Hubzilla is not installed on this system" 6 40 + return fi HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}') if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME/htdocs ]; then - dialog --title $"Hubzilla channel directory server" \ - --msgbox $"Hubzilla install directory not found" 6 40 - return + dialog --title $"Hubzilla channel directory server" \ + --msgbox $"Hubzilla install directory not found" 6 40 + return fi data=$(tempfile 2>/dev/null)