Skip to content

Commit 9d3f456

Browse files
Revert to 73b5ae7 state
1 parent dc92aee commit 9d3f456

8 files changed

Lines changed: 5 additions & 71 deletions

File tree

docker/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ RUN set -eux; \
1313
bind-tools \
1414
bind-dnssec-tools \
1515
openssl \
16-
tzdata \
17-
fail2ban \
18-
iptables \
19-
ip6tables; \
16+
tzdata; \
2017
tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz; \
2118
tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz; \
2219
rm -rf /tmp/* /var/cache/apk/* /etc/bind/*; \
@@ -25,8 +22,6 @@ RUN set -eux; \
2522
COPY ./bind /etc/bind
2623
COPY ./services.d /etc/services.d
2724
COPY ./cont-init.d /etc/cont-init.d
28-
COPY ./fail2ban/jail.local /etc/fail2ban/jail.local
29-
COPY ./fail2ban/filter.d /etc/fail2ban/filter.d
3025

3126
RUN chmod +x /etc/services.d/*/run /etc/cont-init.d/*
3227

docker/bind/logging.conf

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
logging {
22
channel default_log { syslog daemon; severity info; print-severity yes; print-category yes; print-time yes; };
33
channel errors_log { syslog daemon; severity warning; print-severity yes; print-category yes; print-time yes; };
4-
channel security_file {
5-
file "/var/log/named/security.log" versions 3 size 10m;
6-
severity dynamic;
7-
print-severity yes;
8-
print-category yes;
9-
print-time yes;
10-
};
114

125
category default { default_log; };
136
category config { default_log; };
14-
category security { errors_log; security_file; };
15-
category xfer-in { default_log; security_file; };
16-
category xfer-out { default_log; security_file; };
7+
category security { errors_log; };
8+
category xfer-in { default_log; };
9+
category xfer-out { default_log; };
1710
category update { default_log; };
1811
category dnssec { default_log; };
1912
category queries { default_log; };

docker/cont-init.d/01-named.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ rndc-confgen -a -c /etc/bind/rndc.key
99

1010
log "Create directories"
1111
mkdir -p /var/cache/bind/keys
12-
mkdir -p /var/log/named
13-
touch /var/log/named/security.log
14-
chown -R named:named /var/cache/bind /etc/bind /var/log/named
12+
chown -R named:named /var/cache/bind /etc/bind
1513

1614
log "Check config"
1715
named-checkconf /etc/bind/named.conf

docker/cont-init.d/02-fail2ban.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

docker/fail2ban/filter.d/named-security.conf

Lines changed: 0 additions & 19 deletions
This file was deleted.

docker/fail2ban/jail.local

Lines changed: 0 additions & 16 deletions
This file was deleted.

docker/services.d/fail2ban/run

Lines changed: 0 additions & 3 deletions
This file was deleted.

example/docker-compose.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ services:
77
- "53:53/tcp"
88
# - "953:953/tcp"
99
restart: always
10-
environment:
11-
- FAIL2BAN_ENABLED=false
12-
cap_add:
13-
- NET_ADMIN
1410
volumes:
1511
- bind_keys:/var/cache/bind/keys
1612
- ./bind:/etc/bind

0 commit comments

Comments
 (0)