Просмотр исходного кода

Add blocked domains to /etc/hosts

Bob Mottram 7 лет назад
Родитель
Сommit
a0a3d9f9a5
2 измененных файлов: 18 добавлений и 12 удалений
  1. 15
    12
      src/freedombone-app-pleroma
  2. 3
    0
      src/freedombone-utils-i2p

+ 15
- 12
src/freedombone-app-pleroma Просмотреть файл

93
     echo 'while read blocked; do' >> $blocking_script_file
93
     echo 'while read blocked; do' >> $blocking_script_file
94
     echo '    if [[ "$blocked" == *"."* || "$blocked" == *"@"* ]]; then' >> $blocking_script_file
94
     echo '    if [[ "$blocked" == *"."* || "$blocked" == *"@"* ]]; then' >> $blocking_script_file
95
     echo '        if [ ${#blocked} -gt 4 ]; then' >> $blocking_script_file
95
     echo '        if [ ${#blocked} -gt 4 ]; then' >> $blocking_script_file
96
-    echo '          if [ $objects_updated ]; then' >> $blocking_script_file
97
-    echo '              objects_query="${objects_query} or"' >> $blocking_script_file
98
-    echo '              users_query="${users_query} or"' >> $blocking_script_file
99
-    echo '          fi' >> $blocking_script_file
100
-    echo "          objects_query=\"\${objects_query} data->>'content' ilike '%\${blocked}%' or data->>'actor' ilike '%\${blocked}%' or data->>'to' ilike '%\${blocked}%' or data->>'id' ilike '%\${blocked}%' or data->>'external_url' ilike '%\${blocked}%'\"" >> $blocking_script_file
101
-    echo "          users_query=\"\${users_query} nickname ilike '%\${blocked}%'\"" >> $blocking_script_file
102
-    echo '          objects_updated=1' >> $blocking_script_file
96
+    echo '            if [ $objects_updated ]; then' >> $blocking_script_file
97
+    echo '                objects_query="${objects_query} or"' >> $blocking_script_file
98
+    echo '                users_query="${users_query} or"' >> $blocking_script_file
99
+    echo '            fi' >> $blocking_script_file
100
+    echo "            objects_query=\"\${objects_query} data->>'content' ilike '%\${blocked}%' or data->>'actor' ilike '%\${blocked}%' or data->>'to' ilike '%\${blocked}%' or data->>'id' ilike '%\${blocked}%' or data->>'external_url' ilike '%\${blocked}%'\"" >> $blocking_script_file
101
+    echo "            users_query=\"\${users_query} nickname ilike '%\${blocked}%'\"" >> $blocking_script_file
102
+    echo '            objects_updated=1' >> $blocking_script_file
103
     echo '            if [[ "$blocked" != *"@"* ]]; then' >> $blocking_script_file
103
     echo '            if [[ "$blocked" != *"@"* ]]; then' >> $blocking_script_file
104
-    echo '              if [ $websub_server_subscriptions_updated ]; then' >> $blocking_script_file
105
-    echo '                  websub_server_subscriptions_query="${websub_server_subscriptions_query} or"' >> $blocking_script_file
106
-    echo '              fi' >> $blocking_script_file
107
-    echo "              websub_server_subscriptions_query=\"\${websub_server_subscriptions_query} callback like '%\${blocked}%'\"" >> $blocking_script_file
108
-    echo '              websub_server_subscriptions_updated=1' >> $blocking_script_file
104
+    echo '                if ! grep -q "$blocked" /etc/hosts; then' >> $blocking_script_file
105
+    echo '                    echo "127.0.0.1  $blocked" >> /etc/hosts' >> $blocking_script_file
106
+    echo '                fi' >> $blocking_script_file
107
+    echo '                if [ $websub_server_subscriptions_updated ]; then' >> $blocking_script_file
108
+    echo '                    websub_server_subscriptions_query="${websub_server_subscriptions_query} or"' >> $blocking_script_file
109
+    echo '                fi' >> $blocking_script_file
110
+    echo "                websub_server_subscriptions_query=\"\${websub_server_subscriptions_query} callback like '%\${blocked}%'\"" >> $blocking_script_file
111
+    echo '                websub_server_subscriptions_updated=1' >> $blocking_script_file
109
     echo '            fi' >> $blocking_script_file
112
     echo '            fi' >> $blocking_script_file
110
     echo '        fi' >> $blocking_script_file
113
     echo '        fi' >> $blocking_script_file
111
     echo '    fi' >> $blocking_script_file
114
     echo '    fi' >> $blocking_script_file

+ 3
- 0
src/freedombone-utils-i2p Просмотреть файл

63
 }
63
 }
64
 
64
 
65
 function remove_i2p {
65
 function remove_i2p {
66
+    service i2p stop
66
     apt-get -yq remove i2p-router --purge
67
     apt-get -yq remove i2p-router --purge
67
     apt-get -yq remove i2p --purge
68
     apt-get -yq remove i2p --purge
68
     apt-get -yq remove i2p-keyring --purge
69
     apt-get -yq remove i2p-keyring --purge
89
 
90
 
90
 function i2p_enable_sam {
91
 function i2p_enable_sam {
91
     if [ ! -f /var/lib/i2p/i2p-config/clients.config ]; then
92
     if [ ! -f /var/lib/i2p/i2p-config/clients.config ]; then
93
+        service i2p stop
94
+
92
         apt-get -yq remove i2p --purge
95
         apt-get -yq remove i2p --purge
93
         apt-get -yq remove i2p-router --purge
96
         apt-get -yq remove i2p-router --purge
94
         if [ -d /var/lib/i2p ]; then
97
         if [ -d /var/lib/i2p ]; then