summaryrefslogtreecommitdiffstats
path: root/cobbler/settings.py
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-06-25 14:58:20 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-06-25 14:58:20 -0400
commit1e7b1b8ba5a982ca801a4d8246934a2315dd5931 (patch)
treeeb9138807fdb1b68143ac7bcf89828b2e8c3d003 /cobbler/settings.py
parent449e841102ab32c88c3559b92069ba648bd61a8d (diff)
downloadthird_party-cobbler-1e7b1b8ba5a982ca801a4d8246934a2315dd5931.tar.gz
third_party-cobbler-1e7b1b8ba5a982ca801a4d8246934a2315dd5931.tar.xz
third_party-cobbler-1e7b1b8ba5a982ca801a4d8246934a2315dd5931.zip
Remove references to manage_dhcp_mode and manage_dns_mode as this is governed by modules.conf, and rewrite the restart-services trigger to understand restart_dhcp and restart_dns variables, which are now mentioned in the settings file. Also, clean up the tests so they work more nicely on F9, and remove some unused lines from the Makefile.
Diffstat (limited to 'cobbler/settings.py')
-rw-r--r--cobbler/settings.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cobbler/settings.py b/cobbler/settings.py
index 4670ab0..bd5b0d3 100644
--- a/cobbler/settings.py
+++ b/cobbler/settings.py
@@ -58,7 +58,6 @@ DEFAULTS = {
"ksdevice" : "eth0"
},
"manage_dhcp" : 0,
- "manage_dhcp_mode" : "isc",
"manage_dns" : 0,
"manage_forward_zones" : [],
"manage_reverse_zones" : [],
@@ -69,6 +68,8 @@ DEFAULTS = {
"omshell_bin" : "/usr/bin/omshell",
"pxe_just_once" : 0,
"register_new_installs" : 0,
+ "restart_dns" : 1,
+ "restart_dhcp" : 1,
"run_install_triggers" : 1,
"server" : "127.0.0.1",
"snippetsdir" : "/var/lib/cobbler/snippets",