Merge branch 'devel'

Conflicts:

	cobbler.spec
	cobbler/item_system.py
	cobbler/webui/master.py

3 files changed, 41 insertions, 1 deletions

diff --git a/triggers/restart-services.trigger b/triggers/restart-services.trigger
index b65b825..d586f46 100644
--- a/triggers/restart-services.trigger
+++ b/triggers/restart-services.trigger
@@ -4,19 +4,29 @@ 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()
 manage_dhcp_mode = str(settings.manage_dhcp_mode).lower()
+manage_dns = str(settings.manage_dns).lower()
+omapi_enabled = settings.omapi_enabled
+omapi_port = settings.omapi_port
 
 rc = 0
 if manage_dhcp != "0":
     if manage_dhcp_mode == "isc":
-        rc = os.system("/sbin/service dhcpd restart")
+        if not omapi_enabled:
+            rc = os.system("/sbin/service dhcpd restart")
     elif manage_dhcp_mode == "dnsmasq":
         rc = os.system("/sbin/service dnsmasq restart")
     else:
         print "- error: unknown DHCP engine: %s" % manage_dhcp_mode
         rc = 411
 
+if manage_dns != "0":
+    rc = os.system("/sbin/service named restart")
+
 sys.exit(rc)
+
diff --git a/triggers/status_post.trigger b/triggers/status_post.trigger
new file mode 100644
index 0000000..f69afe2
--- /dev/null
+++ b/triggers/status_post.trigger
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+
+import os
+import sys
+import time
+
+objtype = sys.argv[1] # "system" or "profile"
+name    = sys.argv[2] # name of system or profile
+ip      = sys.argv[3] # ip or "?"
+
+fd = open("/var/log/cobbler/install.log","a+")
+fd.write("%s\t%s\t%s\tstop\t%s\n" % (objtype,name,ip,time.time()))
+fd.close()
+
+sys.exit(0)
diff --git a/triggers/status_pre.trigger b/triggers/status_pre.trigger
new file mode 100644
index 0000000..95df1fb
--- /dev/null
+++ b/triggers/status_pre.trigger
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+
+import os
+import sys
+import time
+
+objtype = sys.argv[1] # "system" or "profile"
+name    = sys.argv[2] # name of system or profile
+ip      = sys.argv[3] # ip or "?"
+
+fd = open("/var/log/cobbler/install.log","a+")
+fd.write("%s\t%s\t%s\tstart\t%s\n" % (objtype,name,ip,time.time()))
+fd.close()
+
+sys.exit(0)