From 365e476b82fe9227f704f1849f2ba008b19a6279 Mon Sep 17 00:00:00 2001 From: DarkFeather Date: Tue, 21 Oct 2025 13:54:23 -0500 Subject: [PATCH] Update for internal subdomains as well as external --- bin/generate-pihole-dns-dhcp.py | 2 +- examples/msn0.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/generate-pihole-dns-dhcp.py b/bin/generate-pihole-dns-dhcp.py index bf8eda5..bc819f4 100755 --- a/bin/generate-pihole-dns-dhcp.py +++ b/bin/generate-pihole-dns-dhcp.py @@ -62,7 +62,7 @@ def GenerateFiles(file): dhcpfile.write('dhcp-range='+content['all']['vars']['staticrange']+'\n') WriteDHCPEntries(dhcpfile) with open(dnsfilepath,'w') as dnsfile: - dnsfile.write(content['all']['vars']['webfront']+' '+external_domain+' '+content['all']['vars']['external_subdomains'].replace(' ','.'+external_domain+' ')+'.'+external_domain+' '+content['all']['vars']['hosted_domains']+"\n") + dnsfile.write(content['all']['vars']['webfront']+' '+external_domain+' '+content['all']['vars']['internal_subdomains'].replace(' ','.'+external_domain+' ')+'.'+external_domain+' '+content['all']['vars']['external_subdomains'].replace(' ','.'+external_domain+' ')+'.'+external_domain+' '+content['all']['vars']['hosted_domains']+"\n") WriteDNSEntries(dnsfile) print('Files should be in '+rolepath); diff --git a/examples/msn0.yml b/examples/msn0.yml index c62fc8c..8ef73a6 100644 --- a/examples/msn0.yml +++ b/examples/msn0.yml @@ -3,10 +3,12 @@ all: # Environment-wide data external_domain: "aninix.net" external_subdomains: "cyberbrain foundation irc lykos maat password sharingan singularity superintendent www yggdrasil" + internal_subdomains: "ircservices" hosted_domains: "travelpawscvt.com" replica_domain: "MSN0.AniNIX.net" time_zone: "America/Chicago" # Services used by all + main_subnet: 10.0.1.0 router: 10.0.1.1 netmask: 24 dhcprange: '10.0.1.224,10.0.1.254,255.255.255.0,12h'