From 5f9a89a5e8d96c6b0702fc1b9a43d7224f750c0d Mon Sep 17 00:00:00 2001 From: crt0mega Date: Mon, 18 Jan 2021 22:14:04 +0100 Subject: [PATCH] Added SPAMLIST_URL to config, moved spammers to seperate repo --- byezlax | 13 ++++++++++--- spammers | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/byezlax b/byezlax index 3fc8175..a47da9c 100755 --- a/byezlax +++ b/byezlax @@ -1,8 +1,8 @@ #!/bin/bash -####################### -# Database connection # -####################### +######################## +# Script configuration # +######################## if [ ! -f "$PWD/config" ]; then declare DB_NAME="hubzilla" @@ -10,10 +10,17 @@ if [ ! -f "$PWD/config" ]; then declare DB_PORT="3306" declare DB_USER="user" declare DB_PASS="pass" + declare SPAMLIST_URL="https://git.c-r-t.tk/DiasporaDefenseLeague/spamlist/raw/branch/master/spammers" else source $PWD/config > /dev/null fi +################################# +# Download new list of spammers # +################################# + +wget $SPAMLIST_URL -q + ######################### # Read List of spammers # ######################### diff --git a/spammers b/spammers index 1154ec8..b5b0f40 100644 --- a/spammers +++ b/spammers @@ -19,8 +19,9 @@ clara_listensprechen@pod.tchncs.de deusfigendi@neptune.jerrylumpkins.me dg7bba@pod.tchncs.de dredmorbius@mondiaspora.net -florida_ted@pod.dapor.net florida_ted@diaspora.psyco.fr +florida_ted@pod.automat.click +florida_ted@pod.dapor.net florida_ted@pod.jns.im gander22h@diaspora.psyco.fr hackbyte@pod.dapor.net @@ -53,4 +54,3 @@ vm66%@daspr.io vm66%@pod.tchncs.de wurstaufbrot@pod.dapor.net wurstaufbrot@pod.tchncs.de -florida_ted@pod.automat.click