|
@@ -954,22 +954,23 @@ function restore_from_usb {
|
954
|
954
|
11 $"IPFS" off \
|
955
|
955
|
12 $"SSH keys" off \
|
956
|
956
|
13 $"User configuration files" off \
|
957
|
|
- 14 $"SSL/TLS certificates" off \
|
958
|
|
- 15 $"Personal settings" off \
|
959
|
|
- 16 $"Mailing List" off \
|
960
|
|
- 17 $"XMPP chat" off \
|
961
|
|
- 18 $"GNU Social" off \
|
962
|
|
- 19 $"Hubzilla" off \
|
963
|
|
- 20 $"Owncloud" off \
|
964
|
|
- 21 $"Gogs" off \
|
965
|
|
- 22 $"Wiki" off \
|
966
|
|
- 23 $"Blog" off \
|
967
|
|
- 24 $"CJDNS" off \
|
968
|
|
- 25 $"Email" off \
|
969
|
|
- 26 $"DLNA" off \
|
970
|
|
- 27 $"VoIP" off \
|
971
|
|
- 28 $"RSS reader" off \
|
972
|
|
- 29 $"Tox" off 2> $data
|
|
957
|
+ 14 $"User fin files" off \
|
|
958
|
+ 15 $"SSL/TLS certificates" off \
|
|
959
|
+ 16 $"Personal settings" off \
|
|
960
|
+ 17 $"Mailing List" off \
|
|
961
|
+ 18 $"XMPP chat" off \
|
|
962
|
+ 19 $"GNU Social" off \
|
|
963
|
+ 20 $"Hubzilla" off \
|
|
964
|
+ 21 $"Owncloud" off \
|
|
965
|
+ 22 $"Gogs" off \
|
|
966
|
+ 23 $"Wiki" off \
|
|
967
|
+ 24 $"Blog" off \
|
|
968
|
+ 25 $"CJDNS" off \
|
|
969
|
+ 26 $"Email" off \
|
|
970
|
+ 27 $"DLNA" off \
|
|
971
|
+ 28 $"VoIP" off \
|
|
972
|
+ 29 $"RSS reader" off \
|
|
973
|
+ 30 $"Tox" off 2> $data
|
973
|
974
|
sel=$?
|
974
|
975
|
case $sel in
|
975
|
976
|
1) break;;
|
|
@@ -989,22 +990,23 @@ function restore_from_usb {
|
989
|
990
|
11) ${PROJECT_NAME}-restore-local $USB_DRIVE ipfs;;
|
990
|
991
|
12) ${PROJECT_NAME}-restore-local $USB_DRIVE ssh;;
|
991
|
992
|
13) ${PROJECT_NAME}-restore-local $USB_DRIVE userconfig;;
|
992
|
|
- 14) ${PROJECT_NAME}-restore-local $USB_DRIVE certs;;
|
993
|
|
- 15) ${PROJECT_NAME}-restore-local $USB_DRIVE personal;;
|
994
|
|
- 16) ${PROJECT_NAME}-restore-local $USB_DRIVE mailinglist;;
|
995
|
|
- 17) ${PROJECT_NAME}-restore-local $USB_DRIVE xmpp;;
|
996
|
|
- 18) ${PROJECT_NAME}-restore-local $USB_DRIVE gnusocial;;
|
997
|
|
- 19) ${PROJECT_NAME}-restore-local $USB_DRIVE hubzilla;;
|
998
|
|
- 20) ${PROJECT_NAME}-restore-local $USB_DRIVE owncloud;;
|
999
|
|
- 21) ${PROJECT_NAME}-restore-local $USB_DRIVE gogs;;
|
1000
|
|
- 22) ${PROJECT_NAME}-restore-local $USB_DRIVE wiki;;
|
1001
|
|
- 23) ${PROJECT_NAME}-restore-local $USB_DRIVE blog;;
|
1002
|
|
- 24) ${PROJECT_NAME}-restore-local $USB_DRIVE cjdns;;
|
1003
|
|
- 25) ${PROJECT_NAME}-restore-local $USB_DRIVE email;;
|
1004
|
|
- 26) ${PROJECT_NAME}-restore-local $USB_DRIVE dlna;;
|
1005
|
|
- 27) ${PROJECT_NAME}-restore-local $USB_DRIVE voip;;
|
1006
|
|
- 28) ${PROJECT_NAME}-restore-local $USB_DRIVE ttrss;;
|
1007
|
|
- 29) ${PROJECT_NAME}-restore-local $USB_DRIVE tox;;
|
|
993
|
+ 14) ${PROJECT_NAME}-restore-local $USB_DRIVE userfin;;
|
|
994
|
+ 15) ${PROJECT_NAME}-restore-local $USB_DRIVE certs;;
|
|
995
|
+ 16) ${PROJECT_NAME}-restore-local $USB_DRIVE personal;;
|
|
996
|
+ 17) ${PROJECT_NAME}-restore-local $USB_DRIVE mailinglist;;
|
|
997
|
+ 18) ${PROJECT_NAME}-restore-local $USB_DRIVE xmpp;;
|
|
998
|
+ 19) ${PROJECT_NAME}-restore-local $USB_DRIVE gnusocial;;
|
|
999
|
+ 20) ${PROJECT_NAME}-restore-local $USB_DRIVE hubzilla;;
|
|
1000
|
+ 21) ${PROJECT_NAME}-restore-local $USB_DRIVE owncloud;;
|
|
1001
|
+ 22) ${PROJECT_NAME}-restore-local $USB_DRIVE gogs;;
|
|
1002
|
+ 23) ${PROJECT_NAME}-restore-local $USB_DRIVE wiki;;
|
|
1003
|
+ 24) ${PROJECT_NAME}-restore-local $USB_DRIVE blog;;
|
|
1004
|
+ 25) ${PROJECT_NAME}-restore-local $USB_DRIVE cjdns;;
|
|
1005
|
+ 26) ${PROJECT_NAME}-restore-local $USB_DRIVE email;;
|
|
1006
|
+ 27) ${PROJECT_NAME}-restore-local $USB_DRIVE dlna;;
|
|
1007
|
+ 28) ${PROJECT_NAME}-restore-local $USB_DRIVE voip;;
|
|
1008
|
+ 29) ${PROJECT_NAME}-restore-local $USB_DRIVE ttrss;;
|
|
1009
|
+ 30) ${PROJECT_NAME}-restore-local $USB_DRIVE tox;;
|
1008
|
1010
|
esac
|
1009
|
1011
|
done
|
1010
|
1012
|
any_key
|
|
@@ -1193,13 +1195,13 @@ function security_settings {
|
1193
|
1195
|
}
|
1194
|
1196
|
|
1195
|
1197
|
function reset_tripwire {
|
1196
|
|
- clear
|
1197
|
|
- echo $'Resetting the Tripwire...'
|
1198
|
|
- echo ' '
|
1199
|
|
- echo '
|
|
1198
|
+ clear
|
|
1199
|
+ echo $'Resetting the Tripwire...'
|
|
1200
|
+ echo ' '
|
|
1201
|
+ echo '
|
1200
|
1202
|
|
1201
|
1203
|
' | reset-tripwire
|
1202
|
|
- any_key
|
|
1204
|
+ any_key
|
1203
|
1205
|
}
|
1204
|
1206
|
|
1205
|
1207
|
function hubzilla_renew_cert {
|
|
@@ -1213,9 +1215,9 @@ function hubzilla_renew_cert {
|
1213
|
1215
|
esac
|
1214
|
1216
|
HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
|
1215
|
1217
|
if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME/htdocs ]; then
|
1216
|
|
- dialog --title $"Renew SSL certificate" \
|
1217
|
|
- --msgbox $"Hubzilla install directory not found" 6 40
|
1218
|
|
- return
|
|
1218
|
+ dialog --title $"Renew SSL certificate" \
|
|
1219
|
+ --msgbox $"Hubzilla install directory not found" 6 40
|
|
1220
|
+ return
|
1219
|
1221
|
fi
|
1220
|
1222
|
${PROJECT_NAME}-renew-cert -h $HUBZILLA_DOMAIN_NAME -p 'letsencrypt'
|
1221
|
1223
|
if [ ! "$?" = "0" ]; then
|
|
@@ -1228,15 +1230,15 @@ function hubzilla_renew_cert {
|
1228
|
1230
|
|
1229
|
1231
|
function hubzilla_channel_directory_server {
|
1230
|
1232
|
if ! grep -q "Hubzilla domain" $COMPLETION_FILE; then
|
1231
|
|
- dialog --title $"Hubzilla channel directory server" \
|
1232
|
|
- --msgbox $"Hubzilla is not installed on this system" 6 40
|
1233
|
|
- return
|
|
1233
|
+ dialog --title $"Hubzilla channel directory server" \
|
|
1234
|
+ --msgbox $"Hubzilla is not installed on this system" 6 40
|
|
1235
|
+ return
|
1234
|
1236
|
fi
|
1235
|
1237
|
HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
|
1236
|
1238
|
if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME/htdocs ]; then
|
1237
|
|
- dialog --title $"Hubzilla channel directory server" \
|
1238
|
|
- --msgbox $"Hubzilla install directory not found" 6 40
|
1239
|
|
- return
|
|
1239
|
+ dialog --title $"Hubzilla channel directory server" \
|
|
1240
|
+ --msgbox $"Hubzilla install directory not found" 6 40
|
|
1241
|
+ return
|
1240
|
1242
|
fi
|
1241
|
1243
|
|
1242
|
1244
|
data=$(tempfile 2>/dev/null)
|