Liderahenk/Ahenk
1
0
Fork 0
mirror of https://github.com/Pardus-LiderAhenk/ahenk synced 2024-11-25 20:32:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

fqdn bug fixed

Browse source
This commit is contained in:
agahhulusi 2021-03-18 10:49:44 +03:00
parent a37a71791a
commit a36aca1433
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/base/registration/execute_cancel_sssd_ad_authentication.py
View file

@ -4,6 +4,7 @@
from base.scope import Scope from base.scope import Scope
from base.util.util import Util from base.util.util import Util
from base.system.system import System
import re import re
class ExecuteCancelSSSDAdAuthentication: class ExecuteCancelSSSDAdAuthentication:
@ -11,6 +12,7 @@ class ExecuteCancelSSSDAdAuthentication:
scope = Scope().get_instance() scope = Scope().get_instance()
self.logger = scope.get_logger() self.logger = scope.get_logger()
self.util = Util() self.util = Util()
self.system = System()
self.ad_info_path = "/etc/ahenk/ad_info" self.ad_info_path = "/etc/ahenk/ad_info"
def cancel(self): def cancel(self):
@ -21,8 +23,10 @@ class ExecuteCancelSSSDAdAuthentication:
file_data = self.util.read_file_by_line(self.ad_info_path) file_data = self.util.read_file_by_line(self.ad_info_path)
self.ip_address = file_data[0].strip("\n") self.ip_address = file_data[0].strip("\n")
self.host_name = file_data[1].strip("\n") self.host_name = file_data[1].strip("\n")
self.domain_name = file_data[2].strip("\n")
self.logger.info(self.ip_address) self.logger.info(self.ip_address)
self.logger.info(self.host_name) self.logger.info(self.host_name)
self.logger.info(self.domain_name)
self.logger.info("Information read successfully from ad_info.") self.logger.info("Information read successfully from ad_info.")
else: else:
self.logger.error("ad_info file not found") self.logger.error("ad_info file not found")
@ -51,17 +55,23 @@ class ExecuteCancelSSSDAdAuthentication:
file_dhclient.write(file_data) file_dhclient.write(file_data)
file_dhclient.close() file_dhclient.close()
# Configure hosts for deleting AD "IP address" and "AD hostname" # Configure hosts for deleting AD "IP address" and "AD hostname"
hosts_conf_path = "/etc/hosts" hosts_conf_path = "/etc/hosts"
file_hosts = open(hosts_conf_path, 'r') file_hosts = open(hosts_conf_path, 'r')
file_data = file_hosts.read() file_data = file_hosts.read()
if ("{0} {1}".format(self.ip_address, self.host_name)) in file_data: if ("{0} {1}".format(self.ip_address, self.domain_name)) in file_data:
file_data = file_data.replace(("{0} {1}".format(self.ip_address, self.host_name)), " ") file_data = file_data.replace(("{0} {1}".format(self.ip_address, self.domain_name)), " ")
self.logger.info("hosts is configured") self.logger.info("hosts is deleted")
else: else:
self.logger.error("hosts is not configured") self.logger.error("hosts domain is not deleted")
if ("{0} {1}".format(self.ip_address, self.host_name)) in file_data:
file_data = file_data.replace(("{0} {1}".format(self.ip_address, self.host_name)), " ")
self.logger.info("hosts is deleted")
else:
self.logger.error("hosts hostname is not deleted")
file_hosts.close() file_hosts.close()
file_hosts = open(hosts_conf_path, 'w') file_hosts = open(hosts_conf_path, 'w')
file_hosts.write(file_data) file_hosts.write(file_data)

6
src/base/registration/execute_sssd_ad_authentication.py
View file

@ -101,12 +101,6 @@ class ExecuteSSSDAdAuthentication:
file_default_hosts = open(host_path, 'r') file_default_hosts = open(host_path, 'r')
file_data = file_default_hosts.read() file_data = file_default_hosts.read()
if ("{0} {1}.{2} {1}".format("127.0.1.1",self.system.Os.hostname(),domain_name)) not in file_data:
file_data = file_data + "\n" + ("{0} {1}.{2} {1}".format("127.0.1.1",self.system.Os.hostname(),domain_name))
self.logger.info("FQDN is configured")
else:
self.logger.info("FQDN is not configured")
if ("{0} {1}".format(ip_address, host_name)) not in file_data: if ("{0} {1}".format(ip_address, host_name)) not in file_data:
file_data = file_data + "\n" + ("{0} {1}".format(ip_address, host_name)) file_data = file_data + "\n" + ("{0} {1}".format(ip_address, host_name))
self.logger.info("/etc/hosts is configured for hostname") self.logger.info("/etc/hosts is configured for hostname")