From 7eb0fa0be305d1d682b29aaff6dde267402a9e6a Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 2 May 2008 11:51:33 -0400 Subject: Apply Pablo's patch to add OMAPI support to dhcp config generation. --- triggers/restart-services.trigger | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'triggers/restart-services.trigger') diff --git a/triggers/restart-services.trigger b/triggers/restart-services.trigger index b65b825..6a0e320 100644 --- a/triggers/restart-services.trigger +++ b/triggers/restart-services.trigger @@ -8,11 +8,19 @@ bootapi = capi.BootAPI() settings = bootapi.settings() manage_dhcp = str(settings.manage_dhcp).lower() manage_dhcp_mode = str(settings.manage_dhcp_mode).lower() +omapi = settings.omapi +omapi_port = settings.omapi_port + + + +# We're just going to restart DHCPD if using ISC and if not using OMAPI at all rc = 0 if manage_dhcp != "0": if manage_dhcp_mode == "isc": - rc = os.system("/sbin/service dhcpd restart") + if not omapi: + if not omapi_port: + rc = os.system("/sbin/service dhcpd restart") elif manage_dhcp_mode == "dnsmasq": rc = os.system("/sbin/service dnsmasq restart") else: -- cgit From 82f4bb814835a8aadcfe5cbba8bfbc4359c34b39 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 2 May 2008 11:58:36 -0400 Subject: Apply John Eckersberg's patch for BIND management. --- triggers/restart-services.trigger | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'triggers/restart-services.trigger') diff --git a/triggers/restart-services.trigger b/triggers/restart-services.trigger index 6a0e320..24fc033 100644 --- a/triggers/restart-services.trigger +++ b/triggers/restart-services.trigger @@ -8,13 +8,13 @@ bootapi = capi.BootAPI() settings = bootapi.settings() manage_dhcp = str(settings.manage_dhcp).lower() manage_dhcp_mode = str(settings.manage_dhcp_mode).lower() +manage_dns = str(settings.manage_dns).lower() omapi = settings.omapi omapi_port = settings.omapi_port # We're just going to restart DHCPD if using ISC and if not using OMAPI at all - rc = 0 if manage_dhcp != "0": if manage_dhcp_mode == "isc": @@ -27,4 +27,11 @@ if manage_dhcp != "0": print "- error: unknown DHCP engine: %s" % manage_dhcp_mode rc = 411 +if rc != 0: + sys.exit(rc) + +if manage_dns != "0": + rc = os.system("/sbin/service named restart") + sys.exit(rc) + -- cgit From 13eff0d1bb7e36569a00bcd291d73781ab2351e4 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 2 May 2008 12:41:20 -0400 Subject: Adjusting the dhcp patch some, prior to moving it all into modules/ --- triggers/restart-services.trigger | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'triggers/restart-services.trigger') diff --git a/triggers/restart-services.trigger b/triggers/restart-services.trigger index 24fc033..bc7c36e 100644 --- a/triggers/restart-services.trigger +++ b/triggers/restart-services.trigger @@ -9,7 +9,7 @@ settings = bootapi.settings() manage_dhcp = str(settings.manage_dhcp).lower() manage_dhcp_mode = str(settings.manage_dhcp_mode).lower() manage_dns = str(settings.manage_dns).lower() -omapi = settings.omapi +omapi_enabled = settings.omapi_enabled omapi_port = settings.omapi_port @@ -18,7 +18,7 @@ omapi_port = settings.omapi_port rc = 0 if manage_dhcp != "0": if manage_dhcp_mode == "isc": - if not omapi: + if not omapi_enabled: if not omapi_port: rc = os.system("/sbin/service dhcpd restart") elif manage_dhcp_mode == "dnsmasq": -- cgit From 19e53e8ad1a6889d020c6029d2d34273dacdc750 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 5 May 2008 14:46:37 -0400 Subject: Always restart dhcp seperate from dns. --- triggers/restart-services.trigger | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'triggers/restart-services.trigger') diff --git a/triggers/restart-services.trigger b/triggers/restart-services.trigger index bc7c36e..d586f46 100644 --- a/triggers/restart-services.trigger +++ b/triggers/restart-services.trigger @@ -4,6 +4,8 @@ import cobbler.api as capi import os import sys +#!/usr/bin/python + bootapi = capi.BootAPI() settings = bootapi.settings() manage_dhcp = str(settings.manage_dhcp).lower() @@ -12,14 +14,10 @@ manage_dns = str(settings.manage_dns).lower() omapi_enabled = settings.omapi_enabled omapi_port = settings.omapi_port - - -# We're just going to restart DHCPD if using ISC and if not using OMAPI at all rc = 0 if manage_dhcp != "0": if manage_dhcp_mode == "isc": if not omapi_enabled: - if not omapi_port: rc = os.system("/sbin/service dhcpd restart") elif manage_dhcp_mode == "dnsmasq": rc = os.system("/sbin/service dnsmasq restart") @@ -27,9 +25,6 @@ if manage_dhcp != "0": print "- error: unknown DHCP engine: %s" % manage_dhcp_mode rc = 411 -if rc != 0: - sys.exit(rc) - if manage_dns != "0": rc = os.system("/sbin/service named restart") -- cgit