Fixing text

bin/generate-pihole-dns-dhcp.py

@@ -4,7 +4,7 @@
 # Description: This file generates the DNS and DHCP files for pihole.
 #     It expects that the inventory has two levels of grouping.
 #
-# Package: AniNIX/Ubiqtorate
+# Package: AniNIX/Kapisi
 # Copyright: WTFPL
 #
 # Author: DarkFeather <darkfeather@aninix.net>
@@ -20,7 +20,7 @@ dnsfilepath=rolepath+"/dns"
 dhcpfilepath=rolepath+"/dhcp"
 entryset={}
 
-def WriteDHCPEntries(replica_domain,dhcpfile):
+def WriteDHCPEntries(dhcpfile):
     ### Create the DHCP entry
     # param content: the yaml content to parse
     # param hosttype: managed or unmanaged
@@ -29,9 +29,9 @@ def WriteDHCPEntries(replica_domain,dhcpfile):
     for host in entryset:
         # Entries should be:
         # dhcp-host=mac,ip,fqdn
-        dhcpfile.write('dhcp-host=' + entryset[host][1] + ',' + entryset[host][0] + ',' + host + '.' + replica_domain + '\n')
+        dhcpfile.write('dhcp-host=' + entryset[host][1] + ',' + entryset[host][0] + ',' + entryset[host][2] + '\n')
 
-def WriteDNSEntries(replica_domain,dnsfile):
+def WriteDNSEntries(dnsfile):
     ### Create the DNS entry
     # param content: the yaml content to parse
     # param hosttype: managed or unmanaged
@@ -40,7 +40,7 @@ def WriteDNSEntries(replica_domain,dnsfile):
     for host in entryset:
         # Entries should be:
         # ip host fqdn
-        dnsfile.write(entryset[host][0] + ' ' + host + '.' + replica_domain + ' ' + host + '\n')
+        dnsfile.write(entryset[host][0] + ' ' + entryset[host][2] + ' ' + host + '\n')
 
 def GenerateFiles(file):
     ### Open the file and parse it
@@ -53,7 +53,6 @@ def GenerateFiles(file):
     # Parse the yaml
     with open(file, 'r') as stream:
         content = yaml.safe_load(stream)
-        replica_domain = content['all']['vars']['replica_domain']
         external_domain = content['all']['vars']['external_domain']
 
         # Clear the DNS file
@@ -61,10 +60,10 @@ def GenerateFiles(file):
             dhcpfile.write('dhcp-range='+content['all']['vars']['dhcprange']+'\n')
             dhcpfile.write('dhcp-option=option:dns-server,'+content['all']['vars']['dns']+'\n\n')
             dhcpfile.write('dhcp-range='+content['all']['vars']['staticrange']+'\n')
-            WriteDHCPEntries(replica_domain,dhcpfile)
+            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")
-            WriteDNSEntries(replica_domain,dnsfile)
+            WriteDNSEntries(dnsfile)
             print('Files should be in '+rolepath);
 
 ### Main function