Ver código fonte

Move tor services to new file

Bob Mottram 7 anos atrás
pai
commit
990edc125c

+ 2
- 2
src/freedombone-app-gogs Ver arquivo

655
         echo $'No Tor installation found. Gogs onion site cannot be configured.'
655
         echo $'No Tor installation found. Gogs onion site cannot be configured.'
656
         exit 877367
656
         exit 877367
657
     fi
657
     fi
658
-    if ! grep -q "hidden_service_gogs" /etc/tor/torrc; then
658
+    if ! grep -q "hidden_service_gogs" $ONION_SERVICES_FILE; then
659
         { echo 'HiddenServiceDir /var/lib/tor/hidden_service_gogs/';
659
         { echo 'HiddenServiceDir /var/lib/tor/hidden_service_gogs/';
660
           echo 'HiddenServiceVersion 3';
660
           echo 'HiddenServiceVersion 3';
661
           echo "HiddenServicePort 80 127.0.0.1:${GIT_ONION_PORT}";
661
           echo "HiddenServicePort 80 127.0.0.1:${GIT_ONION_PORT}";
662
-          echo "HiddenServicePort 9418 127.0.0.1:9418"; } >> /etc/tor/torrc
662
+          echo "HiddenServicePort 9418 127.0.0.1:9418"; } >> $ONION_SERVICES_FILE
663
         echo $'Added onion site for Gogs'
663
         echo $'Added onion site for Gogs'
664
     fi
664
     fi
665
 
665
 

+ 2
- 2
src/freedombone-app-keyserver Ver arquivo

656
 
656
 
657
     chown debian-sks: $sksconf_file
657
     chown debian-sks: $sksconf_file
658
 
658
 
659
-    if ! grep -q "hidden_service_sks" /etc/tor/torrc; then
659
+    if ! grep -q "hidden_service_sks" $ONION_SERVICES_FILE; then
660
         { echo 'HiddenServiceDir /var/lib/tor/hidden_service_sks/';
660
         { echo 'HiddenServiceDir /var/lib/tor/hidden_service_sks/';
661
           echo 'HiddenServiceVersion 3';
661
           echo 'HiddenServiceVersion 3';
662
           echo "HiddenServicePort 11370 127.0.0.1:11370";
662
           echo "HiddenServicePort 11370 127.0.0.1:11370";
663
           echo "HiddenServicePort 11373 127.0.0.1:11371";
663
           echo "HiddenServicePort 11373 127.0.0.1:11371";
664
-          echo "HiddenServicePort 11372 127.0.0.1:11372"; } >> /etc/tor/torrc
664
+          echo "HiddenServicePort 11372 127.0.0.1:11372"; } >> $ONION_SERVICES_FILE
665
         echo $'Added onion site for sks'
665
         echo $'Added onion site for sks'
666
     fi
666
     fi
667
 
667
 

+ 3
- 3
src/freedombone-app-xmpp Ver arquivo

608
 
608
 
609
     function_check remove_onion_service
609
     function_check remove_onion_service
610
     remove_onion_service xmpp 5222 5223 5269
610
     remove_onion_service xmpp 5222 5223 5269
611
-    sed -i '/HiddenServiceVersion 2/d' /etc/tor/torrc
611
+    sed -i '/HiddenServiceVersion 2/d' $ONION_SERVICES_FILE
612
 
612
 
613
     apt-mark -q unhold prosody
613
     apt-mark -q unhold prosody
614
     apt-get -yq remove --purge prosody
614
     apt-get -yq remove --purge prosody
1079
         echo $'No Tor installation found. xmpp onion site cannot be configured.'
1079
         echo $'No Tor installation found. xmpp onion site cannot be configured.'
1080
         exit 877367
1080
         exit 877367
1081
     fi
1081
     fi
1082
-    if ! grep -q "hidden_service_xmpp" /etc/tor/torrc; then
1082
+    if ! grep -q "hidden_service_xmpp" $ONION_SERVICES_FILE; then
1083
         { echo 'HiddenServiceDir /var/lib/tor/hidden_service_xmpp/';
1083
         { echo 'HiddenServiceDir /var/lib/tor/hidden_service_xmpp/';
1084
           echo 'HiddenServiceVersion 2';
1084
           echo 'HiddenServiceVersion 2';
1085
           echo "HiddenServicePort 5222 127.0.0.1:5222";
1085
           echo "HiddenServicePort 5222 127.0.0.1:5222";
1086
-          echo "HiddenServicePort 5269 127.0.0.1:5269"; } >> /etc/tor/torrc
1086
+          echo "HiddenServicePort 5269 127.0.0.1:5269"; } >> $ONION_SERVICES_FILE
1087
         echo $'Added onion site for xmpp chat'
1087
         echo $'Added onion site for xmpp chat'
1088
     fi
1088
     fi
1089
 
1089
 

+ 2
- 2
src/freedombone-base-email Ver arquivo

224
 
224
 
225
 function create_email_onion_address {
225
 function create_email_onion_address {
226
     email_hostname='/var/lib/tor/hidden_service_email/hostname'
226
     email_hostname='/var/lib/tor/hidden_service_email/hostname'
227
-    if ! grep -q "hidden_service_email" /etc/tor/torrc; then
227
+    if ! grep -q "hidden_service_email" $ONION_SERVICES_FILE; then
228
         { echo 'HiddenServiceDir /var/lib/tor/hidden_service_email/';
228
         { echo 'HiddenServiceDir /var/lib/tor/hidden_service_email/';
229
           echo 'HiddenServiceVersion 3';
229
           echo 'HiddenServiceVersion 3';
230
           echo 'HiddenServicePort 25 127.0.0.1:25';
230
           echo 'HiddenServicePort 25 127.0.0.1:25';
231
           echo 'HiddenServicePort 587 127.0.0.1:587';
231
           echo 'HiddenServicePort 587 127.0.0.1:587';
232
-          echo 'HiddenServicePort 465 127.0.0.1:465'; } >> /etc/tor/torrc
232
+          echo 'HiddenServicePort 465 127.0.0.1:465'; } >> $ONION_SERVICES_FILE
233
 
233
 
234
         function_check onion_update
234
         function_check onion_update
235
         onion_update
235
         onion_update