瀏覽代碼

Project name

Bob Mottram 9 年之前
父節點
當前提交
b028a8c009

+ 40
- 40
src/freedombone 查看文件

252
 USB_MOUNT=/mnt/usb
252
 USB_MOUNT=/mnt/usb
253
 
253
 
254
 # name of a script used to upgrade the system
254
 # name of a script used to upgrade the system
255
-UPGRADE_SCRIPT_NAME="freedombone-upgrade"
255
+UPGRADE_SCRIPT_NAME="${PROJECT_NAME}-upgrade"
256
 
256
 
257
 # name of a script which keeps running processes going even if they crash
257
 # name of a script which keeps running processes going even if they crash
258
 WATCHDOG_SCRIPT_NAME="keepon"
258
 WATCHDOG_SCRIPT_NAME="keepon"
314
 CREATE_GIT_PROJECT_COMMAND='create-project'
314
 CREATE_GIT_PROJECT_COMMAND='create-project'
315
 
315
 
316
 # File which keeps track of what has already been installed
316
 # File which keeps track of what has already been installed
317
-COMPLETION_FILE=$HOME/freedombone-completed.txt
317
+COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
318
 
318
 
319
 # Used to indicate whether the backup contains MariaDB databases or not
319
 # Used to indicate whether the backup contains MariaDB databases or not
320
 BACKUP_INCLUDES_DATABASES="no"
320
 BACKUP_INCLUDES_DATABASES="no"
538
   if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
538
   if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
539
       return
539
       return
540
   fi
540
   fi
541
-  if [ ! -f /usr/local/bin/freedombone-remote ]; then
542
-      if [ ! -f /usr/bin/freedombone-remote ]; then
543
-          echo 'The command freedombone-remote was not found'
541
+  if [ ! -f /usr/local/bin/${PROJECT_NAME}-remote ]; then
542
+      if [ ! -f /usr/bin/${PROJECT_NAME}-remote ]; then
543
+          echo $"The command ${PROJECT_NAME}-remote was not found"
544
           exit 87354
544
           exit 87354
545
       fi
545
       fi
546
   fi
546
   fi
547
-  freedombone-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes
547
+  ${PROJECT_NAME}-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes
548
   if [ ! "$?" = "0" ]; then
548
   if [ ! "$?" = "0" ]; then
549
       echo $'Command failed:'
549
       echo $'Command failed:'
550
       echo ''
550
       echo ''
551
-      echo $"  freedombone-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes"
551
+      echo $"  ${PROJECT_NAME}-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes"
552
       echo ''
552
       echo ''
553
       exit 65892
553
       exit 65892
554
   fi
554
   fi
560
   dots=${TEST_DOMAIN_NAME//[^.]}
560
   dots=${TEST_DOMAIN_NAME//[^.]}
561
   no_of_dots=${#dots}
561
   no_of_dots=${#dots}
562
   if (( $no_of_dots > 3 )); then
562
   if (( $no_of_dots > 3 )); then
563
-      TEST_DOMAIN_NAME="The domain $TEST_DOMAIN_NAME has too many subdomains. It should be of the type w.x.y.z, x.y.z or y.z"
563
+      TEST_DOMAIN_NAME=$"The domain $TEST_DOMAIN_NAME has too many subdomains. It should be of the type w.x.y.z, x.y.z or y.z"
564
   fi
564
   fi
565
   if (( $no_of_dots == 0 )); then
565
   if (( $no_of_dots == 0 )); then
566
-      TEST_DOMAIN_NAME="The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z"
566
+      TEST_DOMAIN_NAME=$"The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z"
567
   fi
567
   fi
568
 }
568
 }
569
 
569
 
570
 function interactive_configuration {
570
 function interactive_configuration {
571
-  if [ ! -f /usr/local/bin/freedombone-config ]; then
572
-      if [ ! -f /usr/bin/freedombone-config ]; then
573
-          echo 'The command freedombone-config was not found'
571
+  if [ ! -f /usr/local/bin/${PROJECT_NAME}-config ]; then
572
+      if [ ! -f /usr/bin/${PROJECT_NAME}-config ]; then
573
+          echo $"The command ${PROJECT_NAME}-config was not found"
574
           exit 63935
574
           exit 63935
575
       fi
575
       fi
576
   fi
576
   fi
579
   fi
579
   fi
580
 
580
 
581
   if [[ $MINIMAL_INSTALL == "no" ]]; then
581
   if [[ $MINIMAL_INSTALL == "no" ]]; then
582
-      freedombone-config \
582
+      ${PROJECT_NAME}-config \
583
           -f $CONFIGURATION_FILE \
583
           -f $CONFIGURATION_FILE \
584
           -w $FREEDOMBONE_WEBSITE \
584
           -w $FREEDOMBONE_WEBSITE \
585
           -b $FREEDOMBONE_BITMESSAGE \
585
           -b $FREEDOMBONE_BITMESSAGE \
586
           -m $MINIMUM_PASSWORD_LENGTH
586
           -m $MINIMUM_PASSWORD_LENGTH
587
   else
587
   else
588
-      freedombone-config \
588
+      ${PROJECT_NAME}-config \
589
           -f $CONFIGURATION_FILE \
589
           -f $CONFIGURATION_FILE \
590
           -w $FREEDOMBONE_WEBSITE \
590
           -w $FREEDOMBONE_WEBSITE \
591
           -b $FREEDOMBONE_BITMESSAGE \
591
           -b $FREEDOMBONE_BITMESSAGE \
600
   if [ ! "$?" = "0" ]; then
600
   if [ ! "$?" = "0" ]; then
601
       echo $'Command failed:'
601
       echo $'Command failed:'
602
       echo ''
602
       echo ''
603
-      echo $"  freedombone-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]"
603
+      echo $"  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]"
604
       echo ''
604
       echo ''
605
       exit 73594
605
       exit 73594
606
   fi
606
   fi
3957
 
3957
 
3958
   # make a tls certificate for email
3958
   # make a tls certificate for email
3959
   if [ ! -f /etc/ssl/certs/exim.dhparam ]; then
3959
   if [ ! -f /etc/ssl/certs/exim.dhparam ]; then
3960
-      freedombone-addcert -h exim --dhkey $DH_KEYLENGTH
3960
+      ${PROJECT_NAME}-addcert -h exim --dhkey $DH_KEYLENGTH
3961
       check_certificates exim
3961
       check_certificates exim
3962
   fi
3962
   fi
3963
   cp /etc/ssl/private/exim.key /etc/exim4
3963
   cp /etc/ssl/private/exim.key /etc/exim4
4221
   fi
4221
   fi
4222
 
4222
 
4223
   if [ ! -f /etc/ssl/certs/dovecot.dhparam ]; then
4223
   if [ ! -f /etc/ssl/certs/dovecot.dhparam ]; then
4224
-      freedombone-addcert -h dovecot --dhkey $DH_KEYLENGTH
4224
+      ${PROJECT_NAME}-addcert -h dovecot --dhkey $DH_KEYLENGTH
4225
       check_certificates dovecot
4225
       check_certificates dovecot
4226
   fi
4226
   fi
4227
   chown root:dovecot /etc/ssl/certs/dovecot.*
4227
   chown root:dovecot /etc/ssl/certs/dovecot.*
4317
   # make a CA cert
4317
   # make a CA cert
4318
   if [ ! -f /etc/ssl/private/ca-$DEFAULT_DOMAIN_NAME.key ]; then
4318
   if [ ! -f /etc/ssl/private/ca-$DEFAULT_DOMAIN_NAME.key ]; then
4319
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
4319
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
4320
-          freedombone-addcert -h $DEFAULT_DOMAIN_NAME --ca "" --dhkey $DH_KEYLENGTH
4320
+          ${PROJECT_NAME}-addcert -h $DEFAULT_DOMAIN_NAME --ca "" --dhkey $DH_KEYLENGTH
4321
       else
4321
       else
4322
-          freedombone-addcert -e $DEFAULT_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
4322
+          ${PROJECT_NAME}-addcert -e $DEFAULT_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
4323
       fi
4323
       fi
4324
   fi
4324
   fi
4325
   # CA configuration
4325
   # CA configuration
4364
   fi
4364
   fi
4365
   touch /etc/ssl/ssldb
4365
   touch /etc/ssl/ssldb
4366
   echo 0001 > /etc/ssl/sslserial
4366
   echo 0001 > /etc/ssl/sslserial
4367
-  #freedombone-clientcert -u $MY_USERNAME
4367
+  #${PROJECT_NAME}-clientcert -u $MY_USERNAME
4368
   service dovecot restart
4368
   service dovecot restart
4369
   echo 'configure_imap_client_certs' >> $COMPLETION_FILE
4369
   echo 'configure_imap_client_certs' >> $COMPLETION_FILE
4370
 }
4370
 }
5212
       chmod 600 /home/$MY_USERNAME/README
5212
       chmod 600 /home/$MY_USERNAME/README
5213
   fi
5213
   fi
5214
 
5214
 
5215
-  freedombone-addlist -u $MY_USERNAME -l "$PUBLIC_MAILING_LIST" -s "$PUBLIC_MAILING_LIST"
5215
+  ${PROJECT_NAME}-addlist -u $MY_USERNAME -l "$PUBLIC_MAILING_LIST" -s "$PUBLIC_MAILING_LIST"
5216
 
5216
 
5217
   echo 'create_public_mailing_list' >> $COMPLETION_FILE
5217
   echo 'create_public_mailing_list' >> $COMPLETION_FILE
5218
 }
5218
 }
5249
   sed -i 's/#smtp_port: 25/smtp_port: 465/g' /etc/schleuder/schleuder.conf
5249
   sed -i 's/#smtp_port: 25/smtp_port: 465/g' /etc/schleuder/schleuder.conf
5250
   sed -i 's/#superadminaddr: root@localhost/superadminaddr: root@localhost' /etc/schleuder/schleuder.conf
5250
   sed -i 's/#superadminaddr: root@localhost/superadminaddr: root@localhost' /etc/schleuder/schleuder.conf
5251
   schleuder-newlist $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME -realname "$PRIVATE_MAILING_LIST" -adminaddress $MY_EMAIL_ADDRESS -initmember $MY_EMAIL_ADDRESS -initmemberkey $MY_GPG_PUBLIC_KEY -nointeractive
5251
   schleuder-newlist $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME -realname "$PRIVATE_MAILING_LIST" -adminaddress $MY_EMAIL_ADDRESS -initmember $MY_EMAIL_ADDRESS -initmemberkey $MY_GPG_PUBLIC_KEY -nointeractive
5252
-  freedombone-addemail -u $MY_USERNAME -e $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME -l $PRIVATE_MAILING_LIST
5252
+  ${PROJECT_NAME}-addemail -u $MY_USERNAME -e $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME -l $PRIVATE_MAILING_LIST
5253
 
5253
 
5254
   echo 'schleuder:' > /etc/exim4/conf.d/router/550_exim4-config_schleuder
5254
   echo 'schleuder:' > /etc/exim4/conf.d/router/550_exim4-config_schleuder
5255
   echo '  debug_print = "R: schleuder for $local_part@$domain"' >> /etc/exim4/conf.d/router/550_exim4-config_schleuder
5255
   echo '  debug_print = "R: schleuder for $local_part@$domain"' >> /etc/exim4/conf.d/router/550_exim4-config_schleuder
5282
   # split the gpg key into fragments if social key management is enabled
5282
   # split the gpg key into fragments if social key management is enabled
5283
   if [[ $ENABLE_SOCIAL_KEY_MANAGEMENT == "yes" ]]; then
5283
   if [[ $ENABLE_SOCIAL_KEY_MANAGEMENT == "yes" ]]; then
5284
       echo 'Splitting GPG key. You may need to enter your passphrase.'
5284
       echo 'Splitting GPG key. You may need to enter your passphrase.'
5285
-      freedombone-splitkey -u $MY_USERNAME -e $MY_EMAIL_ADDRESS --fullname "$MY_NAME"
5285
+      ${PROJECT_NAME}-splitkey -u $MY_USERNAME -e $MY_EMAIL_ADDRESS --fullname "$MY_NAME"
5286
       if [ ! -d /home/$MY_USERNAME/.gnupg_fragments ]; then
5286
       if [ ! -d /home/$MY_USERNAME/.gnupg_fragments ]; then
5287
           echo 'Yhe GPG key could not be split'
5287
           echo 'Yhe GPG key could not be split'
5288
           exit 86548
5288
           exit 86548
5942
 
5942
 
5943
   if [ ! -f /etc/ssl/certs/$OWNCLOUD_DOMAIN_NAME.dhparam ]; then
5943
   if [ ! -f /etc/ssl/certs/$OWNCLOUD_DOMAIN_NAME.dhparam ]; then
5944
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
5944
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
5945
-          freedombone-addcert -h $OWNCLOUD_DOMAIN_NAME --dhkey $DH_KEYLENGTH
5945
+          ${PROJECT_NAME}-addcert -h $OWNCLOUD_DOMAIN_NAME --dhkey $DH_KEYLENGTH
5946
       else
5946
       else
5947
-          freedombone-addcert -e $OWNCLOUD_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
5947
+          ${PROJECT_NAME}-addcert -e $OWNCLOUD_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
5948
       fi
5948
       fi
5949
       check_certificates $OWNCLOUD_DOMAIN_NAME
5949
       check_certificates $OWNCLOUD_DOMAIN_NAME
5950
   fi
5950
   fi
6226
 
6226
 
6227
   if [ ! -f /etc/ssl/certs/$GIT_DOMAIN_NAME.dhparam ]; then
6227
   if [ ! -f /etc/ssl/certs/$GIT_DOMAIN_NAME.dhparam ]; then
6228
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
6228
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
6229
-          freedombone-addcert -h $GIT_DOMAIN_NAME --dhkey $DH_KEYLENGTH
6229
+          ${PROJECT_NAME}-addcert -h $GIT_DOMAIN_NAME --dhkey $DH_KEYLENGTH
6230
       else
6230
       else
6231
-          freedombone-addcert -e $GIT_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
6231
+          ${PROJECT_NAME}-addcert -e $GIT_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
6232
       fi
6232
       fi
6233
       check_certificates $GIT_DOMAIN_NAME
6233
       check_certificates $GIT_DOMAIN_NAME
6234
   fi
6234
   fi
6515
   fi
6515
   fi
6516
 
6516
 
6517
   if [ ! -f /etc/ssl/certs/xmpp.dhparam ]; then
6517
   if [ ! -f /etc/ssl/certs/xmpp.dhparam ]; then
6518
-      freedombone-addcert -h xmpp --dhkey $DH_KEYLENGTH
6518
+      ${PROJECT_NAME}-addcert -h xmpp --dhkey $DH_KEYLENGTH
6519
       check_certificates xmpp
6519
       check_certificates xmpp
6520
   fi
6520
   fi
6521
   chown prosody:prosody /etc/ssl/private/xmpp.key
6521
   chown prosody:prosody /etc/ssl/private/xmpp.key
6649
   fi
6649
   fi
6650
 
6650
 
6651
   if [ ! -f /etc/ssl/certs/ngircd.dhparam ]; then
6651
   if [ ! -f /etc/ssl/certs/ngircd.dhparam ]; then
6652
-      freedombone-addcert -h ngircd --dhkey $DH_KEYLENGTH
6652
+      ${PROJECT_NAME}-addcert -h ngircd --dhkey $DH_KEYLENGTH
6653
       check_certificates ngircd
6653
       check_certificates ngircd
6654
   fi
6654
   fi
6655
 
6655
 
6760
   fi
6760
   fi
6761
   if [ ! -f /etc/ssl/certs/$WIKI_DOMAIN_NAME.dhparam ]; then
6761
   if [ ! -f /etc/ssl/certs/$WIKI_DOMAIN_NAME.dhparam ]; then
6762
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
6762
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
6763
-          freedombone-addcert -h $WIKI_DOMAIN_NAME --dhkey $DH_KEYLENGTH
6763
+          ${PROJECT_NAME}-addcert -h $WIKI_DOMAIN_NAME --dhkey $DH_KEYLENGTH
6764
       else
6764
       else
6765
-          freedombone-addcert -e $WIKI_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
6765
+          ${PROJECT_NAME}-addcert -e $WIKI_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
6766
       fi
6766
       fi
6767
       check_certificates $WIKI_DOMAIN_NAME
6767
       check_certificates $WIKI_DOMAIN_NAME
6768
   fi
6768
   fi
7083
 
7083
 
7084
   if [ ! -f /etc/ssl/certs/$FULLBLOG_DOMAIN_NAME.dhparam ]; then
7084
   if [ ! -f /etc/ssl/certs/$FULLBLOG_DOMAIN_NAME.dhparam ]; then
7085
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
7085
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
7086
-          freedombone-addcert -h $FULLBLOG_DOMAIN_NAME --dhkey $DH_KEYLENGTH
7086
+          ${PROJECT_NAME}-addcert -h $FULLBLOG_DOMAIN_NAME --dhkey $DH_KEYLENGTH
7087
       else
7087
       else
7088
-          freedombone-addcert -e $FULLBLOG_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
7088
+          ${PROJECT_NAME}-addcert -e $FULLBLOG_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
7089
       fi
7089
       fi
7090
       check_certificates $FULLBLOG_DOMAIN_NAME
7090
       check_certificates $FULLBLOG_DOMAIN_NAME
7091
   fi
7091
   fi
7492
 
7492
 
7493
   if [ ! -f /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.dhparam ]; then
7493
   if [ ! -f /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.dhparam ]; then
7494
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
7494
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
7495
-          freedombone-addcert -h $MICROBLOG_DOMAIN_NAME --dhkey $DH_KEYLENGTH
7495
+          ${PROJECT_NAME}-addcert -h $MICROBLOG_DOMAIN_NAME --dhkey $DH_KEYLENGTH
7496
       else
7496
       else
7497
-          freedombone-addcert -e $MICROBLOG_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
7497
+          ${PROJECT_NAME}-addcert -e $MICROBLOG_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
7498
       fi
7498
       fi
7499
       check_certificates $MICROBLOG_DOMAIN_NAME
7499
       check_certificates $MICROBLOG_DOMAIN_NAME
7500
   fi
7500
   fi
7799
 
7799
 
7800
   if [ ! -f /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.dhparam ]; then
7800
   if [ ! -f /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.dhparam ]; then
7801
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
7801
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
7802
-          freedombone-addcert -h $HUBZILLA_DOMAIN_NAME --dhkey $DH_KEYLENGTH
7802
+          ${PROJECT_NAME}-addcert -h $HUBZILLA_DOMAIN_NAME --dhkey $DH_KEYLENGTH
7803
       else
7803
       else
7804
-          freedombone-addcert -e $HUBZILLA_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
7804
+          ${PROJECT_NAME}-addcert -e $HUBZILLA_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
7805
       fi
7805
       fi
7806
       check_certificates $HUBZILLA_DOMAIN_NAME
7806
       check_certificates $HUBZILLA_DOMAIN_NAME
7807
   fi
7807
   fi
8128
 
8128
 
8129
   if [ ! -f /etc/ssl/certs/$MEDIAGOBLIN_DOMAIN_NAME.dhparam ]; then
8129
   if [ ! -f /etc/ssl/certs/$MEDIAGOBLIN_DOMAIN_NAME.dhparam ]; then
8130
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
8130
       if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
8131
-          freedombone-addcert -h $MEDIAGOBLIN_DOMAIN_NAME --dhkey $DH_KEYLENGTH
8131
+          ${PROJECT_NAME}-addcert -h $MEDIAGOBLIN_DOMAIN_NAME --dhkey $DH_KEYLENGTH
8132
       else
8132
       else
8133
-          freedombone-addcert -e $MEDIAGOBLIN_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
8133
+          ${PROJECT_NAME}-addcert -e $MEDIAGOBLIN_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
8134
       fi
8134
       fi
8135
       check_certificates $MEDIAGOBLIN_DOMAIN_NAME
8135
       check_certificates $MEDIAGOBLIN_DOMAIN_NAME
8136
   fi
8136
   fi
8658
 
8658
 
8659
   # Make an ssl cert for the server
8659
   # Make an ssl cert for the server
8660
   if [ ! -f /etc/ssl/certs/mumble.dhparam ]; then
8660
   if [ ! -f /etc/ssl/certs/mumble.dhparam ]; then
8661
-      freedombone-addcert -h mumble --dhkey $DH_KEYLENGTH
8661
+      ${PROJECT_NAME}-addcert -h mumble --dhkey $DH_KEYLENGTH
8662
       check_certificates mumble
8662
       check_certificates mumble
8663
   fi
8663
   fi
8664
 
8664
 

+ 3
- 3
src/freedombone-addcert 查看文件

49
 
49
 
50
 function show_help {
50
 function show_help {
51
     echo ''
51
     echo ''
52
-    echo $'freedombone-addcert -h [hostname] -c [country code] -a [area] -l [location]'
52
+    echo $"${PROJECT_NAME}-addcert -h [hostname] -c [country code] -a [area] -l [location]"
53
     echo $'                    -o [organisation] -u [unit] --ca "" --nodh ""'
53
     echo $'                    -o [organisation] -u [unit] --ca "" --nodh ""'
54
     echo ''
54
     echo ''
55
     echo $'Creates a self-signed certificate for the given hostname'
55
     echo $'Creates a self-signed certificate for the given hostname'
233
 fi
233
 fi
234
 
234
 
235
 # Create a bundle of your certificates
235
 # Create a bundle of your certificates
236
-cat /etc/ssl/mycerts/*.crt /etc/ssl/mycerts/*.pem > /etc/ssl/freedombone-bundle.crt
237
-tar -czvf /etc/ssl/freedombone-certs.tar.gz /etc/ssl/mycerts/*.crt /etc/ssl/mycerts/*.pem
236
+cat /etc/ssl/mycerts/*.crt /etc/ssl/mycerts/*.pem > /etc/ssl/${PROJECT_NAME}-bundle.crt
237
+tar -czvf /etc/ssl/${PROJECT_NAME}-certs.tar.gz /etc/ssl/mycerts/*.crt /etc/ssl/mycerts/*.pem
238
 
238
 
239
 exit 0
239
 exit 0

+ 1
- 1
src/freedombone-addemail 查看文件

40
 
40
 
41
 function show_help {
41
 function show_help {
42
     echo ''
42
     echo ''
43
-    echo $'freedombone-addemail -u [username] -e [email address] -g [group name]'
43
+    echo $"${PROJECT_NAME}-addemail -u [username] -e [email address] -g [group name]"
44
     echo ''
44
     echo ''
45
     exit 0
45
     exit 0
46
 }
46
 }

+ 1
- 1
src/freedombone-addlist 查看文件

41
 
41
 
42
 function show_help {
42
 function show_help {
43
     echo ''
43
     echo ''
44
-    echo $'freedombone-addlist -u [username] -l [mailing list name] -s [subject tag] -e [list email address]'
44
+    echo $"${PROJECT_NAME}-addlist -u [username] -l [mailing list name] -s [subject tag] -e [list email address]"
45
     echo ''
45
     echo ''
46
     exit 0
46
     exit 0
47
 }
47
 }

+ 1
- 1
src/freedombone-addsipuser 查看文件

42
 
42
 
43
 function show_help {
43
 function show_help {
44
     echo ''
44
     echo ''
45
-    echo $'freedombone-addsipuser -u [username] -e [extension] -p [password]'
45
+    echo $"${PROJECT_NAME}-addsipuser -u [username] -e [extension] -p [password]"
46
     echo ''
46
     echo ''
47
     exit 0
47
     exit 0
48
 }
48
 }

+ 9
- 9
src/freedombone-adduser 查看文件

38
 SSH_PUBLIC_KEY="$2"
38
 SSH_PUBLIC_KEY="$2"
39
 GPG_KEYSERVER='hkp://keys.gnupg.net'
39
 GPG_KEYSERVER='hkp://keys.gnupg.net'
40
 SSH_PORT=2222
40
 SSH_PORT=2222
41
-COMPLETION_FILE=$HOME/freedombone-completed.txt
41
+COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
42
 SIP_EXTENSION=
42
 SIP_EXTENSION=
43
 FULLBLOG_DOMAIN_NAME=
43
 FULLBLOG_DOMAIN_NAME=
44
 
44
 
187
 
187
 
188
 if grep -q "install_xmpp" $COMPLETION_FILE; then
188
 if grep -q "install_xmpp" $COMPLETION_FILE; then
189
     echo $"Adding an XMPP account for $MY_USERNAME"
189
     echo $"Adding an XMPP account for $MY_USERNAME"
190
-    freedombone-addxmpp -e "$MY_USERNAME@$HOSTNAME" -p "$NEW_USER_PASSWORD"
190
+    ${PROJECT_NAME}-addxmpp -e "$MY_USERNAME@$HOSTNAME" -p "$NEW_USER_PASSWORD"
191
     if [ ! "$?" = "0" ]; then
191
     if [ ! "$?" = "0" ]; then
192
         echo $"XMPP account not created"
192
         echo $"XMPP account not created"
193
         userdel -r $MY_USERNAME
193
         userdel -r $MY_USERNAME
200
     if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users ]; then
200
     if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users ]; then
201
         echo $'Blog users directory not found'
201
         echo $'Blog users directory not found'
202
         if grep -q "install_xmpp" $COMPLETION_FILE; then
202
         if grep -q "install_xmpp" $COMPLETION_FILE; then
203
-            freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
203
+            ${PROJECT_NAME}-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
204
         fi
204
         fi
205
         userdel -r $MY_USERNAME
205
         userdel -r $MY_USERNAME
206
         exit 9
206
         exit 9
214
 fi
214
 fi
215
 
215
 
216
 if grep -q "install_sip" $COMPLETION_FILE; then
216
 if grep -q "install_sip" $COMPLETION_FILE; then
217
-    SIP_EXTENSION=$(freedombone-sipfreeext)
218
-    freedombone-addsipuser -u $MY_USERNAME -e $SIP_EXTENSION -p "$NEW_USER_PASSWORD"
217
+    SIP_EXTENSION=$(${PROJECT_NAME}-sipfreeext)
218
+    ${PROJECT_NAME}-addsipuser -u $MY_USERNAME -e $SIP_EXTENSION -p "$NEW_USER_PASSWORD"
219
     if [ ! "$?" = "0" ]; then
219
     if [ ! "$?" = "0" ]; then
220
         echo $'SIP user could not be added. Ensure that extension numbers are in order and do no exceed 299'
220
         echo $'SIP user could not be added. Ensure that extension numbers are in order and do no exceed 299'
221
         if grep -q "install_xmpp" $COMPLETION_FILE; then
221
         if grep -q "install_xmpp" $COMPLETION_FILE; then
222
-            freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
222
+            ${PROJECT_NAME}-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
223
         fi
223
         fi
224
         if grep -q "Blog domain" $COMPLETION_FILE; then
224
         if grep -q "Blog domain" $COMPLETION_FILE; then
225
             if [ -f /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini ]; then
225
             if [ -f /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini ]; then
237
 #    if [ ! "$?" = "0" ]; then
237
 #    if [ ! "$?" = "0" ]; then
238
 #        echo 'Owncloud user could not be added'
238
 #        echo 'Owncloud user could not be added'
239
 #        if grep -q "install_xmpp" $COMPLETION_FILE; then
239
 #        if grep -q "install_xmpp" $COMPLETION_FILE; then
240
-#            freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
240
+#            ${PROJECT_NAME}-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
241
 #        fi
241
 #        fi
242
 #        if grep -q "Blog domain" $COMPLETION_FILE; then
242
 #        if grep -q "Blog domain" $COMPLETION_FILE; then
243
 #            if [ -f /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini ]; then
243
 #            if [ -f /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini ]; then
245
 #            fi
245
 #            fi
246
 #        fi
246
 #        fi
247
 #        if grep -q "install_sip" $COMPLETION_FILE; then
247
 #        if grep -q "install_sip" $COMPLETION_FILE; then
248
-#            freedombone-rmsipuser $MY_USERNAME
248
+#            ${PROJECT_NAME}-rmsipuser $MY_USERNAME
249
 #        fi
249
 #        fi
250
 #        userdel -r $MY_USERNAME
250
 #        userdel -r $MY_USERNAME
251
 #        export OC_PASS=""
251
 #        export OC_PASS=""
269
 echo ''
269
 echo ''
270
 echo "    scp -P $SSH_PORT -r $MY_USERNAME@$HOSTNAME:/home/$MY_USERNAME/.gnupg ~/"
270
 echo "    scp -P $SSH_PORT -r $MY_USERNAME@$HOSTNAME:/home/$MY_USERNAME/.gnupg ~/"
271
 echo ''
271
 echo ''
272
-echo $'They should also run freedombone-client on their system to ensure'
272
+echo $"They should also run ${PROJECT_NAME}-client on their system to ensure"
273
 echo $'the best security.'
273
 echo $'the best security.'
274
 
274
 
275
 exit 0
275
 exit 0

+ 1
- 1
src/freedombone-addxmpp 查看文件

39
 
39
 
40
 function show_help {
40
 function show_help {
41
     echo ''
41
     echo ''
42
-    echo $'freedombone-addxmpp -e [email address] -p [password]'
42
+    echo $"${PROJECT_NAME}-addxmpp -e [email address] -p [password]"
43
     echo ''
43
     echo ''
44
     exit 0
44
     exit 0
45
 }
45
 }

+ 1
- 1
src/freedombone-client 查看文件

477
 
477
 
478
 function show_help {
478
 function show_help {
479
     echo ''
479
     echo ''
480
-    echo $'freedombone-client'
480
+    echo $"${PROJECT_NAME}-client"
481
     echo ''
481
     echo ''
482
     exit 0
482
     exit 0
483
 }
483
 }

+ 2
- 2
src/freedombone-clientcert 查看文件

47
 
47
 
48
 function show_help {
48
 function show_help {
49
     echo ''
49
     echo ''
50
-    echo $'freedombone-clientcert -u [username]'
50
+    echo $"${PROJECT_NAME}-clientcert -u [username]"
51
     echo ''
51
     echo ''
52
     echo $'Creates email certificates for use with IMAP clients'
52
     echo $'Creates email certificates for use with IMAP clients'
53
     echo ''
53
     echo ''
103
 chmod 600 /etc/dovecot/passwd-file
103
 chmod 600 /etc/dovecot/passwd-file
104
 
104
 
105
 # create a user cert
105
 # create a user cert
106
-freedombone-addcert -h $USERNAME --nodh ""
106
+${PROJECT_NAME}-addcert -h $USERNAME --nodh ""
107
 
107
 
108
 if [ ! -f /etc/ssl/private/$USERNAME.key ]; then
108
 if [ ! -f /etc/ssl/private/$USERNAME.key ]; then
109
     echo $'User certificates were not created'
109
     echo $'User certificates were not created'

+ 4
- 4
src/freedombone-config 查看文件

112
 
112
 
113
 function show_help {
113
 function show_help {
114
     echo ''
114
     echo ''
115
-    echo $'freedombone-config -f [config filename] -m [min password length]'
115
+    echo $"${PROJECT_NAME}-config -f [config filename] -m [min password length]"
116
     echo ''
116
     echo ''
117
     echo $'Creates an inventory of remote backup locations'
117
     echo $'Creates an inventory of remote backup locations'
118
     echo ''
118
     echo ''
289
     REMOTE_SERVERS_LIST=/home/$MY_USERNAME/keyshareservers.txt
289
     REMOTE_SERVERS_LIST=/home/$MY_USERNAME/keyshareservers.txt
290
 
290
 
291
     # get a list of remote servers
291
     # get a list of remote servers
292
-    freedombone-remote -u $MY_USERNAME -l $REMOTE_SERVERS_LIST -t "Remote server"
292
+    ${PROJECT_NAME}-remote -u $MY_USERNAME -l $REMOTE_SERVERS_LIST -t "Remote server"
293
 
293
 
294
     if [ ! -f $REMOTE_SERVERS_LIST ]; then
294
     if [ ! -f $REMOTE_SERVERS_LIST ]; then
295
         dialog --title $"Encryption keys" --msgbox $'Error obtaining server list' 6 70
295
         dialog --title $"Encryption keys" --msgbox $'Error obtaining server list' 6 70
306
 
306
 
307
     # try to recover the key from the servers
307
     # try to recover the key from the servers
308
     apt-get -y install libgfshare-bin gnupg
308
     apt-get -y install libgfshare-bin gnupg
309
-    freedombone-recoverkey -u $MY_USERNAME -l $REMOTE_SERVERS_LIST
309
+    ${PROJECT_NAME}-recoverkey -u $MY_USERNAME -l $REMOTE_SERVERS_LIST
310
     if [ ! "$?" = "0" ]; then
310
     if [ ! "$?" = "0" ]; then
311
         dialog --title $"Encryption keys" --msgbox $'Your key could not be recovered' 6 70
311
         dialog --title $"Encryption keys" --msgbox $'Your key could not be recovered' 6 70
312
         return 3
312
         return 3
667
     #fi
667
     #fi
668
 
668
 
669
     if [[ $SYSTEM_TYPE == "$VARIANT_MESH_USER" ]]; then
669
     if [[ $SYSTEM_TYPE == "$VARIANT_MESH_USER" ]]; then
670
-        freedombone-client --essid $ESSID --channel $WIFI_CHANNEL
670
+        ${PROJECT_NAME}-client --essid $ESSID --channel $WIFI_CHANNEL
671
         if [ "$?" = "0" ]; then
671
         if [ "$?" = "0" ]; then
672
             clear
672
             clear
673
             echo ".---.                  .              .                   "
673
             echo ".---.                  .              .                   "

+ 19
- 19
src/freedombone-controlpanel 查看文件

33
 export TEXTDOMAIN=${PROJECT_NAME}-controlpanel
33
 export TEXTDOMAIN=${PROJECT_NAME}-controlpanel
34
 export TEXTDOMAINDIR="/usr/share/locale"
34
 export TEXTDOMAINDIR="/usr/share/locale"
35
 
35
 
36
-COMPLETION_FILE=$HOME/freedombone-completed.txt
36
+COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
37
 SELECTED_USERNAME=
37
 SELECTED_USERNAME=
38
 SIP_CONFIG_FILE=/etc/sipwitch.conf
38
 SIP_CONFIG_FILE=/etc/sipwitch.conf
39
 ADMIN_USER=
39
 ADMIN_USER=
85
     fi
85
     fi
86
     if [ ${#new_user_ssh_public_key} -lt 20 ]; then
86
     if [ ${#new_user_ssh_public_key} -lt 20 ]; then
87
         clear
87
         clear
88
-        freedombone-adduser "$new_user_username"
88
+        ${PROJECT_NAME}-adduser "$new_user_username"
89
         any_key
89
         any_key
90
     else
90
     else
91
         if [[ "$new_user_ssh_public_key" == "ssh-"* ]]; then
91
         if [[ "$new_user_ssh_public_key" == "ssh-"* ]]; then
92
             clear
92
             clear
93
-            freedombone-adduser "$new_user_username" "$new_user_ssh_public_key"
93
+            ${PROJECT_NAME}-adduser "$new_user_username" "$new_user_ssh_public_key"
94
             any_key
94
             any_key
95
         else
95
         else
96
             dialog --title $"ssh public key" \
96
             dialog --title $"ssh public key" \
153
         return
153
         return
154
     fi
154
     fi
155
     clear
155
     clear
156
-    freedombone-rmuser $SELECTED_USERNAME
156
+    ${PROJECT_NAME}-rmuser $SELECTED_USERNAME
157
     any_key
157
     any_key
158
 }
158
 }
159
 
159
 
173
                --msgbox $"Home directory not found" 6 40
173
                --msgbox $"Home directory not found" 6 40
174
         return
174
         return
175
     fi
175
     fi
176
-    freedombone-remote -u $ADMIN_USER
176
+    ${PROJECT_NAME}-remote -u $ADMIN_USER
177
 }
177
 }
178
 
178
 
179
 function change_password {
179
 function change_password {
291
         return
291
         return
292
     fi
292
     fi
293
 
293
 
294
-    freedombone-addlist -u $SELECTED_USERNAME -l "$LIST_NAME" \
294
+    ${PROJECT_NAME}-addlist -u $SELECTED_USERNAME -l "$LIST_NAME" \
295
                         -s "$LIST_SUBJECT" -e "$LIST_EMAIL"
295
                         -s "$LIST_SUBJECT" -e "$LIST_EMAIL"
296
     dialog --title $"Add mailing list" \
296
     dialog --title $"Add mailing list" \
297
            --msgbox $"$LIST_NAME list was added" 6 40
297
            --msgbox $"$LIST_NAME list was added" 6 40
334
         return
334
         return
335
     fi
335
     fi
336
 
336
 
337
-    freedombone-addemail -u $SELECTED_USERNAME -e "$RULE_EMAIL" \
337
+    ${PROJECT_NAME}-addemail -u $SELECTED_USERNAME -e "$RULE_EMAIL" \
338
                          -g "$RULE_FOLDER"
338
                          -g "$RULE_FOLDER"
339
     dialog --title $"Add email rule" \
339
     dialog --title $"Add email rule" \
340
            --msgbox $"Email rule for $RULE_EMAIL was added" 6 40
340
            --msgbox $"Email rule for $RULE_EMAIL was added" 6 40
372
         return
372
         return
373
     fi
373
     fi
374
     if [[ $BLOCK == "y"* || $BLOCK == "Y"* ]]; then
374
     if [[ $BLOCK == "y"* || $BLOCK == "Y"* ]]; then
375
-        freedombone-ignore -u $SELECTED_USERNAME -e "$BLOCK_EMAIL"
375
+        ${PROJECT_NAME}-ignore -u $SELECTED_USERNAME -e "$BLOCK_EMAIL"
376
         dialog --title $"Block an email" \
376
         dialog --title $"Block an email" \
377
                --msgbox "Email from $BLOCK_EMAIL to $SELECTED_USERNAME blocked" 6 40
377
                --msgbox "Email from $BLOCK_EMAIL to $SELECTED_USERNAME blocked" 6 40
378
     else
378
     else
379
-        freedombone-unignore -u $SELECTED_USERNAME -e "$BLOCK_EMAIL"
379
+        ${PROJECT_NAME}-unignore -u $SELECTED_USERNAME -e "$BLOCK_EMAIL"
380
         dialog --title $"Unblock an email" \
380
         dialog --title $"Unblock an email" \
381
                --msgbox "Email from $BLOCK_EMAIL to $SELECTED_USERNAME unblocked" 6 40
381
                --msgbox "Email from $BLOCK_EMAIL to $SELECTED_USERNAME unblocked" 6 40
382
     fi
382
     fi
409
         return
409
         return
410
     fi
410
     fi
411
     if [[ $BLOCK == "y"* || $BLOCK == "Y"* ]]; then
411
     if [[ $BLOCK == "y"* || $BLOCK == "Y"* ]]; then
412
-        freedombone-ignore -u $SELECTED_USERNAME -t "$BLOCK_SUBJECT"
412
+        ${PROJECT_NAME}-ignore -u $SELECTED_USERNAME -t "$BLOCK_SUBJECT"
413
         dialog --title $"Block an email" \
413
         dialog --title $"Block an email" \
414
                --msgbox "Email with subject $BLOCK_SUBJECT to $SELECTED_USERNAME blocked" 6 40
414
                --msgbox "Email with subject $BLOCK_SUBJECT to $SELECTED_USERNAME blocked" 6 40
415
     else
415
     else
416
-        freedombone-unignore -u $SELECTED_USERNAME -t "$BLOCK_SUBJECT"
416
+        ${PROJECT_NAME}-unignore -u $SELECTED_USERNAME -t "$BLOCK_SUBJECT"
417
         dialog --title $"Unblock an email" \
417
         dialog --title $"Unblock an email" \
418
                --msgbox "Email with subject $BLOCK_SUBJECT to $SELECTED_USERNAME unblocked" 6 40
418
                --msgbox "Email with subject $BLOCK_SUBJECT to $SELECTED_USERNAME unblocked" 6 40
419
     fi
419
     fi
427
     dialog --title $"USB Master Keydrive" \
427
     dialog --title $"USB Master Keydrive" \
428
            --msgbox $"Plug in a LUKS encrypted USB drive" 6 40
428
            --msgbox $"Plug in a LUKS encrypted USB drive" 6 40
429
     clear
429
     clear
430
-    freedombone-keydrive -u $SELECTED_USERNAME --master 'yes'
430
+    ${PROJECT_NAME}-keydrive -u $SELECTED_USERNAME --master 'yes'
431
     any_key
431
     any_key
432
 }
432
 }
433
 
433
 
439
     dialog --title $"USB Fragment Keydrive" \
439
     dialog --title $"USB Fragment Keydrive" \
440
            --msgbox $"Plug in a LUKS encrypted USB drive" 6 40
440
            --msgbox $"Plug in a LUKS encrypted USB drive" 6 40
441
     clear
441
     clear
442
-    freedombone-keydrive -u $SELECTED_USERNAME
442
+    ${PROJECT_NAME}-keydrive -u $SELECTED_USERNAME
443
     any_key
443
     any_key
444
 }
444
 }
445
 
445
 
510
     echo ''
510
     echo ''
511
     echo $'This may take a few seconds. Please wait...'
511
     echo $'This may take a few seconds. Please wait...'
512
     if [[ $logging == "no" ]]; then
512
     if [[ $logging == "no" ]]; then
513
-        freedombone-logging off
513
+        ${PROJECT_NAME}-logging off
514
     else
514
     else
515
-        freedombone-logging on
515
+        ${PROJECT_NAME}-logging on
516
     fi
516
     fi
517
 }
517
 }
518
 
518
 
525
     dialog --title "$restorestr $SELECTED_USERNAME" \
525
     dialog --title "$restorestr $SELECTED_USERNAME" \
526
            --msgbox $"Plug in your USB keydrive" 6 40
526
            --msgbox $"Plug in your USB keydrive" 6 40
527
     clear
527
     clear
528
-    freedombone-recoverkey -u $SELECTED_USERNAME
528
+    ${PROJECT_NAME}-recoverkey -u $SELECTED_USERNAME
529
     any_key
529
     any_key
530
 }
530
 }
531
 
531
 
532
 function security_settings {
532
 function security_settings {
533
-    freedombone-sec
533
+    ${PROJECT_NAME}-sec
534
     any_key
534
     any_key
535
 }
535
 }
536
 
536
 
559
               --msgbox $"Hubzilla install directory not found" 6 40
559
               --msgbox $"Hubzilla install directory not found" 6 40
560
        return
560
        return
561
     fi
561
     fi
562
-    freedombone-renew-cert -h $HUBZILLA_DOMAIN_NAME -p 'letsencrypt'
562
+    ${PROJECT_NAME}-renew-cert -h $HUBZILLA_DOMAIN_NAME -p 'letsencrypt'
563
     if [ ! "$?" = "0" ]; then
563
     if [ ! "$?" = "0" ]; then
564
         any_key
564
         any_key
565
     else
565
     else
655
     esac
655
     esac
656
 
656
 
657
     clear
657
     clear
658
-    freedombone-format $drive
658
+    ${PROJECT_NAME}-format $drive
659
     any_key
659
     any_key
660
 }
660
 }
661
 
661
 

+ 1
- 1
src/freedombone-deploy 查看文件

157
 fi
157
 fi
158
 
158
 
159
 get_passwords_from_readme /home/$DEFAULT_IMAGE_USERNAME/README
159
 get_passwords_from_readme /home/$DEFAULT_IMAGE_USERNAME/README
160
-#freedombone-adduser $MY_USERNAME > ~/setup.txt
160
+#${PROJECT_NAME}-adduser $MY_USERNAME > ~/setup.txt
161
 #set_admin_user
161
 #set_admin_user
162
 #create_backup_gpg_key
162
 #create_backup_gpg_key
163
 #regenerate_ssh_host_keys
163
 #regenerate_ssh_host_keys

+ 1
- 1
src/freedombone-ignore 查看文件

41
 
41
 
42
 function show_help {
42
 function show_help {
43
     echo ''
43
     echo ''
44
-    echo $'freedombone-ignore -u [username] -e [mail address] -t [text in subject line]'
44
+    echo $"${PROJECT_NAME}-ignore -u [username] -e [mail address] -t [text in subject line]"
45
     echo ''
45
     echo ''
46
     exit 0
46
     exit 0
47
 }
47
 }

+ 1
- 1
src/freedombone-image 查看文件

167
 done
167
 done
168
 
168
 
169
 if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
169
 if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
170
-    freedombone-config --minimal "$MINIMAL_INSTALL"
170
+    ${PROJECT_NAME}-config --minimal "$MINIMAL_INSTALL"
171
     if [ -f freedombone.cfg ]; then
171
     if [ -f freedombone.cfg ]; then
172
         CONFIG_FILENAME=freedombone.cfg
172
         CONFIG_FILENAME=freedombone.cfg
173
         DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}')
173
         DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}')

+ 4
- 4
src/freedombone-keydrive 查看文件

43
 
43
 
44
 function show_help {
44
 function show_help {
45
     echo ''
45
     echo ''
46
-    echo $'freedombone-keydrive -u [username] -d [device, eg. sdb] --master [yes/no] -n [no of fragments] --format [yes/no]'
46
+    echo $"${PROJECT_NAME}-keydrive -u [username] -d [device, eg. sdb] --master [yes/no] -n [no of fragments] --format [yes/no]"
47
     echo ''
47
     echo ''
48
     exit 0
48
     exit 0
49
 }
49
 }
109
 
109
 
110
 # optionally format the drive
110
 # optionally format the drive
111
 if [[ $FORMAT == "yes" ]]; then
111
 if [[ $FORMAT == "yes" ]]; then
112
-  freedombone-format ${USB_DRIVE::-1}
112
+  ${PROJECT_NAME}-format ${USB_DRIVE::-1}
113
   if [ ! "$?" = "0" ]; then
113
   if [ ! "$?" = "0" ]; then
114
       exit 36823
114
       exit 36823
115
   fi
115
   fi
190
 LOCAL_FRAGMENTS_DIR=/home/$MY_USERNAME/.gnupg_fragments
190
 LOCAL_FRAGMENTS_DIR=/home/$MY_USERNAME/.gnupg_fragments
191
 
191
 
192
 if [ ! -d $LOCAL_FRAGMENTS_DIR ]; then
192
 if [ ! -d $LOCAL_FRAGMENTS_DIR ]; then
193
-    freedombone-splitkey -u $MY_USERNAME -n $KEY_FRAGMENTS
193
+    ${PROJECT_NAME}-splitkey -u $MY_USERNAME -n $KEY_FRAGMENTS
194
 fi
194
 fi
195
 
195
 
196
 cd $LOCAL_FRAGMENTS_DIR
196
 cd $LOCAL_FRAGMENTS_DIR
199
     no_of_local_shares=0
199
     no_of_local_shares=0
200
 fi
200
 fi
201
 if (( no_of_local_shares < 3 )); then
201
 if (( no_of_local_shares < 3 )); then
202
-    freedombone-splitkey -u $MY_USERNAME -n $KEY_FRAGMENTS
202
+    ${PROJECT_NAME}-splitkey -u $MY_USERNAME -n $KEY_FRAGMENTS
203
     cd $LOCAL_FRAGMENTS_DIR
203
     cd $LOCAL_FRAGMENTS_DIR
204
     no_of_local_shares=$(ls -afq keyshare.asc.* | wc -l)
204
     no_of_local_shares=$(ls -afq keyshare.asc.* | wc -l)
205
     if [ ! "$?" = "0" ]; then
205
     if [ ! "$?" = "0" ]; then

+ 1
- 1
src/freedombone-mesh 查看文件

232
 
232
 
233
 if [[ $SERVER_INSTALLATION == "no" ]]; then
233
 if [[ $SERVER_INSTALLATION == "no" ]]; then
234
     if [ ! -f /usr/bin/batman ]; then
234
     if [ ! -f /usr/bin/batman ]; then
235
-        freedombone-client
235
+        ${PROJECT_NAME}-client
236
     fi
236
     fi
237
 fi
237
 fi
238
 
238
 

+ 1
- 1
src/freedombone-meshweb 查看文件

341
 
341
 
342
 if [[ $SERVER_INSTALLATION == "no" ]]; then
342
 if [[ $SERVER_INSTALLATION == "no" ]]; then
343
     if [ ! -f /usr/bin/batman ]; then
343
     if [ ! -f /usr/bin/batman ]; then
344
-        freedombone-client
344
+        ${PROJECT_NAME}-client
345
     fi
345
     fi
346
 fi
346
 fi
347
 
347
 

+ 1
- 1
src/freedombone-recoverkey 查看文件

39
 
39
 
40
 function show_help {
40
 function show_help {
41
     echo ''
41
     echo ''
42
-    echo $'freedombone-recoverkey -u [username] -d [drive]'
42
+    echo $"${PROJECT_NAME}-recoverkey -u [username] -d [drive]"
43
     echo $'                       -l [friends servers list filename]'
43
     echo $'                       -l [friends servers list filename]'
44
     echo ''
44
     echo ''
45
     exit 0
45
     exit 0

+ 1
- 1
src/freedombone-remote 查看文件

57
 
57
 
58
 function show_help {
58
 function show_help {
59
   echo ''
59
   echo ''
60
-  echo $'freedombone-remote -u [username] -l [backup list filename] -m [min password length]'
60
+  echo $"${PROJECT_NAME}-remote -u [username] -l [backup list filename] -m [min password length]"
61
   echo ''
61
   echo ''
62
   echo $'Creates an inventory of remote backup locations'
62
   echo $'Creates an inventory of remote backup locations'
63
   echo ''
63
   echo ''

+ 4
- 4
src/freedombone-renew-cert 查看文件

40
 
40
 
41
 function show_help {
41
 function show_help {
42
     echo ''
42
     echo ''
43
-    echo $'freedombone-renew-cert -h [hostname] -p [provider]'
43
+    echo $"${PROJECT_NAME}-renew-cert -h [hostname] -p [provider]"
44
     echo ''
44
     echo ''
45
     echo $'Makes it easier to renew a ssl/tls certificate for a website'
45
     echo $'Makes it easier to renew a ssl/tls certificate for a website'
46
     echo ''
46
     echo ''
54
 function renew_letsencrypt {
54
 function renew_letsencrypt {
55
     if [ ! -f /etc/letsencrypt/live/${HOSTNAME}/fullchain.pem ]; then
55
     if [ ! -f /etc/letsencrypt/live/${HOSTNAME}/fullchain.pem ]; then
56
         echo $"Adding Let's Encrypt certificate"
56
         echo $"Adding Let's Encrypt certificate"
57
-        freedombone-addcert -e $HOSTNAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
57
+        ${PROJECT_NAME}-addcert -e $HOSTNAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
58
         if [ ! "$?" = "0" ]; then
58
         if [ ! "$?" = "0" ]; then
59
             echo $"Unable to add Let's encrypt certificate"
59
             echo $"Unable to add Let's encrypt certificate"
60
             exit 6328
60
             exit 6328
113
 
113
 
114
         # add it to mycerts
114
         # add it to mycerts
115
         cp /etc/ssl/certs/$HOSTNAME.bundle.crt /etc/ssl/mycerts
115
         cp /etc/ssl/certs/$HOSTNAME.bundle.crt /etc/ssl/mycerts
116
-        cat /etc/ssl/mycerts/*.crt > /etc/ssl/freedombone-bundle.crt
117
-        tar -czvf /etc/ssl/freedombone-certs.tar.gz /etc/ssl/mycerts/*.crt
116
+        cat /etc/ssl/mycerts/*.crt > /etc/ssl/${PROJECT_NAME}-bundle.crt
117
+        tar -czvf /etc/ssl/${PROJECT_NAME}-certs.tar.gz /etc/ssl/mycerts/*.crt
118
 
118
 
119
         # create backups
119
         # create backups
120
         if [ ! -d /etc/ssl/backups ]; then
120
         if [ ! -d /etc/ssl/backups ]; then

+ 1
- 1
src/freedombone-rmemail 查看文件

38
 
38
 
39
 function show_help {
39
 function show_help {
40
     echo ''
40
     echo ''
41
-    echo $'freedombone-rmemail -u [username] -e [email address]'
41
+    echo $"${PROJECT_NAME}-rmemail -u [username] -e [email address]"
42
     echo ''
42
     echo ''
43
     exit 0
43
     exit 0
44
 }
44
 }

+ 1
- 1
src/freedombone-rmlist 查看文件

40
 
40
 
41
 function show_help {
41
 function show_help {
42
     echo ''
42
     echo ''
43
-    echo $'freedombone-rmlist -u [username] -l [mailing list name] -e [list email address]'
43
+    echo $"${PROJECT_NAME}-rmlist -u [username] -l [mailing list name] -e [list email address]"
44
     echo ''
44
     echo ''
45
     exit 0
45
     exit 0
46
 }
46
 }

+ 1
- 1
src/freedombone-rmsipuser 查看文件

40
 
40
 
41
 function show_help {
41
 function show_help {
42
     echo ''
42
     echo ''
43
-    echo $'freedombone-rmsipuser [username]'
43
+    echo $"${PROJECT_NAME}-rmsipuser [username]"
44
     echo ''
44
     echo ''
45
     exit 0
45
     exit 0
46
 }
46
 }

+ 3
- 3
src/freedombone-rmuser 查看文件

6
 export TEXTDOMAINDIR="/usr/share/locale"
6
 export TEXTDOMAINDIR="/usr/share/locale"
7
 
7
 
8
 MY_USERNAME=$1
8
 MY_USERNAME=$1
9
-COMPLETION_FILE=$HOME/freedombone-completed.txt
9
+COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
10
 
10
 
11
 if [ ! $MY_USERNAME ]; then
11
 if [ ! $MY_USERNAME ]; then
12
     echo $'Please specify a username to remove'
12
     echo $'Please specify a username to remove'
47
 fi
47
 fi
48
 
48
 
49
 if grep -q "install_xmpp" $COMPLETION_FILE; then
49
 if grep -q "install_xmpp" $COMPLETION_FILE; then
50
-    freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
50
+    ${PROJECT_NAME}-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
51
 fi
51
 fi
52
 
52
 
53
 if grep -q "Blog domain" $COMPLETION_FILE; then
53
 if grep -q "Blog domain" $COMPLETION_FILE; then
58
 fi
58
 fi
59
 
59
 
60
 if grep -q "install_sip" $COMPLETION_FILE; then
60
 if grep -q "install_sip" $COMPLETION_FILE; then
61
-    freedombone-rmsipuser $MY_USERNAME
61
+    ${PROJECT_NAME}-rmsipuser $MY_USERNAME
62
 fi
62
 fi
63
 
63
 
64
 #if grep -q "install_owncloud" $COMPLETION_FILE; then
64
 #if grep -q "install_owncloud" $COMPLETION_FILE; then

+ 1
- 1
src/freedombone-rmxmpp 查看文件

38
 
38
 
39
 function show_help {
39
 function show_help {
40
     echo ''
40
     echo ''
41
-    echo $'freedombone-rmxmpp -e [email address]'
41
+    echo $"${PROJECT_NAME}-rmxmpp -e [email address]"
42
     echo ''
42
     echo ''
43
     exit 0
43
     exit 0
44
 }
44
 }

+ 1
- 1
src/freedombone-splitkey 查看文件

46
 
46
 
47
 function show_help {
47
 function show_help {
48
     echo ''
48
     echo ''
49
-    echo $'freedombone-splitkey -u [username] -n [number of fragments] -e [email address] --fullname [Full name]'
49
+    echo $"${PROJECT_NAME}-splitkey -u [username] -n [number of fragments] -e [email address] --fullname [Full name]"
50
     echo ''
50
     echo ''
51
     exit 0
51
     exit 0
52
 }
52
 }

+ 1
- 1
src/freedombone-unignore 查看文件

41
 
41
 
42
 function show_help {
42
 function show_help {
43
     echo ''
43
     echo ''
44
-    echo $'freedombone-unignore -u [username] -e [mail address] -t [text in subject line]'
44
+    echo $"${PROJECT_NAME}-unignore -u [username] -e [mail address] -t [text in subject line]"
45
     echo ''
45
     echo ''
46
     exit 0
46
     exit 0
47
 }
47
 }

+ 1
- 1
src/freedombone-xmpp-pass 查看文件

38
 
38
 
39
 function show_help {
39
 function show_help {
40
     echo ''
40
     echo ''
41
-    echo $'freedombone-xmpp-pass -e [email address]'
41
+    echo $"${PROJECT_NAME}-xmpp-pass -e [email address]"
42
     echo ''
42
     echo ''
43
     exit 0
43
     exit 0
44
 }
44
 }

+ 3
- 3
src/zeronetavahi 查看文件

50
     fi
50
     fi
51
 fi
51
 fi
52
 
52
 
53
-BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs
54
-FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
55
-TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
53
+BLOGS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-blogs
54
+FORUM_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-fora
55
+TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users
56
 ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
56
 ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
57
 ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
57
 ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
58
 
58