Fixed managePDNS: select pdns.conf path according to OS; removed unnecessary /32; Move temp file to pdns.conf

manageServices/serviceManager.py

@@ -22,7 +22,11 @@ class ServiceManager:
 
     def managePDNS(self):
         type = self.extraArgs['type']
-        path = '/etc/pdns/pdns.conf'
+
+        if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
+            path = '/etc/pdns/pdns.conf'
+        else:
+            path = '/etc/powerdns/pdns.conf'
 
         data = ProcessUtilities.outputExecutioner('sudo cat ' + path).splitlines()
         #data = subprocess.check_output(shlex.split('sudo cat ' + path)).decode("utf-8").splitlines()
@@ -35,8 +39,9 @@ class ServiceManager:
             ipStringNoSubnet = ''
 
             for items in SlaveServers.objects.all():
-                ipsString = ipsString + '%s/32, ' % (items.slaveServerIP)
-                ipStringNoSubnet = ipStringNoSubnet + '%s, ' % (items.slaveServerIP)
+                if items.slaveServerIP:
+                    ipsString = ipsString + '%s/32, ' % (items.slaveServerIP)
+                    ipStringNoSubnet = ipStringNoSubnet + '%s, ' % (items.slaveServerIP)
 
             ipsString = ipsString.rstrip(', ')
             ipStringNoSubnet = ipStringNoSubnet.rstrip(', ')
@@ -74,6 +79,9 @@ class ServiceManager:
             writeToFile.writelines('disable-axfr=no\n')
             writeToFile.writelines('master=yes\n')
             writeToFile.close()
+
+            command = 'sudo mv ' + tempPath + ' ' + path
+            ProcessUtilities.executioner(command)
         else:
             import os
 
@@ -110,18 +118,18 @@ class ServiceManager:
                     writeToFile.writelines(items  + '\n')
 
                 slaveData = """
-slave=yes
-daemon=yes
-disable-axfr=yes
-guardian=yes
-local-address=0.0.0.0
-local-port=53
-master=no
-slave-cycle-interval=60
-setgid=pdns
-setuid=pdns
-superslave=yes        
-"""
+                slave=yes
+                daemon=yes
+                disable-axfr=yes
+                guardian=yes
+                local-address=0.0.0.0
+                local-port=53
+                master=no
+                slave-cycle-interval=60
+                setgid=pdns
+                setuid=pdns
+                superslave=yes        
+                """
 
                 writeToFile.writelines(slaveData)
                 writeToFile.close()
@@ -146,14 +154,14 @@ superslave=yes
             repoPath = '/etc/yum.repos.d/elasticsearch.repo'
 
             content = '''[elasticsearch]
-name=Elasticsearch repository for 7.x packages
-baseurl=https://artifacts.elastic.co/packages/7.x/yum
-gpgcheck=1
-gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
-enabled=0
-autorefresh=1
-type=rpm-md
-'''
+            name=Elasticsearch repository for 7.x packages
+            baseurl=https://artifacts.elastic.co/packages/7.x/yum
+            gpgcheck=1
+            gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
+            enabled=0
+            autorefresh=1
+            type=rpm-md
+            '''
 
             writeToFile = open(repoPath, 'w')
             writeToFile.write(content)
@@ -316,5 +324,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
-
+    main()