Skip to content

Commit acedd99

Browse files
committed
daily
1 parent 82e49e5 commit acedd99

5 files changed

Lines changed: 26 additions & 3 deletions

File tree

backup/system-backup-install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ mkdir -p /root/.config/system-backup
3131
cat >/root/.config/system-backup/configuration <<EOF
3232
STORAGE_URL="$(sed -n -e 's|^storage-url:\s*\(\S\+\)$|\1|p' /root/.s3ql/authinfo2)"
3333
TARGET="/media/server-backup.s3ql"
34-
#MOUNT_OPTIONS="--threads 4 --compress zlib-5"
34+
#MOUNT_OPTIONS="--max-cache-entries 10240 --threads 4 --compress zlib-5"
35+
#ulimit -n 10500
3536
MOUNT_OPTIONS="--compress zlib-5"
3637
AUTHFILE="/root/.s3ql/authinfo2"
3738
#DB_EXCLUDE="excluded-db1|excluded-db2"

debian-setup/packages/s3ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66
# https://github.com/s3ql/s3ql/releases
7-
S3QL_VERSION="5.4.0"
7+
S3QL_VERSION="5.4.2"
88
S3QL_PATH="/opt/s3ql"
99

1010
set -e -x

monitoring/apache-xreport.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ Xclude_filter()
3636
|w4wp_|bad_request_|no_wp_here_|404_not_found|403_forbidden|File does not exist:\
3737
|client denied by server configuration:)" \
3838
| grep -Evx '\[.* 06:.* [0-9][0-9][0-9][0-9]\] \[\S+:(info|notice)\] \[pid [0-9]+:tid [0-9]+\] (AH00493|AH00830|AH01887|AH01876|AH03090|AH00489|AH00490|AH00094|AH01883|h2_workers):.*' \
39+
| grep -Ev '\sAH00126: Invalid URI in request\s' \
40+
| grep -Ev '\sAH10244: invalid URI path\s' \
3941

4042
}
4143

@@ -82,7 +84,7 @@ while read -r CONFIG_FILE; do
8284
nice dategrep --format '%a %b %d %T(.[0-9]+)? %Y' --multiline \
8385
--start "now truncate 24h add -17h35m" --end "06:25:00" "$ERROR_LOG".[1] "$ERROR_LOG" \
8486
| Xclude_filter \
85-
| sed "s;^;$(basename "$ERROR_LOG" .log): ;"
87+
| sed -e "s|^|$(basename "$ERROR_LOG" .log): |"
8688

8789
done <<<"$APACHE_CONFIGS" | Maybe_sendmail
8890

security/fail2ban-conf/jail.local

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ destemail = admin@szepe.net
3131
# Separate chain for Fail2ban
3232
chain = fail2ban
3333

34+
# Use iptables
35+
banaction = iptables-multiport
36+
banaction_allports = iptables-allports
37+
3438
# Ban & send an e-mail with GEOIP data and relevant log lines
3539
action_mgl = %(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s", actionstart_on_demand=false]
3640
sendmail-geoip-lines[name=%(__name__)s, sender="%(sender)s", dest="%(destemail)s", logpath="%(logpath)s", chain="%(chain)s"]
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# AS213412 - ONYPHE
2+
#: ipset -exist restore <ipset/onyphe.ipset
3+
#: iptables -w -I myattackers-ipset -m set --match-set onyphe src -j REJECT
4+
create onyphe hash:net family inet hashsize 64 maxelem 32
5+
flush onyphe
6+
#$ wget -qO- https://smith.probe.onyphe.net/ip-ranges.txt|sort -Vu|sed -e 's#^#add onyphe #'
7+
add onyphe 51.254.49.96/28
8+
add onyphe 91.196.152.0/24
9+
add onyphe 91.230.168.0/24
10+
add onyphe 91.231.89.0/24
11+
add onyphe 94.231.206.0/24
12+
add onyphe 195.184.76.0/24
13+
14+
#add onyphe 2a14:f100::/29
15+
#add onyphe 2001:41d0:33a:a00::400/124
16+
#add onyphe 2001:41d0:33d:9200::400/124

0 commit comments

Comments
 (0)