Skip to content

Commit 5924131

Browse files
committed
fail2ban: fix missing ufw filter
Signed-off-by: nachoparker <nacho@ownyourbits.com>
1 parent c71b37f commit 5924131

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

bin/ncp/NETWORKING/letsencrypt.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Let's encrypt certbot installation on Raspbian
3+
# Let's encrypt certbot installation on NextCloudPi
44
#
55
# Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
66
# GPL licensed (see end of file) * Use at your own risk!
@@ -42,7 +42,7 @@ EOF
4242
}
4343

4444
# tested with certbot 0.28.0
45-
configure()
45+
configure()
4646
{
4747
local DOMAIN_LOWERCASE="${DOMAIN,,}"
4848

@@ -97,7 +97,7 @@ EOF
9797
# delayed in bg so it does not kill the connection, and we get AJAX response
9898
bash -c "sleep 2 && service apache2 reload" &>/dev/null &
9999
rm -rf $ncdir/.well-known
100-
100+
101101
# Update configuration
102102
[[ "$DOCKERBUILD" == 1 ]] && update-rc.d letsencrypt enable
103103

changelog.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

2-
[v1.12.9](https://github.com/nextcloud/nextcloudpi/commit/cc89c7e) (2019-05-27) ncp-notify-updates: dont spam cron mail
2+
[v1.12.10](https://github.com/nextcloud/nextcloudpi/commit/d826236) (2019-06-01) fail2ban: fix missing ufw filter
33

4-
[v1.12.8](https://github.com/nextcloud/nextcloudpi/commit/bfdc475) (2019-05-25) docker: mount timezone
4+
[v1.12.9](https://github.com/nextcloud/nextcloudpi/commit/c71b37f) (2019-05-27) ncp-notify-updates: dont spam cron mail
5+
6+
[v1.12.8 ](https://github.com/nextcloud/nextcloudpi/commit/bfdc475) (2019-05-25) docker: mount timezone
57

68
[v1.12.7](https://github.com/nextcloud/nextcloudpi/commit/76137ed) (2019-05-25) ncp-app: bump to NC16
79

update.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,15 @@ EOF
231231
# fix logrotate files
232232
chmod 0444 /etc/logrotate.d/*
233233

234+
# update fail2ban filters
235+
cat > /etc/fail2ban/filter.d/ufwban.conf <<'EOF'
236+
[INCLUDES]
237+
before = common.conf
238+
[Definition]
239+
failregex = UFW BLOCK.* SRC=
240+
ignoreregex =
241+
EOF
242+
234243
# remove redundant opcache configuration. Leave until update bug is fixed -> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815968
235244
# Bug #416 reappeared after we moved to php7.2 and debian buster packages. (keep last)
236245
[[ "$( ls -l /etc/php/7.2/fpm/conf.d/*-opcache.ini | wc -l )" -gt 1 ]] && rm "$( ls /etc/php/7.2/fpm/conf.d/*-opcache.ini | tail -1 )"

0 commit comments

Comments
 (0)