Unterschiede

Hier werden die Unterschiede zwischen zwei Versionen angezeigt.

--- know-how:firewall [2022/02/21 13:07] – [Blocks - Multi - IPSET] cc
+++ know-how:firewall [2022/02/21 13:20] – [Blocks - Multi - IPSET] cc
@@ Zeile 1371: / Zeile 1371: @@
   *  www-data muss dnsmasq neu starten können zB: visudo -> www-data  ALL=(ALL)NOPASSWD:/usr/sbin/service dnsmasq restart / und die entsprechenden Berechtigungen für das Set File besitzen unter /etc/dnsmasq.d/ipset-foo.conf
   * **Achtung:** Wenn es eine Vielzahl an Sets gibt die mit dnsmasq befüllt werden sollen muss auf die dnsmasq Syntax geachtet werden **ipset=/hostname/set1/set2/set3** und nicht jeweils eine extra Datei für set1, set2, set3
+  * **merge-ipsets.sh**
+<code>
+#!/bin/bash
+function bailout
+{
+        echo -e "$1" >&2
+        exit 2
+}
+which dnsmasq >/dev/null || bailout "Cannot find dnsmasq binary"
+LOCATION_DNSMASQS="/etc/dnsmasq.conf /etc/dnsmasq.d/*"
+TMP_LOCATION=$(mktemp)
+FINAL_LOCATION="/etc/dnsmasq.d/ipset-master.conf"
+if [ ! -w $FINAL_LOCATION ]
+then
+	rm $TMP_LOCATION
+	bailout "FAIL: Final config file: $FINAL_LOCATION cannot be written to "
+fi
+grep -h  "^ipset=" $LOCATION_DNSMASQS  | cut -d"/" -f"2" | sort | uniq -c  | while read hosts ;
+do
+	nr_matches=$(echo $hosts | awk '{print $1}')
+	host_entry=$(echo $hosts | awk '{print $2}')
+        if (($nr_matches > 1 ))  &&  [ -n $host_entry ] ;
+	then
+                 build_entry="ipset=/$host_entry"
+		 while read found_sets
+		 do
+			 build_entry+="/$found_sets"
+		 done <<< $(grep -h "^ipset=/$host_entry/" $LOCATION_DNSMASQS | cut -d"/" -f 3- | tr "/" "\n" | sort | uniq )
+		echo $build_entry >> $TMP_LOCATION
+                echo $build_entry
+	fi
+done
+filesize_tmp=$(stat -c %s $TMP_LOCATION)
+if [ $filesize_tmp == "0" ]
+then
+rm $TMP_LOCATION
+echo "No double ipsets found in $LOCATION_DNSMASQS"
+exit 0
+fi
+cmp -s $TMP_LOCATION $FINAL_LOCATION
+compare_ret="$?"
+if [ $compare_ret == "0" ]
+then
+	rm $TMP_LOCATION
+        echo "Current ipsets have already been merged"
+	exit 0
+fi
+dnsmasq --test --conf-file=$TMP_LOCATION
+ipset_tests="$?"
+if [ $ipset_tests != "0" ]
+then
+	rm $TMP_LOCATION
+	bailout "FAIL: Malformed config file: $TMP_LOCATION"
+fi
+#2022-02-21 cc: Keep Ownership intact
+cat $TMP_LOCATION > $FINAL_LOCATION
+rm $TMP_LOCATION
+systemctl reload dnsmasq || bailout "FAIL: Cannot reload dnsmasq"
+exit 0
+</code>
+  * {{ :know-how:ipset-master.zip |}}
 ===== Blocks - IPSET =====