diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-02-15 14:54:25 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-02-15 14:54:25 -0500 |
| commit | a47ee22ab684eed992128b60b136fca90ff9f119 (patch) | |
| tree | cd55daf8057049368b4aaa6d23c30408eae411d2 /config/settings | |
| parent | 70bfc8f5a3150d09cc064a4c46efcaff80b29904 (diff) | |
| parent | a7d67f35019af0c25f133c979112fc6035d7e04c (diff) | |
| download | third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.tar.gz third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.tar.xz third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.zip | |
Merge branch 'devel'
Merging devel work on 0.7.X/0.8 release with master
Conflicts:
CHANGELOG
cobbler.spec
cobbler/action_import.py
cobbler/utils.py
cobbler/webui/master.py
setup.py
Diffstat (limited to 'config/settings')
| -rw-r--r-- | config/settings | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/settings b/config/settings index 85d6395..c006cb3 100644 --- a/config/settings +++ b/config/settings @@ -5,11 +5,15 @@ bootloaders: default_kickstart: /etc/cobbler/default.ks default_virt_bridge: xenbr0 default_virt_type: auto +default_virt_file_size: 5 +default_virt_ram: 512 dhcpd_bin: /usr/sbin/dhcpd dhcpd_conf: /etc/dhcpd.conf dnsmasq_bin: /usr/sbin/dnsmasq dnsmasq_conf: /etc/dnsmasq.conf httpd_bin: /usr/sbin/httpd +http_port: 80 +kerberos_realm: 'example.org' kernel_options: ksdevice: eth0 lang: ' ' @@ -18,6 +22,7 @@ manage_dhcp: 0 manage_dhcp_mode: isc next_server: '127.0.0.1' pxe_just_once: 0 +run_post_install_trigger: 0 server: '127.0.0.1' snippetsdir: /var/lib/cobbler/snippets syslog_port: 25150 |