From 8285bcb4a8e589690db80f5a915ea3d76e0f093b Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Tue, 3 Jun 2008 16:14:01 -0400
Subject: Adding some fields to settings and misc cleanup

---
 CHANGELOG                        | 8 +++-----
 cobbler.spec                     | 7 ++-----
 config/settings                  | 7 +++++++
 setup.py                         | 2 +-
 webui_templates/distro_edit.tmpl | 8 ++++----
 webui_templates/repo_edit.tmpl   | 2 +-
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bd9f4c2..d294041 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,17 +1,15 @@
 Cobbler CHANGELOG
 (all entries mdehaan@redhat.com unless noted otherwise)
 
-- Wed May 27 2008 - 1.1.0
-- start devel branch
-
-- Thr May 28 2008 - 1.0.1
+- Tue Jun 03 2008 - 1.0.1
 - Fix misformatted warning in "check"
-- Do not own tftpboot
+- Do not have RPM own tftpboot, just generate files in TFTP dir as detected
 - Default arches to 'i386' not 'x86' for consistency, esp. in import
 - When querying kickstart templates, do not return directories
 - Make triggers for add/delete work for renames and copies (same triggers)
 - Do not cache snippets so they can be tweaked w/o starting the service
 - Make manpage reference /etc/cobbler/settings, not /var/lib
+- Added manage_forward_zones/manage_reverse_zones to included config file
 
 - Wed May 27 2008 - 1.0.0
 - Merge devel branch onto master, this is 1.0
diff --git a/cobbler.spec b/cobbler.spec
index a5ff732..ba26c08 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.1.0
+Version: 1.0.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -190,10 +190,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-* Thu May 28 2008 Michael DeHaan <mdehaan@redhat.com> - 1.1.0-1
-- Upstream chnages (see CHANGELOG)
-
-* Thu May 28 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.1-1
+* Tue Jun 03 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.1-1
 - Upstream changes (see CHANGELOG)
 - stop owning files in tftpboot
 - condrestart for Apache
diff --git a/config/settings b/config/settings
index b1f7bd7..221241a 100644
--- a/config/settings
+++ b/config/settings
@@ -84,8 +84,15 @@ manage_dhcp: 0
 # the choice of DNS mangement engine is in /etc/cobbler/modules.conf
 manage_dns: 0
 
+# if using BIND (named) for DNS management in /etc/cobbler/modules.conf
+# and manage_dns is enabled (above), this lists which zones are managed
+# See the Wiki (https://fedorahosted.org/cobbler/wiki/ManageDns) for more info
+manage_forward_zones: []
+manage_reverse_zones: []
+
 # if using cobbler with manage_dhcp, put the IP address
 # of the cobbler server here so that PXE booting guests can find it
+# if you do not set this correctly, this will be manifested in TFTP open timeouts.
 next_server: '127.0.0.1'
 
 # if using cobbler with manage_dhcp and ISC, omapi allows realtime DHCP
diff --git a/setup.py b/setup.py
index b314cb2..63c504a 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 from distutils.core import setup, Extension
 import string
 
-VERSION = "1.1.0"
+VERSION = "1.0.1"
 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/DNS Management.  Cobbler also has a Python and XMLRPC API for integration with other applications.
diff --git a/webui_templates/distro_edit.tmpl b/webui_templates/distro_edit.tmpl
index 66e982d..1b9769c 100644
--- a/webui_templates/distro_edit.tmpl
+++ b/webui_templates/distro_edit.tmpl
@@ -50,7 +50,7 @@ function disablename(value)
             value="$distro.name"
         #end if
     />
-    <p class="context-tip">Example: RHEL-5-i386</p>
+    <p class="context-tip">Example: RHEL-5-x86</p>
     </td>
     </tr>
 
@@ -104,10 +104,10 @@ function disablename(value)
     <label for="arch">Architecture</label>
     </td>
     <td>
-    #if $distro and $distro.arch == "i386"
-        <input type="radio"  name="arch" id="arch" value="i386" checked>i386
+    #if $distro and $distro.arch == "x86"
+        <input type="radio"  name="arch" id="arch" value="x86" checked>x86
     #else
-        <input type="radio" name="arch" id="arch" value="i386">i386
+        <input type="radio" name="arch" id="arch" value="x86">x86
     #end if
     #if $distro and $distro.arch == "x86_64"
         <input type="radio" name="arch" id="arch" value="x86_64" checked>x86_64
diff --git a/webui_templates/repo_edit.tmpl b/webui_templates/repo_edit.tmpl
index c259a13..92341a9 100644
--- a/webui_templates/repo_edit.tmpl
+++ b/webui_templates/repo_edit.tmpl
@@ -46,7 +46,7 @@ function disablename(value)
             value="$repo.name"
         #end if
     />
-    <p class="context-tip">Example: EL-5-i386-EPEL-testing</p>
+    <p class="context-tip">Example: EL-5-x86-EPEL-testing</p>
     </td>
     </tr>
 
-- 
cgit