diff options
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | cobbler/settings.py | 2 | ||||
| -rw-r--r-- | config/settings | 7 | ||||
| -rw-r--r-- | docs/cobbler.pod | 2 |
4 files changed, 18 insertions, 13 deletions
@@ -17,14 +17,18 @@ manpage: pod2html ./docs/cobbler.pod > ./docs/cobbler.html test: devinstall - -mkdir -p /tmp/cobbler_test_bak - -cp /var/lib/cobbler/distros* /tmp/cobbler_test_bak - -cp /var/lib/cobbler/profiles* /tmp/cobbler_test_bak - -cp /var/lib/cobbler/systems* /tmp/cobbler_test_bak - -cp /var/lib/cobbler/repos* /tmp/cobbler_test_bak - -cp /var/lib/cobbler/repos* /tmp/cobbler_test_bak + -rm -rf /tmp/cobbler_test_bak + mkdir -p /tmp/cobbler_test_bak + cp /etc/cobbler/settings /tmp/cobbler_test_bak/settings + cp /etc/cobbler/modules.conf /tmp/cobbler_test_bak/modules.conf + cp -a /var/lib/cobbler/config /tmp/cobbler_test_bak/config python tests/tests.py - -cp /tmp/cobbler_test_bak/* /var/lib/cobbler + -rm -rf /var/lib/cobbler/config + -rm /etc/cobbler/settings + -rm /etc/cobbler/modules.conf + cp -a /tmp/cobbler_test_bak/config /var/lib/cobbler/ + cp /tmp/cobbler_test_bak/settings /etc/cobbler/settings + cp /tmp/cobbler_test_bak/modules.conf /etc/cobbler/modules.conf test2: python tests/multi.py @@ -107,7 +111,7 @@ eraseconfig: -rm /var/lib/cobbler/config/distros.d/* -rm /var/lib/cobbler/config/images.d/* -rm /var/lib/cobbler/config/profiles.d/* - -rm /var/lib/cobbler/config/systems.d/ + -rm /var/lib/cobbler/config/systems.d/* -rm /var/lib/cobbler/config/repos.d/* diff --git a/cobbler/settings.py b/cobbler/settings.py index b6e490e0..fd2af0a4 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -39,7 +39,7 @@ DEFAULTS = { "default_virt_type" : "auto", "default_virt_file_size" : "5", "default_virt_ram" : "512", - "default_ownership" : "admin", + "default_ownership" : [ "admin" ], "dhcpd_conf" : "/etc/dhcpd.conf", "dhcpd_bin" : "/usr/sbin/dhcpd", "dnsmasq_bin" : "/usr/sbin/dnsmasq", diff --git a/config/settings b/config/settings index 55d409fd..2a08923d 100644 --- a/config/settings +++ b/config/settings @@ -39,9 +39,10 @@ default_virt_file_size: 5 default_virt_ram: 512 # if using the authz_ownership module (see the Wiki), objects -# created without specifying an owner are assigned to this -# owner and/or group. Can be a comma seperated list. -default_ownership: "admin" +# created without specifying an owner are assigned to these +# owners and/or groups. +default_ownership: + - "admin" # controls whether cobbler will add each new profile entry to the default # PXE boot menu. This can be over-ridden on a per-profile diff --git a/docs/cobbler.pod b/docs/cobbler.pod index 7c2585ad..623b0f11 100644 --- a/docs/cobbler.pod +++ b/docs/cobbler.pod @@ -355,7 +355,7 @@ Specifies that the named repository should not be updated during a normal "cobbl =item mirror-locally -When true, specifies that this yum repo is to be referenced directly via kickstarts and not mirrored locally on the cobbler server. Only http:// and ftp:// mirror urls are supported when using --mirror-locally=1. +When set to "N", specifies that this yum repo is to be referenced directly via kickstarts and not mirrored locally on the cobbler server. Only http:// and ftp:// mirror urls are supported when using --mirror-locally=N, you cannot use filesystem URLs. =item priority |