Browse Source

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram 7 years ago
parent
commit
0b00db2cd3
1 changed files with 10 additions and 1 deletions
  1. 10
    1
      src/freedombone-app-pleroma

+ 10
- 1
src/freedombone-app-pleroma View File

77
     echo "if [ ! -f /root/${PROJECT_NAME}-firewall-domains.cfg ]; then" >> $blocking_script_file
77
     echo "if [ ! -f /root/${PROJECT_NAME}-firewall-domains.cfg ]; then" >> $blocking_script_file
78
     echo '    exit 0' >> $blocking_script_file
78
     echo '    exit 0' >> $blocking_script_file
79
     echo 'fi' >> $blocking_script_file
79
     echo 'fi' >> $blocking_script_file
80
+    echo 'if [ -f /tmp/pleroma-blocking.lock ]; then' >> $blocking_script_file
81
+    echo '    cd /tmp' >> $blocking_script_file
82
+    echo '    find ./pleroma*.lock -type f -mmin +5 -exec rm {} \;' >> $blocking_script_file
83
+    echo '    if [ -f /tmp/pleroma-blocking.lock ]; then' >> $blocking_script_file
84
+    echo '        exit 0' >> $blocking_script_file
85
+    echo '    fi' >> $blocking_script_file
86
+    echo 'fi' >> $blocking_script_file
87
+    echo 'touch /tmp/pleroma-blocking.lock' >> $blocking_script_file
80
     echo 'cd /etc/postgresql' >> $blocking_script_file
88
     echo 'cd /etc/postgresql' >> $blocking_script_file
81
     echo 'while read blocked; do' >> $blocking_script_file
89
     echo 'while read blocked; do' >> $blocking_script_file
82
     echo '    if [[ "$blocked" == *"."* || "$blocked" == *"@"* ]]; then' >> $blocking_script_file
90
     echo '    if [[ "$blocked" == *"."* || "$blocked" == *"@"* ]]; then' >> $blocking_script_file
89
     echo '        fi' >> $blocking_script_file
97
     echo '        fi' >> $blocking_script_file
90
     echo '    fi' >> $blocking_script_file
98
     echo '    fi' >> $blocking_script_file
91
     echo "done </root/${PROJECT_NAME}-firewall-domains.cfg" >> $blocking_script_file
99
     echo "done </root/${PROJECT_NAME}-firewall-domains.cfg" >> $blocking_script_file
100
+    echo 'rm /tmp/pleroma-blocking.lock' >> $blocking_script_file
92
     chmod +x $blocking_script_file
101
     chmod +x $blocking_script_file
93
 
102
 
94
     if ! grep -q "$blocking_script_file" /etc/crontab; then
103
     if ! grep -q "$blocking_script_file" /etc/crontab; then
95
-        echo "*/2            * *   *   *   root $blocking_script_file > /dev/null" >> /etc/crontab
104
+        echo "*/1            * *   *   *   root $blocking_script_file > /dev/null" >> /etc/crontab
96
     fi
105
     fi
97
 }
106
 }
98
 
107