diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | cobbler.spec | 4 | ||||
| -rw-r--r-- | cobbler/action_reposync.py | 12 | ||||
| -rw-r--r-- | setup.py | 2 |
6 files changed, 16 insertions, 7 deletions
@@ -13,6 +13,7 @@ Patches and other contributions from: Tru Huynh <tru@pasteur.fr> Matt Hyclak <hyclak@math.ohiou.edu> Mihai Ibanescu <mihai.ibanescu@gmail.com> + Vito Laurenza <vitolaurenza@gmail.com> Adrian Likins <alikins@redhat.com> David Lutterkort <dlutter@redhat.com> Jim Meyering <jim@meyering.net> @@ -1,8 +1,9 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) -* Fri Feb 22 2008 - 0.8.3 +- Mon Mar 10 2008 - 0.9.0 - Make createrepo get run for local cobbler reposync invocations as needed +- patch to allow yumopts to override gpgcheck * Fri Feb 22 2008 - 0.8.2 - fix to webui to allow repos to be edited there on profile page diff --git a/MANIFEST.in b/MANIFEST.in index 357cdcc..ed1d412 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -21,7 +21,6 @@ include scripts/index.py include scripts/cobblerd include scripts/findks.cgi include scripts/nopxe.cgi -include scripts/webui.cgi include scripts/gateway.py include scripts/post_install_trigger.cgi include scripts/cobbler_auth_help diff --git a/cobbler.spec b/cobbler.spec index e56d298..4b90755 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.8.2 +Version: 0.9.0 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,7 +190,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -* Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1 +* Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1 - Upstream changes (see CHANGELOG) * Wed Feb 20 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.1-1 diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py index 32d38bd..c86e0be 100644 --- a/cobbler/action_reposync.py +++ b/cobbler/action_reposync.py @@ -235,6 +235,8 @@ class RepoSync: config_file = open(fname, "w+") config_file.write("[%s]\n" % repo.name) config_file.write("name=%s\n" % repo.name) + optenabled = False + optgpgcheck = False if output: line = "baseurl=http://${server}/cobbler/repo_mirror/%s\n" % (repo.name) config_file.write(line) @@ -242,15 +244,21 @@ class RepoSync: # add them to the file for x in repo.yumopts: config_file.write("%s=%s\n" % (x, repo.yumopts[x])) + if x == "enabled": + optenabled = True + if x == "gpgcheck": + optgpgcheck = True else: line = "baseurl=%s\n" % repo.mirror http_server = "%s:%s" % (self.settings.server, self.settings.http_port) line = line.replace("@@server@@",http_server) config_file.write(line) - config_file.write("enabled=1\n") + if not optenabled: + config_file.write("enabled=1\n") config_file.write("priority=%s\n" % repo.priority) # FIXME: potentially might want a way to turn this on/off on a per-repo basis - config_file.write("gpgcheck=0\n") + if not optgpgcheck: + config_file.write("gpgcheck=0\n") config_file.close() return fname @@ -4,7 +4,7 @@ import sys from distutils.core import setup, Extension import string -VERSION = "0.8.2" +VERSION = "0.9.0" SHORT_DESC = "Network Boot and Update Server" LONG_DESC = """ Cobbler is a network boot and update server. Cobbler supports PXE, provisioning virtualized images, and reinstalling existing Linux machines. The last two modes require a helper tool called 'koan' that integrates with cobbler. Cobbler's advanced features include importing distributions from DVDs and rsync mirrors, kickstart templating, integrated yum mirroring, and built-in DHCP Management. Cobbler has a Python API for integration with other GPL systems management applications. |