Browse Source

Change email address

stockholm
Bob Mottram 2 years ago
parent
commit
557b25b4a8
100 changed files with 498 additions and 498 deletions
  1. 1
    1
      doc/EN/backups.org
  2. 1
    1
      doc/EN/code.org
  3. 1
    1
      doc/EN/controlpanel.org
  4. 1
    1
      doc/EN/devguide.org
  5. 1
    1
      doc/EN/faq.org
  6. 1
    1
      doc/EN/homeserver.org
  7. 1
    1
      doc/EN/index.org
  8. 1
    1
      doc/EN/installation.org
  9. 1
    1
      doc/EN/mesh.org
  10. 1
    1
      doc/EN/mirrors.org
  11. 1
    1
      doc/EN/mobile.org
  12. 1
    1
      doc/EN/related.org
  13. 2
    2
      doc/EN/support.org
  14. 1
    1
      doc/EN/usage.org
  15. 1
    1
      doc/EN/usage_email.org
  16. 1
    1
      doc/EN/variants.org
  17. 1
    1
      src/freedombone
  18. 1
    1
      src/freedombone-addcert
  19. 49
    49
      src/freedombone-addemail
  20. 45
    45
      src/freedombone-addlist
  21. 1
    1
      src/freedombone-addremove
  22. 50
    50
      src/freedombone-addsipuser
  23. 1
    1
      src/freedombone-adduser
  24. 1
    1
      src/freedombone-addxmpp
  25. 1
    1
      src/freedombone-app-batman
  26. 1
    1
      src/freedombone-app-dlna
  27. 1
    1
      src/freedombone-app-dokuwiki
  28. 1
    1
      src/freedombone-app-emacs
  29. 1
    1
      src/freedombone-app-gnusocial
  30. 1
    1
      src/freedombone-app-gogs
  31. 1
    1
      src/freedombone-app-htmly
  32. 1
    1
      src/freedombone-app-hubzilla
  33. 1
    1
      src/freedombone-app-ipfs
  34. 1
    1
      src/freedombone-app-irc
  35. 1
    1
      src/freedombone-app-librevault
  36. 1
    1
      src/freedombone-app-mediagoblin
  37. 1
    1
      src/freedombone-app-mumble
  38. 1
    1
      src/freedombone-app-pelican
  39. 1
    1
      src/freedombone-app-pihole
  40. 1
    1
      src/freedombone-app-rss
  41. 1
    1
      src/freedombone-app-searx
  42. 1
    1
      src/freedombone-app-sip
  43. 1
    1
      src/freedombone-app-syncthing
  44. 1
    1
      src/freedombone-app-tahoelafs
  45. 1
    1
      src/freedombone-app-tox
  46. 1
    1
      src/freedombone-app-vim
  47. 1
    1
      src/freedombone-app-vpn
  48. 1
    1
      src/freedombone-app-webmail
  49. 1
    1
      src/freedombone-app-xmpp
  50. 1
    1
      src/freedombone-app-zeronet
  51. 1
    1
      src/freedombone-archive-mail
  52. 1
    1
      src/freedombone-backup-local
  53. 1
    1
      src/freedombone-backup-remote
  54. 1
    1
      src/freedombone-base-email
  55. 1
    1
      src/freedombone-base-tripwire
  56. 1
    1
      src/freedombone-client
  57. 1
    1
      src/freedombone-clientcert
  58. 1
    1
      src/freedombone-config
  59. 1
    1
      src/freedombone-controlpanel
  60. 1
    1
      src/freedombone-controlpanel-user
  61. 77
    77
      src/freedombone-dhparam
  62. 1
    1
      src/freedombone-encrypt-mail
  63. 1
    1
      src/freedombone-format
  64. 1
    1
      src/freedombone-freedns
  65. 1
    1
      src/freedombone-ignore
  66. 1
    1
      src/freedombone-image
  67. 1
    1
      src/freedombone-keydrive
  68. 1
    1
      src/freedombone-logging
  69. 1
    1
      src/freedombone-mesh
  70. 1
    1
      src/freedombone-mesh-batman
  71. 1
    1
      src/freedombone-mirrors
  72. 1
    1
      src/freedombone-pin-cert
  73. 1
    1
      src/freedombone-recoverkey
  74. 178
    178
      src/freedombone-remote
  75. 1
    1
      src/freedombone-renew-cert
  76. 1
    1
      src/freedombone-repair-database
  77. 1
    1
      src/freedombone-restore-local
  78. 1
    1
      src/freedombone-restore-remote
  79. 1
    1
      src/freedombone-rmemail
  80. 1
    1
      src/freedombone-rmlist
  81. 1
    1
      src/freedombone-rmsipuser
  82. 1
    1
      src/freedombone-rmuser
  83. 1
    1
      src/freedombone-rmxmpp
  84. 1
    1
      src/freedombone-sec
  85. 5
    5
      src/freedombone-sipfreeext
  86. 1
    1
      src/freedombone-splitkey
  87. 1
    1
      src/freedombone-syncthing
  88. 1
    1
      src/freedombone-tests
  89. 1
    1
      src/freedombone-unignore
  90. 1
    1
      src/freedombone-upgrade
  91. 1
    1
      src/freedombone-utils-avahi
  92. 1
    1
      src/freedombone-utils-backup
  93. 1
    1
      src/freedombone-utils-cmake
  94. 1
    1
      src/freedombone-utils-config
  95. 1
    1
      src/freedombone-utils-cron
  96. 1
    1
      src/freedombone-utils-cryptopp
  97. 1
    1
      src/freedombone-utils-database
  98. 1
    1
      src/freedombone-utils-depends
  99. 1
    1
      src/freedombone-utils-dns
  100. 0
    0
      src/freedombone-utils-ffmpeg

+ 1
- 1
doc/EN/backups.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/code.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/controlpanel.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Control Panel
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/devguide.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/faq.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Frequently asked questions
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/homeserver.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/index.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/installation.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/mesh.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/mirrors.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Mirroring git repositories
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/mobile.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/related.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 2
- 2
doc/EN/support.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil
@@ -26,7 +26,7 @@ This site can also be accessed via a Tor browser at *http://2tp3f6vtvhkqpuc6.oni
26 26
 
27 27
 *PGP/GPG Fingerprint:* D538 1159 CD7A 2F80 2F06 ABA0 0452 CC7C EA98 2E38
28 28
 
29
-*XMPP:* bob@robotics.uk.to with OTR
29
+*XMPP:* bob@freedombone.net with OMEMO or OTR
30 30
 
31 31
 *Tox:* 82DD53788AB400843BC75EA96B62DD6C76D2B13E476B995B13C49920A3C8FD32E5365A82FA83
32 32
 

+ 1
- 1
doc/EN/usage.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/usage_email.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
doc/EN/variants.org View File

@@ -1,6 +1,6 @@
1 1
 #+TITLE:
2 2
 #+AUTHOR: Bob Mottram
3
-#+EMAIL: bob@robotics.uk.to
3
+#+EMAIL: bob@freedombone.net
4 4
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
5 5
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
6 6
 #+OPTIONS: ^:nil toc:nil

+ 1
- 1
src/freedombone View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-addcert View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 49
- 49
src/freedombone-addemail View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by
@@ -52,32 +52,32 @@ do
52 52
     key="$1"
53 53
 
54 54
     case $key in
55
-	-h|--help)
56
-	    show_help
57
-	    ;;
58
-	-u|--user)
59
-	    shift
60
-	    MYUSERNAME="$1"
61
-	    ;;
62
-	-e|--email)
63
-	    shift
64
-	    EMAILADDRESS="$1"
65
-	    ;;
66
-	-s|--subject)
67
-	    shift
68
-	    SUBJECT_TEXT="$1"
69
-	    ;;
70
-	-g|--group)
71
-	    shift
72
-	    GROUP_NAME="$1"
73
-	    ;;
74
-	-p|--public)
75
-	    shift
76
-	    PUBLIC="$1"
77
-	    ;;
78
-	*)
79
-	    # unknown option
80
-	    ;;
55
+    -h|--help)
56
+        show_help
57
+        ;;
58
+    -u|--user)
59
+        shift
60
+        MYUSERNAME="$1"
61
+        ;;
62
+    -e|--email)
63
+        shift
64
+        EMAILADDRESS="$1"
65
+        ;;
66
+    -s|--subject)
67
+        shift
68
+        SUBJECT_TEXT="$1"
69
+        ;;
70
+    -g|--group)
71
+        shift
72
+        GROUP_NAME="$1"
73
+        ;;
74
+    -p|--public)
75
+        shift
76
+        PUBLIC="$1"
77
+        ;;
78
+    *)
79
+        # unknown option
80
+        ;;
81 81
     esac
82 82
     shift
83 83
 done
@@ -88,7 +88,7 @@ fi
88 88
 
89 89
 if [ ${#EMAILADDRESS} -lt 2 ]; then
90 90
     if [ ${#SUBJECT_TEXT} -lt 2 ]; then
91
-	show_help
91
+    show_help
92 92
     fi
93 93
 fi
94 94
 
@@ -112,26 +112,26 @@ fi
112 112
 chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
113 113
 if ! grep -q "$proc_comment" $PM; then
114 114
     if [[ $PUBLIC != "yes" ]]; then
115
-	# private emails go after the encryption stage
116
-	echo '' >> $PM
117
-	echo "$proc_comment" >> $PM
118
-	echo ":0" >> $PM
119
-	echo "$proc_rule" >> $PM
120
-	echo "$LISTDIR/new" >> $PM
121
-	echo "# End of rule" >> $PM
115
+    # private emails go after the encryption stage
116
+    echo '' >> $PM
117
+    echo "$proc_comment" >> $PM
118
+    echo ":0" >> $PM
119
+    echo "$proc_rule" >> $PM
120
+    echo "$LISTDIR/new" >> $PM
121
+    echo "# End of rule" >> $PM
122
+    else
123
+    # public emails are copied before the encryption stage
124
+    if ! grep -q '# encrypt' $PM; then
125
+        echo '' >> $PM
126
+        echo "$proc_comment" >> $PM
127
+        echo ":0" >> $PM
128
+        echo "$proc_rule" >> $PM
129
+        echo "$LISTDIR/new" >> $PM
130
+        echo "# End of rule" >> $PM
122 131
     else
123
-	# public emails are copied before the encryption stage
124
-	if ! grep -q '# encrypt' $PM; then
125
-	    echo '' >> $PM
126
-	    echo "$proc_comment" >> $PM
127
-	    echo ":0" >> $PM
128
-	    echo "$proc_rule" >> $PM
129
-	    echo "$LISTDIR/new" >> $PM
130
-	    echo "# End of rule" >> $PM
131
-	else
132
-	    filter=$(echo "$proc_comment\n:0\n${proc_rule}\n$LISTDIR/new\n# End of rule\n")
133
-	    sed -i "/# encrypt/i ${filter}" $PM
134
-	fi
132
+        filter=$(echo "$proc_comment\n:0\n${proc_rule}\n$LISTDIR/new\n# End of rule\n")
133
+        sed -i "/# encrypt/i ${filter}" $PM
134
+    fi
135 135
     fi
136 136
     chown $MYUSERNAME:$MYUSERNAME $PM
137 137
 fi
@@ -150,8 +150,8 @@ fi
150 150
 MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)
151 151
 if [[ $MUTT_MAILBOXES != *$GROUP_NAME* ]]; then
152 152
     if ! grep -q "=$GROUP_NAME" $MUTTRC; then
153
-	sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$GROUP_NAME|g" $MUTTRC
154
-	chown $MYUSERNAME:$MYUSERNAME $MUTTRC
153
+    sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$GROUP_NAME|g" $MUTTRC
154
+    chown $MYUSERNAME:$MYUSERNAME $MUTTRC
155 155
     fi
156 156
 fi
157 157
 

+ 45
- 45
src/freedombone-addlist View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by
@@ -52,32 +52,32 @@ do
52 52
     key="$1"
53 53
 
54 54
     case $key in
55
-	-h|--help)
56
-	    show_help
57
-	    ;;
58
-	-u|--user)
59
-	    shift
60
-	    MYUSERNAME="$1"
61
-	    ;;
62
-	-l|--list)
63
-	    shift
64
-	    MAILINGLIST="$1"
65
-	    ;;
66
-	-s|--subject)
67
-	    shift
68
-	    SUBJECTTAG="$1"
69
-	    ;;
70
-	-e|--email)
71
-	    shift
72
-	    LIST_ADDRESS="$1"
73
-	    ;;
74
-	-p|--public)
75
-	    shift
76
-	    PUBLIC="$1"
77
-	    ;;
78
-	*)
79
-	    # unknown option
80
-	    ;;
55
+    -h|--help)
56
+        show_help
57
+        ;;
58
+    -u|--user)
59
+        shift
60
+        MYUSERNAME="$1"
61
+        ;;
62
+    -l|--list)
63
+        shift
64
+        MAILINGLIST="$1"
65
+        ;;
66
+    -s|--subject)
67
+        shift
68
+        SUBJECTTAG="$1"
69
+        ;;
70
+    -e|--email)
71
+        shift
72
+        LIST_ADDRESS="$1"
73
+        ;;
74
+    -p|--public)
75
+        shift
76
+        PUBLIC="$1"
77
+        ;;
78
+    *)
79
+        # unknown option
80
+        ;;
81 81
     esac
82 82
     shift
83 83
 done
@@ -110,33 +110,33 @@ chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
110 110
 if [ ${#SUBJECTTAG} -gt 0 ]; then
111 111
     # use the subject tag
112 112
     if ! grep -q "Subject:.*()\[$SUBJECTTAG\]" $PM; then
113
-	if [[ $PUBLIC != "yes" ]]; then
114
-	    # private emails go after the encryption stage
115
-	    filter="
113
+    if [[ $PUBLIC != "yes" ]]; then
114
+        # private emails go after the encryption stage
115
+        filter="
116 116
 # Email rule for $MAILINGLIST subject [$SUBJECTTAG]
117 117
 :0
118 118
   * ^Subject:.*()\[$SUBJECTTAG\]
119 119
 $LISTDIR/new
120 120
 # End of rule
121 121
 "
122
-	    echo "$filter" >> $PM
123
-	else
124
-	    # public emails are copied before hte encryption stage
125
-	    if ! grep -q '# encrypt' $PM; then
126
-		filter="
122
+        echo "$filter" >> $PM
123
+    else
124
+        # public emails are copied before hte encryption stage
125
+        if ! grep -q '# encrypt' $PM; then
126
+        filter="
127 127
 # Email rule for $MAILINGLIST subject [$SUBJECTTAG]
128 128
 :0
129 129
   * ^Subject:.*()\[$SUBJECTTAG\]
130 130
 $LISTDIR/new
131 131
 # End of rule
132 132
 "
133
-		echo "$filter" >> $PM
134
-	    else
135
-		filter=$(echo "# Email rule for $MAILINGLIST subject [$SUBJECTTAG]\n:0\n  * ^Subject:.*()\\\[$SUBJECTTAG\\\]\n$LISTDIR/new\n# End of rule\n")
136
-		sed -i "/# encrypt/i ${filter}" $PM
137
-	    fi
138
-	fi
139
-	chown $MYUSERNAME:$MYUSERNAME $PM
133
+        echo "$filter" >> $PM
134
+        else
135
+        filter=$(echo "# Email rule for $MAILINGLIST subject [$SUBJECTTAG]\n:0\n  * ^Subject:.*()\\\[$SUBJECTTAG\\\]\n$LISTDIR/new\n# End of rule\n")
136
+        sed -i "/# encrypt/i ${filter}" $PM
137
+        fi
138
+    fi
139
+    chown $MYUSERNAME:$MYUSERNAME $PM
140 140
     fi
141 141
 else
142 142
     exit $(${PROJECT_NAME}-addemail -u $MYUSERNAME -e $LIST_ADDRESS -g $MAILINGLIST --public $PUBLIC)
@@ -156,15 +156,15 @@ fi
156 156
 MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)
157 157
 if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then
158 158
     if ! grep -q "=$MAILINGLIST" $MUTTRC; then
159
-	sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC
160
-	chown $MYUSERNAME:$MYUSERNAME $MUTTRC
159
+    sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC
160
+    chown $MYUSERNAME:$MYUSERNAME $MUTTRC
161 161
     fi
162 162
 fi
163 163
 
164 164
 if [ $LIST_ADDRESS ]; then
165 165
     sed -i "s|unsubscribe $LIST_ADDRESS|subscribe $LIST_ADDRESS|g" $MUTTRC
166 166
     if ! grep -q "subscribe $LIST_ADDRESS" $MUTTRC; then
167
-	echo "subscribe $LIST_ADDRESS" >> $MUTTRC
167
+    echo "subscribe $LIST_ADDRESS" >> $MUTTRC
168 168
     fi
169 169
 fi
170 170
 

+ 1
- 1
src/freedombone-addremove View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 50
- 50
src/freedombone-addsipuser View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by
@@ -50,10 +50,10 @@ function show_help {
50 50
 function sip_user_exists {
51 51
     IFS=''
52 52
     while read line; do
53
-	if [[ "$line" == *"<user id=\"$MY_USERNAME\">" ]]; then
54
-	    USER_EXISTS="yes"
55
-	    return
56
-	fi
53
+    if [[ "$line" == *"<user id=\"$MY_USERNAME\">" ]]; then
54
+        USER_EXISTS="yes"
55
+        return
56
+    fi
57 57
     done < $CONFIG_FILE
58 58
 }
59 59
 
@@ -61,28 +61,28 @@ function update_sip_user {
61 61
     USER_FOUND=
62 62
     NEW_CONFIG_FILE="${CONFIG_FILE}.new"
63 63
     if [ -f $NEW_CONFIG_FILE ]; then
64
-	rm -f $NEW_CONFIG_FILE
64
+    rm -f $NEW_CONFIG_FILE
65 65
     fi
66 66
     touch $NEW_CONFIG_FILE
67 67
     IFS=''
68 68
     while read line; do
69
-	if [ ! $USER_FOUND ]; then
70
-	    if [[ "$line" == *"<user id=\"$MY_USERNAME\">" ]]; then
71
-		USER_FOUND="yes"
72
-	    fi
73
-	else
74
-	    if [[ "$line" == *"<extension>"* ]]; then
75
-		line="      <extension>$EXTENSION</extension>"
76
-	    fi
77
-	    if [[ "$line" == *"<secret>"* ]]; then
78
-		line="      <secret>$PASSWORD</secret>"
79
-	    fi
80
-	    if [[ "$line" == *"<display>"* ]]; then
81
-		line="      <display>$MY_USERNAME $EXTENSION</display>"
82
-		USER_FOUND=
83
-	    fi
84
-	fi
85
-	echo $line >> $NEW_CONFIG_FILE
69
+    if [ ! $USER_FOUND ]; then
70
+        if [[ "$line" == *"<user id=\"$MY_USERNAME\">" ]]; then
71
+        USER_FOUND="yes"
72
+        fi
73
+    else
74
+        if [[ "$line" == *"<extension>"* ]]; then
75
+        line="      <extension>$EXTENSION</extension>"
76
+        fi
77
+        if [[ "$line" == *"<secret>"* ]]; then
78
+        line="      <secret>$PASSWORD</secret>"
79
+        fi
80
+        if [[ "$line" == *"<display>"* ]]; then
81
+        line="      <display>$MY_USERNAME $EXTENSION</display>"
82
+        USER_FOUND=
83
+        fi
84
+    fi
85
+    echo $line >> $NEW_CONFIG_FILE
86 86
     done < $CONFIG_FILE
87 87
     mv $NEW_CONFIG_FILE $CONFIG_FILE
88 88
 }
@@ -90,19 +90,19 @@ function update_sip_user {
90 90
 function add_sip_user {
91 91
     NEW_CONFIG_FILE="${CONFIG_FILE}.new"
92 92
     if [ -f $NEW_CONFIG_FILE ]; then
93
-	rm -f $NEW_CONFIG_FILE
93
+    rm -f $NEW_CONFIG_FILE
94 94
     fi
95 95
     touch $NEW_CONFIG_FILE
96 96
     IFS=''
97 97
     while read line; do
98
-	if [[ "$line" == *'</provision>' ]]; then
99
-	    echo "    <user id=\"$MY_USERNAME\">" >> $NEW_CONFIG_FILE
100
-	    echo "      <extension>$EXTENSION</extension>" >> $NEW_CONFIG_FILE
101
-	    echo "      <secret>$PASSWORD</secret>" >> $NEW_CONFIG_FILE
102
-	    echo "      <display>$MY_USERNAME $EXTENSION</display>" >> $NEW_CONFIG_FILE
103
-	    echo '    </user>' >> $NEW_CONFIG_FILE
104
-	fi
105
-	echo $line >> $NEW_CONFIG_FILE
98
+    if [[ "$line" == *'</provision>' ]]; then
99
+        echo "    <user id=\"$MY_USERNAME\">" >> $NEW_CONFIG_FILE
100
+        echo "      <extension>$EXTENSION</extension>" >> $NEW_CONFIG_FILE
101
+        echo "      <secret>$PASSWORD</secret>" >> $NEW_CONFIG_FILE
102
+        echo "      <display>$MY_USERNAME $EXTENSION</display>" >> $NEW_CONFIG_FILE
103
+        echo '    </user>' >> $NEW_CONFIG_FILE
104
+    fi
105
+    echo $line >> $NEW_CONFIG_FILE
106 106
     done < $CONFIG_FILE
107 107
     mv $NEW_CONFIG_FILE $CONFIG_FILE
108 108
     usermod -aG sipwitch $MY_USERNAME
@@ -113,24 +113,24 @@ do
113 113
     key="$1"
114 114
 
115 115
     case $key in
116
-	-h|--help)
117
-	    show_help
118
-	    ;;
119
-	-u|--user)
120
-	    shift
121
-	    MY_USERNAME="$1"
122
-	    ;;
123
-	-e|--extension)
124
-	    shift
125
-	    EXTENSION="$1"
126
-	    ;;
127
-	-p|--password)
128
-	    shift
129
-	    PASSWORD="$1"
130
-	    ;;
131
-	*)
132
-	    # unknown option
133
-	    ;;
116
+    -h|--help)
117
+        show_help
118
+        ;;
119
+    -u|--user)
120
+        shift
121
+        MY_USERNAME="$1"
122
+        ;;
123
+    -e|--extension)
124
+        shift
125
+        EXTENSION="$1"
126
+        ;;
127
+    -p|--password)
128
+        shift
129
+        PASSWORD="$1"
130
+        ;;
131
+    *)
132
+        # unknown option
133
+        ;;
134 134
     esac
135 135
     shift
136 136
 done

+ 1
- 1
src/freedombone-adduser View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-addxmpp View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-batman View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-dlna View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-dokuwiki View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-emacs View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-gnusocial View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-gogs View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-htmly View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-hubzilla View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-ipfs View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-irc View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-librevault View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-mediagoblin View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-mumble View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-pelican View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-pihole View File

@@ -16,7 +16,7 @@
16 16
 # License
17 17
 # =======
18 18
 #
19
-# Copyright (C) 2016 Bob Mottram <bob@robotics.uk.to>
19
+# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
20 20
 #
21 21
 # This program is free software: you can redistribute it and/or modify
22 22
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-rss View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-searx View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-sip View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-syncthing View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-tahoelafs View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-tox View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-vim View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-vpn View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-webmail View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-xmpp View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-app-zeronet View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-archive-mail View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-backup-local View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-backup-remote View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-base-email View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-base-tripwire View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-client View File

@@ -11,7 +11,7 @@
11 11
 # License
12 12
 # =======
13 13
 #
14
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
14
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
15 15
 #
16 16
 # This program is free software: you can redistribute it and/or modify
17 17
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-clientcert View File

@@ -17,7 +17,7 @@
17 17
 # License
18 18
 # =======
19 19
 #
20
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
20
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
21 21
 #
22 22
 # This program is free software: you can redistribute it and/or modify
23 23
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-config View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-controlpanel View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-controlpanel-user View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 77
- 77
src/freedombone-dhparam View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by
@@ -131,104 +131,104 @@ aDWQRvTrh5+SQAlDi0gcbNeImgAu1e44K8kZDab8Am5HlVjkR1Z36aqeMFDidlaU
131 131
 '
132 132
 
133 133
 function show_help {
134
-	echo ''
135
-	echo $"${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]"
136
-	echo ''
137
-	exit 0
134
+    echo ''
135
+    echo $"${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]"
136
+    echo ''
137
+    exit 0
138 138
 }
139 139
 
140 140
 function calc_dh {
141
-	if [[ $FAST == 'yes' ]]; then
142
-		DHGROUP=$(( ( RANDOM % 4 )  + 14 ))
143
-		if [[ ${DHGROUP} == 14 ]]; then
144
-			echo "$BETTERCRYPTO_GROUP14" > ${1}
145
-		else
146
-			if [[ ${DHGROUP} == 15 ]]; then
147
-				echo "$BETTERCRYPTO_GROUP15" > ${1}
148
-			else
149
-				if [[ ${DHGROUP} == 16 ]]; then
150
-					echo "$BETTERCRYPTO_GROUP16" > ${1}
151
-				else
152
-					if [[ ${DHGROUP} == 17 ]]; then
153
-						echo "$BETTERCRYPTO_GROUP17" > ${1}
154
-					else
155
-						echo "$BETTERCRYPTO_GROUP18" > ${1}
156
-					fi
157
-				fi
158
-			fi
159
-		fi
160
-	else
161
-		openssl dhparam -check -text $KEYLENGTH -out ${1}
162
-		if [ ! "$?" = "0" ]; then
163
-			exit 3674
164
-		fi
165
-	fi
166
-	chmod 640 ${1}
141
+    if [[ $FAST == 'yes' ]]; then
142
+        DHGROUP=$(( ( RANDOM % 4 )  + 14 ))
143
+        if [[ ${DHGROUP} == 14 ]]; then
144
+            echo "$BETTERCRYPTO_GROUP14" > ${1}
145
+        else
146
+            if [[ ${DHGROUP} == 15 ]]; then
147
+                echo "$BETTERCRYPTO_GROUP15" > ${1}
148
+            else
149
+                if [[ ${DHGROUP} == 16 ]]; then
150
+                    echo "$BETTERCRYPTO_GROUP16" > ${1}
151
+                else
152
+                    if [[ ${DHGROUP} == 17 ]]; then
153
+                        echo "$BETTERCRYPTO_GROUP17" > ${1}
154
+                    else
155
+                        echo "$BETTERCRYPTO_GROUP18" > ${1}
156
+                    fi
157
+                fi
158
+            fi
159
+        fi
160
+    else
161
+        openssl dhparam -check -text $KEYLENGTH -out ${1}
162
+        if [ ! "$?" = "0" ]; then
163
+            exit 3674
164
+        fi
165
+    fi
166
+    chmod 640 ${1}
167 167
 }
168 168
 
169 169
 function regenerate_dh_keys {
170
-	for file in /etc/ssl/mycerts/*
171
-	do
172
-		if [[ -f $file ]]; then
173
-			filename=/etc/ssl/certs/$(echo $file | awk -F '/etc/ssl/mycerts/' '{print $2}' | awk -F '.crt' '{print $1}').dhparam
174
-			if [ -f $filename ]; then
175
-				calc_dh $filename
176
-				echo $"Recalculated DH params for $filename"
177
-			fi
178
-		fi
179
-	done
170
+    for file in /etc/ssl/mycerts/*
171
+    do
172
+        if [[ -f $file ]]; then
173
+            filename=/etc/ssl/certs/$(echo $file | awk -F '/etc/ssl/mycerts/' '{print $2}' | awk -F '.crt' '{print $1}').dhparam
174
+            if [ -f $filename ]; then
175
+                calc_dh $filename
176
+                echo $"Recalculated DH params for $filename"
177
+            fi
178
+        fi
179
+    done
180 180
 }
181 181
 
182 182
 while [[ $# > 1 ]]
183 183
 do
184
-	key="$1"
185
-
186
-	case $key in
187
-		--help)
188
-			show_help
189
-			;;
190
-		-h|--hostname)
191
-			shift
192
-			HOSTNAME="$1"
193
-			;;
194
-		-l|--dhkey)
195
-			shift
196
-			KEYLENGTH=${1}
197
-			;;
198
-		--recalc)
199
-			shift
200
-			RECALCULATE=${1}
201
-			;;
202
-		--fast)
203
-			shift
204
-			if [[ ${1} == $"yes" || ${1} == $"y" ]]; then
205
-				FAST='yes'
206
-			fi
207
-			;;
208
-		*)
209
-			# unknown option
210
-			;;
211
-	esac
212
-	shift
184
+    key="$1"
185
+
186
+    case $key in
187
+        --help)
188
+            show_help
189
+            ;;
190
+        -h|--hostname)
191
+            shift
192
+            HOSTNAME="$1"
193
+            ;;
194
+        -l|--dhkey)
195
+            shift
196
+            KEYLENGTH=${1}
197
+            ;;
198
+        --recalc)
199
+            shift
200
+            RECALCULATE=${1}
201
+            ;;
202
+        --fast)
203
+            shift
204
+            if [[ ${1} == $"yes" || ${1} == $"y" ]]; then
205
+                FAST='yes'
206
+            fi
207
+            ;;
208
+        *)
209
+            # unknown option
210
+            ;;
211
+    esac
212
+    shift
213 213
 done
214 214
 
215 215
 if [[ $RECALCULATE == "yes" || $RECALCULATE == "y" ]]; then
216
-	regenerate_dh_keys
217
-	exit 0
216
+    regenerate_dh_keys
217
+    exit 0
218 218
 fi
219 219
 
220 220
 if [ ! $HOSTNAME ]; then
221
-	echo $'No hostname specified'
222
-	exit 5728
221
+    echo $'No hostname specified'
222
+    exit 5728
223 223
 fi
224 224
 
225 225
 if ! which openssl > /dev/null ;then
226
-	echo $"$0: openssl is not installed, exiting" 1>&2
227
-	exit 5689
226
+    echo $"$0: openssl is not installed, exiting" 1>&2
227
+    exit 5689
228 228
 fi
229 229
 
230 230
 if [ ! -d /etc/ssl/mycerts ]; then
231
-	mkdir -p /etc/ssl/mycerts
231
+    mkdir -p /etc/ssl/mycerts
232 232
 fi
233 233
 
234 234
 calc_dh /etc/ssl/certs/$HOSTNAME.dhparam

+ 1
- 1
src/freedombone-encrypt-mail View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-format View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-freedns View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-ignore View File

@@ -15,7 +15,7 @@
15 15
 # License
16 16
 # =======
17 17
 #
18
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
18
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
19 19
 #
20 20
 # This program is free software: you can redistribute it and/or modify
21 21
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-image View File

@@ -15,7 +15,7 @@
15 15
 # License
16 16
 # =======
17 17
 #
18
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
18
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
19 19
 #
20 20
 # This program is free software: you can redistribute it and/or modify
21 21
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-keydrive View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-logging View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-mesh View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-mesh-batman View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-mirrors View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-pin-cert View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-recoverkey View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 178
- 178
src/freedombone-remote View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by
@@ -58,205 +58,205 @@ TITLE='Remote Backup'
58 58
 RECIPROCAL="no"
59 59
 
60 60
 function show_help {
61
-	echo ''
62
-	echo $"${PROJECT_NAME}-remote -u [username] -l [backup list filename] -m [min password length]"
63
-	echo ''
64
-	echo $'Creates an inventory of remote backup locations'
65
-	echo ''
66
-	echo ''
67
-	echo $'  -h --help             Show help'
68
-	echo $'  -u --username         User to create the backups.list file for'
69
-	echo $'  -l --list             Remote backup list (usually /home/$USER/backup.list)'
70
-	echo $'  -m --min              Minimum password length (characters)'
71
-	echo $'  -r --reciprocal       Whether to add reciprocal user accounts'
72
-	echo $'  -t --title            Title shown'
73
-	echo ''
74
-	exit 0
61
+    echo ''
62
+    echo $"${PROJECT_NAME}-remote -u [username] -l [backup list filename] -m [min password length]"
63
+    echo ''
64
+    echo $'Creates an inventory of remote backup locations'
65
+    echo ''
66
+    echo ''
67
+    echo $'  -h --help             Show help'
68
+    echo $'  -u --username         User to create the backups.list file for'
69
+    echo $'  -l --list             Remote backup list (usually /home/$USER/backup.list)'
70
+    echo $'  -m --min              Minimum password length (characters)'
71
+    echo $'  -r --reciprocal       Whether to add reciprocal user accounts'
72
+    echo $'  -t --title            Title shown'
73
+    echo ''
74
+    exit 0
75 75
 }
76 76
 
77 77
 # Get the commandline options
78 78
 while [[ $# > 1 ]]
79 79
 do
80
-	key="$1"
80
+    key="$1"
81 81
 
82
-	case $key in
83
-		-h|--help)
84
-			show_help
85
-			;;
86
-		# backup list filename
87
-		# typically /home/$USER/backup.list
88
-		-l|--list)
89
-			shift
90
-			FRIENDS_SERVERS_LIST="$1"
91
-			;;
92
-		# username within /home
93
-		-u|--user)
94
-			shift
95
-			MY_USERNAME="$1"
96
-			;;
97
-		# Minimum password length
98
-		-m|--min)
99
-			shift
100
-			MINIMUM_PASSWORD_LENGTH="$1"
101
-			;;
102
-		# Title shown
103
-		-t|--title)
104
-			shift
105
-			TITLE="$1"
106
-			;;
107
-		# reciprocal user accounts
108
-		-r|--reciprocal)
109
-			shift
110
-			RECIPROCAL="yes"
111
-			;;
112
-		*)
113
-			# unknown option
114
-			;;
115
-	esac
116
-	shift
82
+    case $key in
83
+        -h|--help)
84
+            show_help
85
+            ;;
86
+        # backup list filename
87
+        # typically /home/$USER/backup.list
88
+        -l|--list)
89
+            shift
90
+            FRIENDS_SERVERS_LIST="$1"
91
+            ;;
92
+        # username within /home
93
+        -u|--user)
94
+            shift
95
+            MY_USERNAME="$1"
96
+            ;;
97
+        # Minimum password length
98
+        -m|--min)
99
+            shift
100
+            MINIMUM_PASSWORD_LENGTH="$1"
101
+            ;;
102
+        # Title shown
103
+        -t|--title)
104
+            shift
105
+            TITLE="$1"
106
+            ;;
107
+        # reciprocal user accounts
108
+        -r|--reciprocal)
109
+            shift
110
+            RECIPROCAL="yes"
111
+            ;;
112
+        *)
113
+            # unknown option
114
+            ;;
115
+    esac
116
+    shift
117 117
 done
118 118
 
119 119
 function interactive_config_remote_backups {
120
-	if [ ! $MY_USERNAME ]; then
121
-		echo $'Please specify a username with the -u option'
122
-		exit 7356
123
-	fi
120
+    if [ ! $MY_USERNAME ]; then
121
+        echo $'Please specify a username with the -u option'
122
+        exit 7356
123
+    fi
124 124
 
125
-	if [ ! /home/$MY_USERNAME ]; then
126
-		echo $"The user /home/$MY_USERNAME does not exist on the system"
127
-		exit 3689
128
-	fi
125
+    if [ ! /home/$MY_USERNAME ]; then
126
+        echo $"The user /home/$MY_USERNAME does not exist on the system"
127
+        exit 3689
128
+    fi
129 129
 
130
-	if [ ! $FRIENDS_SERVERS_LIST ]; then
131
-		FRIENDS_SERVERS_LIST=/home/$MY_USERNAME/backup.list
132
-	fi
130
+    if [ ! $FRIENDS_SERVERS_LIST ]; then
131
+        FRIENDS_SERVERS_LIST=/home/$MY_USERNAME/backup.list
132
+    fi
133 133
 
134
-	# clear any existing list
135
-	if [ -f $FRIENDS_SERVERS_LIST ]; then
136
-		rm -f $FRIENDS_SERVERS_LIST
137
-		touch $FRIENDS_SERVERS_LIST
138
-	fi
139
-	# number of entries made
140
-	entering_remote_backups_ctr=1
134
+    # clear any existing list
135
+    if [ -f $FRIENDS_SERVERS_LIST ]; then
136
+        rm -f $FRIENDS_SERVERS_LIST
137
+        touch $FRIENDS_SERVERS_LIST
138
+    fi
139
+    # number of entries made
140
+    entering_remote_backups_ctr=1
141 141
 
142
-	entering_remote_backups_done="no"
143
-	remote_ssh_username=""
144
-	remote_ssh_domain=""
145
-	remote_ssh_port=""
146
-	remote_ssh_password=""
147
-	remote_ssh_reciprocal_username=""
148
-	remote_ssh_reciprocal_password=""
149
-	while [[ $entering_remote_backups_done == "no" ]]
150
-	do
151
-		data=$(tempfile 2>/dev/null)
152
-		trap "rm -f $data" 0 1 2 5 15
153
-		if [[ $RECIPROCAL == "yes" ]]; then
154
-			dialog --backtitle "Freedombone Configuration" \
155
-				   --title "$TITLE ${entering_remote_backups_ctr}" \
156
-				   --form "\nPlease specify the SSH login details for the remote server\n\nThe reciprocal entries are optional, and can be used if you wish to set up a user account on this system for whoever runs the remote server to also use for backups" 20 50 8 \
157
-				   "Username:" 1 1 "$remote_ssh_username" 1 23 16 15 \
158
-				   "Domain:" 2 1 "$remote_ssh_domain" 2 23 16 15 \
159
-				   "SSH port:" 3 1 "2222" 3 23 5 4 \
160
-				   "Password:" 4 1 "$remote_ssh_password" 4 23 20 100 \
161
-				   "Reciprocal Username:" 5 1 "$remote_ssh_reciprocal_username" 5 23 20 100 \
162
-				   "Reciprocal Password:" 6 1 "$remote_ssh_reciprocal_password" 6 23 20 100 \
163
-				   2> $data
164
-		else
165
-			dialog --backtitle "Freedombone Configuration" \
166
-				   --title "$TITLE ${entering_remote_backups_ctr}" \
167
-				   --form "\nPlease specify the SSH login details for the remote server" 15 50 4 \
168
-				   "Username:" 1 1 "$remote_ssh_username" 1 23 16 15 \
169
-				   "Domain:" 2 1 "$remote_ssh_domain" 2 23 16 15 \
170
-				   "SSH port:" 3 1 "2222" 3 23 5 4 \
171
-				   "Password:" 4 1 "$remote_ssh_password" 4 23 20 100 \
172
-				   2> $data
173
-		fi
174
-		sel=$?
175
-		case $sel in
176
-			1) entering_remote_backups_done="yes";;
177
-			255) entering_remote_backups_done="yes";;
178
-		esac
179
-		remote_ssh_username=$(cat $data | sed -n 1p)
180
-		remote_ssh_domain=$(cat $data | sed -n 2p)
181
-		remote_ssh_port=$(cat $data | sed -n 3p)
182
-		remote_ssh_password=$(cat $data | sed -n 4p)
183
-		remote_ssh_reciprocal_username=$(cat $data | sed -n 5p)
184
-		remote_ssh_reciprocal_password=$(cat $data | sed -n 6p)
185
-		if [[ $remote_ssh_username != "" && \
186
-					$remote_ssh_domain != "" && \
187
-					$remote_ssh_port != "" && \
188
-					$remote_ssh_password != "" ]]; then
142
+    entering_remote_backups_done="no"
143
+    remote_ssh_username=""
144
+    remote_ssh_domain=""
145
+    remote_ssh_port=""
146
+    remote_ssh_password=""
147
+    remote_ssh_reciprocal_username=""
148
+    remote_ssh_reciprocal_password=""
149
+    while [[ $entering_remote_backups_done == "no" ]]
150
+    do
151
+        data=$(tempfile 2>/dev/null)
152
+        trap "rm -f $data" 0 1 2 5 15
153
+        if [[ $RECIPROCAL == "yes" ]]; then
154
+            dialog --backtitle "Freedombone Configuration" \
155
+                   --title "$TITLE ${entering_remote_backups_ctr}" \
156
+                   --form "\nPlease specify the SSH login details for the remote server\n\nThe reciprocal entries are optional, and can be used if you wish to set up a user account on this system for whoever runs the remote server to also use for backups" 20 50 8 \
157
+                   "Username:" 1 1 "$remote_ssh_username" 1 23 16 15 \
158
+                   "Domain:" 2 1 "$remote_ssh_domain" 2 23 16 15 \
159
+                   "SSH port:" 3 1 "2222" 3 23 5 4 \
160
+                   "Password:" 4 1 "$remote_ssh_password" 4 23 20 100 \
161
+                   "Reciprocal Username:" 5 1 "$remote_ssh_reciprocal_username" 5 23 20 100 \
162
+                   "Reciprocal Password:" 6 1 "$remote_ssh_reciprocal_password" 6 23 20 100 \
163
+                   2> $data
164
+        else
165
+            dialog --backtitle "Freedombone Configuration" \
166
+                   --title "$TITLE ${entering_remote_backups_ctr}" \
167
+                   --form "\nPlease specify the SSH login details for the remote server" 15 50 4 \
168
+                   "Username:" 1 1 "$remote_ssh_username" 1 23 16 15 \
169
+                   "Domain:" 2 1 "$remote_ssh_domain" 2 23 16 15 \
170
+                   "SSH port:" 3 1 "2222" 3 23 5 4 \
171
+                   "Password:" 4 1 "$remote_ssh_password" 4 23 20 100 \
172
+                   2> $data
173
+        fi
174
+        sel=$?
175
+        case $sel in
176
+            1) entering_remote_backups_done="yes";;
177
+            255) entering_remote_backups_done="yes";;
178
+        esac
179
+        remote_ssh_username=$(cat $data | sed -n 1p)
180
+        remote_ssh_domain=$(cat $data | sed -n 2p)
181
+        remote_ssh_port=$(cat $data | sed -n 3p)
182
+        remote_ssh_password=$(cat $data | sed -n 4p)
183
+        remote_ssh_reciprocal_username=$(cat $data | sed -n 5p)
184
+        remote_ssh_reciprocal_password=$(cat $data | sed -n 6p)
185
+        if [[ $remote_ssh_username != "" && \
186
+                    $remote_ssh_domain != "" && \
187
+                    $remote_ssh_port != "" && \
188
+                    $remote_ssh_password != "" ]]; then
189 189
 
190
-			if [ ${#remote_ssh_password} -lt $MINIMUM_PASSWORD_LENGTH ]; then
191
-				dialog --title "Password quality check" --msgbox "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters" 6 40
192
-			else
190
+            if [ ${#remote_ssh_password} -lt $MINIMUM_PASSWORD_LENGTH ]; then
191
+                dialog --title "Password quality check" --msgbox "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters" 6 40
192
+            else
193 193
 
194
-				if [[ $RECIPROCAL == "yes" ]]; then
195
-					if [[ $remote_ssh_reciprocal_username != "" && \
196
-								$remote_ssh_reciprocal_password != "" ]]; then
197
-						if [ ${#remote_ssh_reciprocal_password} -lt $MINIMUM_PASSWORD_LENGTH ]; then
198
-							dialog --title "Password quality check" --msgbox "The reciprocal password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters" 6 40
199
-						else
200
-							echo ${remote_ssh_reciprocal_username}:${remote_ssh_reciprocal_password}::::/home/${remote_ssh_reciprocal_username}:bash | newusers
201
-							echo "$remote_ssh_username@$remote_ssh_domain $remote_ssh_port /home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
202
-							remote_ssh_username=""
203
-							remote_ssh_domain=""
204
-							remote_ssh_port=""
205
-							remote_ssh_password=""
206
-							remote_ssh_reciprocal_username=""
207
-							remote_ssh_reciprocal_password=""
208
-							entering_remote_backups_ctr=$((entering_remote_backups_ctr + 1))
209
-						fi
210
-					else
211
-						echo "$remote_ssh_username@$remote_ssh_domain $remote_ssh_port /home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
212
-						remote_ssh_username=""
213
-						remote_ssh_domain=""
214
-						remote_ssh_port=""
215
-						remote_ssh_password=""
216
-						remote_ssh_reciprocal_username=""
217
-						remote_ssh_reciprocal_password=""
218
-						entering_remote_backups_ctr=$((entering_remote_backups_ctr + 1))
219
-					fi
220
-				else
221
-					echo "$remote_ssh_username@$remote_ssh_domain $remote_ssh_port /home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
222
-					remote_ssh_username=""
223
-					remote_ssh_domain=""
224
-					remote_ssh_port=""
225
-					remote_ssh_password=""
226
-					entering_remote_backups_ctr=$((entering_remote_backups_ctr + 1))
227
-				fi
194
+                if [[ $RECIPROCAL == "yes" ]]; then
195
+                    if [[ $remote_ssh_reciprocal_username != "" && \
196
+                                $remote_ssh_reciprocal_password != "" ]]; then
197
+                        if [ ${#remote_ssh_reciprocal_password} -lt $MINIMUM_PASSWORD_LENGTH ]; then
198
+                            dialog --title "Password quality check" --msgbox "The reciprocal password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters" 6 40
199
+                        else
200
+                            echo ${remote_ssh_reciprocal_username}:${remote_ssh_reciprocal_password}::::/home/${remote_ssh_reciprocal_username}:bash | newusers
201
+                            echo "$remote_ssh_username@$remote_ssh_domain $remote_ssh_port /home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
202
+                            remote_ssh_username=""
203
+                            remote_ssh_domain=""
204
+                            remote_ssh_port=""
205
+                            remote_ssh_password=""
206
+                            remote_ssh_reciprocal_username=""
207
+                            remote_ssh_reciprocal_password=""
208
+                            entering_remote_backups_ctr=$((entering_remote_backups_ctr + 1))
209
+                        fi
210
+                    else
211
+                        echo "$remote_ssh_username@$remote_ssh_domain $remote_ssh_port /home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
212
+                        remote_ssh_username=""
213
+                        remote_ssh_domain=""
214
+                        remote_ssh_port=""
215
+                        remote_ssh_password=""
216
+                        remote_ssh_reciprocal_username=""
217
+                        remote_ssh_reciprocal_password=""
218
+                        entering_remote_backups_ctr=$((entering_remote_backups_ctr + 1))
219
+                    fi
220
+                else
221
+                    echo "$remote_ssh_username@$remote_ssh_domain $remote_ssh_port /home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
222
+                    remote_ssh_username=""
223
+                    remote_ssh_domain=""
224
+                    remote_ssh_port=""
225
+                    remote_ssh_password=""
226
+                    entering_remote_backups_ctr=$((entering_remote_backups_ctr + 1))
227
+                fi
228 228
 
229
-			fi
230
-		else
231
-			entering_remote_backups_done="yes"
232
-		fi
233
-	done
234
-	if [ -f $FRIENDS_SERVERS_LIST ]; then
235
-		chown $MY_USERNAME:$MY_USERNAME $FRIENDS_SERVERS_LIST
236
-	fi
229
+            fi
230
+        else
231
+            entering_remote_backups_done="yes"
232
+        fi
233
+    done
234
+    if [ -f $FRIENDS_SERVERS_LIST ]; then
235
+        chown $MY_USERNAME:$MY_USERNAME $FRIENDS_SERVERS_LIST
236
+    fi
237 237
 }
238 238
 
239 239
 function show_result {
240
-	clear
241
-	if (( $entering_remote_backups_ctr < 2 )); then
242
-		echo $'No remote backup locations were specified'
243
-		exit 0
244
-	fi
245
-	if [ ! -f $FRIENDS_SERVERS_LIST ]; then
246
-		echo $"No remote backups list found: $FRIENDS_SERVERS_LIST"
247
-		exit 7358
248
-	fi
249
-	echo ''
250
-	echo $"Remote backups list: $FRIENDS_SERVERS_LIST"
251
-	echo ''
252
-	echo $'Contents:'
253
-	echo ''
254
-	cat $FRIENDS_SERVERS_LIST
255
-	echo ''
240
+    clear
241
+    if (( $entering_remote_backups_ctr < 2 )); then
242
+        echo $'No remote backup locations were specified'
243
+        exit 0
244
+    fi
245
+    if [ ! -f $FRIENDS_SERVERS_LIST ]; then
246
+        echo $"No remote backups list found: $FRIENDS_SERVERS_LIST"
247
+        exit 7358
248
+    fi
249
+    echo ''
250
+    echo $"Remote backups list: $FRIENDS_SERVERS_LIST"
251
+    echo ''
252
+    echo $'Contents:'
253
+    echo ''
254
+    cat $FRIENDS_SERVERS_LIST
255
+    echo ''
256 256
 }
257 257
 
258 258
 if [ ! $FRIENDS_SERVERS_LIST ]; then
259
-	FRIENDS_SERVERS_LIST=/home/$MY_USERNAME/backup.list
259
+    FRIENDS_SERVERS_LIST=/home/$MY_USERNAME/backup.list
260 260
 fi
261 261
 
262 262
 interactive_config_remote_backups

+ 1
- 1
src/freedombone-renew-cert View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-repair-database View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-restore-local View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-restore-remote View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-rmemail View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-rmlist View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-rmsipuser View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-rmuser View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-rmxmpp View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-sec View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 5
- 5
src/freedombone-sipfreeext View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by
@@ -38,10 +38,10 @@ CONFIG_FILE=/etc/sipwitch.conf
38 38
 
39 39
 maxnum=201
40 40
 while (( maxnum < 299 )); do
41
-	if ! grep -q "extension>$maxnum<" $CONFIG_FILE; then
42
-		break;
43
-	fi
44
-	maxnum=$((maxnum + 1))
41
+    if ! grep -q "extension>$maxnum<" $CONFIG_FILE; then
42
+        break;
43
+    fi
44
+    maxnum=$((maxnum + 1))
45 45
 done
46 46
 echo $maxnum
47 47
 exit 0

+ 1
- 1
src/freedombone-splitkey View File

@@ -19,7 +19,7 @@
19 19
 # License
20 20
 # =======
21 21
 #
22
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
22
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
23 23
 #
24 24
 # This program is free software: you can redistribute it and/or modify
25 25
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-syncthing View File

@@ -14,7 +14,7 @@
14 14
 # License
15 15
 # =======
16 16
 #
17
-# Copyright (C) 2016 Bob Mottram <bob@robotics.uk.to>
17
+# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
18 18
 #
19 19
 # This program is free software: you can redistribute it and/or modify
20 20
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-tests View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-unignore View File

@@ -15,7 +15,7 @@
15 15
 # License
16 16
 # =======
17 17
 #
18
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
18
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
19 19
 #
20 20
 # This program is free software: you can redistribute it and/or modify
21 21
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-upgrade View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-utils-avahi View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-utils-backup View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-utils-cmake View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-utils-config View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-utils-cron View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-utils-cryptopp View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-utils-database View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-utils-depends View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-utils-dns View File

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
16
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by

+ 0
- 0
src/freedombone-utils-ffmpeg View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save