From efcfe83c7df501547696e38d822232e67b94644f Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Fri, 18 Oct 2019 18:58:12 -0400 Subject: [PATCH] dns fixes --- Makefile | 2 +- .../linode/filesystem/var/lib/bind/db.b8.nz | 12 ------------ mail-setup | 6 ++++-- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 machine_specific/linode/filesystem/var/lib/bind/db.b8.nz diff --git a/Makefile b/Makefile index 6050ebe..2d066dc 100644 --- a/Makefile +++ b/Makefile @@ -3,5 +3,5 @@ all: ~/.local/distro-begin ~/.local/distro-end ~/.local/distro-begin: distro-begin distro-begin mail-setup -~/.local/distro-end: distro-end distro-pkgs pkgs +~/.local/distro-end: distro-end distro-pkgs pkgs primary-setup distro-end diff --git a/machine_specific/linode/filesystem/var/lib/bind/db.b8.nz b/machine_specific/linode/filesystem/var/lib/bind/db.b8.nz deleted file mode 100644 index fa2298d..0000000 --- a/machine_specific/linode/filesystem/var/lib/bind/db.b8.nz +++ /dev/null @@ -1,12 +0,0 @@ -$ORIGIN . -$TTL 60 ; 1 minute -b8.nz IN SOA b8.nz. admin.b8.nz. ( - 25 ; serial - 604800 ; refresh (1 week) - 86400 ; retry (1 day) - 2419200 ; expire (4 weeks) - 60 ; minimum (1 minute) - ) - NS n1.iankelling.org. - NS n2.iankelling.org. - A 73.249.108.7 diff --git a/mail-setup b/mail-setup index a8692ef..b28bedf 100755 --- a/mail-setup +++ b/mail-setup @@ -168,7 +168,7 @@ smarthost="$mxhost::$mxport" ## * Install packages # light version of exim does not have sasl auth support. -pi exim4-daemon-heavy spamassassin spf-tools-perl openvpn dnsmasq +pi exim4-daemon-heavy spamassassin spf-tools-perl openvpn # trisquel 8 = openvpn, debian stretch = openvpn-client vpn_ser=openvpn-client @@ -624,7 +624,9 @@ EOF /a/exe/cedit mail /etc/dnsmasq-servers.conf <<'EOF' || [[ $? == 1 ]] server=/mail.iankelling.org/127.0.1.1 EOF - systemctl reload dnsmasq + if systemctl is-active dnsmasq >/dev/null; then + systemctl reload dnsmasq + fi # I used to use debconf-set-selections + dpkg-reconfigure, # which then updates this file -- 2.30.2