Browse Source

Removed config again; got to messy. Possibly write these as a collectiong later

root 6 years ago
parent
commit
e9197fae6c
2 changed files with 26 additions and 26 deletions
  1. 26 4
      dnssec-signer
  2. 0 22
      dnssec-signer-config

+ 26 - 4
dnssec-signer

@@ -29,8 +29,27 @@
 
 SELF="$(basename ${0})"
 
-# EDIT CONFIGURATION BEFORE START
-source ./dnssec-signer-config
+######################################################
+# 		  START OF CONFIG		     #
+######################################################
+# SET YOU SYSTEM SPECIFIC DATA (which systemctl e.g) #
+
+NAMEDZONES="/etc/bind/named.conf.local"
+ZONESDIR="/etc/bind/zones"
+CHECKZONE=/usr/sbin/named-checkzone
+CHECKCONF=/usr/sbin/named-checkconf
+KEYGEN=/usr/sbin/dnssec-keygen
+SIGNZONE=/usr/sbin/dnssec-signzone
+SYSCTL=/bin/systemctl
+JOURCTL=/bin/journalctl
+DNSSERVICE="bind9.service"
+LOGGER=/usr/bin/logger
+LOGGERFLAGN="-t $(whoami) -p daemon.info"
+LOGGERFLAGE="-t $(whoami) -p daemon.err"
+
+######################################################
+# 	   	    END OF CONFIG		     #
+######################################################
 
 function error_msg {
 	FOR=${1}
@@ -174,7 +193,7 @@ ZONES="${*}"
 IFS=' ', read -r -a ZONES <<< "${ZONES}"
 
 if [ ${#ZONES[@]} -ne 0 ]; then
-	error_msg "${#ZONES[@]}" "Start signing zones"  
+	note_msg "${#ZONES[@]}" "Start signing zones"  
 	ERR=0
 	for ZONE in "${ZONES[@]}"; do
 		signzone "${ZONE}"
@@ -189,8 +208,11 @@ if [ ${#ZONES[@]} -ne 0 ]; then
 		if [ $? -ne 0 ]; then
 			error_msg "${CHECKCONF}" "Error in configruation, not reloading"
 		else
-			note_msg "${SYSCTL}" "Restarting ${DNSSERVICE}"
+			note_msg "$(basename ${SYSCTL})" "Restarting ${DNSSERVICE}"
 			${SYSCTL} restart "${DNSSERVICE}"
+			if [ $? -ne 0 ]; then
+				${JOURCTL} -n 10 --unit "${DNSSERVICE}" | xargs -0
+			fi
 		fi
 	else
 		error_msg "${DNSSERVICE}" "Errors in configuration(s) for zone(s), not restarting."

+ 0 - 22
dnssec-signer-config

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################
-# 		  START OF CONFIG		     #
-######################################################
-# SET YOU SYSTEM SPECIFIC DATA (which systemctl e.g) #
-
-NAMEDZONES="/etc/bind/named.conf.local"
-ZONESDIR="/etc/bind/zones"
-CHECKZONE=/usr/sbin/named-checkzone
-CHECKCONF=/usr/sbin/named-checkconf
-KEYGEN=/usr/sbin/dnssec-keygen
-SIGNZONE=/usr/sbin/dnssec-signzone
-SYSCTL=/bin/systemctl
-DNSSERVICE="bind9.service"
-LOGGER=/usr/bin/logger
-LOGGERFLAGN="-t $(whoami) -p daemon.info"
-LOGGERFLAGE="-t $(whoami) -p daemon.err"
-
-######################################################
-# 	   	    END OF CONFIG		     #
-######################################################