From 134f6113711e8ced404ac24f66b5e4e6aa6c56d4 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 10 Mar 2008 11:40:33 -0400 Subject: Patch to allow overriding gpgcheck, +version bump --- cobbler.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cobbler.spec') 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 - 0.8.2-1 +* Fri Mar 07 2008 Michael DeHaan - 0.9.0-1 - Upstream changes (see CHANGELOG) * Wed Feb 20 2008 Michael DeHaan - 0.8.1-1 -- cgit From a6a82750ac3cab01fbafdd689a7ea1f5f6dc0bf7 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Wed, 26 Mar 2008 12:49:35 -0400 Subject: Updated LDAP and authorization code, plus packaging --- cobbler.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index aa61bd9..c4cc5a0 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -128,6 +128,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/cobbler/rsync.exclude %config(noreplace) /etc/logrotate.d/cobblerd_rotate %config(noreplace) /etc/cobbler/modules.conf +%config(noreplace) /etc/cobbler/users.conf %dir %{python_sitelib}/cobbler %dir %{python_sitelib}/cobbler/yaml %dir %{python_sitelib}/cobbler/modules @@ -190,14 +191,14 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -<<<<<<< HEAD:cobbler.spec -* Fri Mar 07 2008 Michael DeHaan - 0.9.0-1 -======= +* Wed Mar 26 2008 Michael DeHaan - 0.9.0-1 +- Upstream changes (see CHANGELOG) +- packaged /etc/cobbler/users.conf + * Mon Mar 10 2008 Michael DeHaan - 0.8.3-1 - Upstream changes (see CHANGELOG) * Fri Mar 07 2008 Michael DeHaan - 0.8.2-1 ->>>>>>> master:cobbler.spec - Upstream changes (see CHANGELOG) * Wed Feb 20 2008 Michael DeHaan - 0.8.1-1 -- cgit From cdca9443cab19f992e76a205533be0d13c091d47 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 8 Apr 2008 13:11:09 -0400 Subject: Merge. --- cobbler.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index b4e04bd..9e64040 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -191,15 +191,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -<<<<<<< HEAD:cobbler.spec -* Wed Mar 26 2008 Michael DeHaan - 0.9.0-1 +* Tue Apr 08 2008 Michael DeHaan - 0.9.0-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf -* Mon Mar 10 2008 Michael DeHaan - 0.8.3-1 -======= * Tue Apr 08 2008 Michael DeHaan - 0.8.3-1 ->>>>>>> master:cobbler.spec - Upstream changes (see CHANGELOG) * Fri Mar 07 2008 Michael DeHaan - 0.8.2-1 -- cgit From c4a6d241faa677b9dbe9572addcd1148a72ffaba Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Apr 2008 16:24:06 -0400 Subject: merge --- cobbler.spec | 4 ---- 1 file changed, 4 deletions(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index 070bff3..ca6640f 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -191,15 +191,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -<<<<<<< HEAD:cobbler.spec * Tue Apr 08 2008 Michael DeHaan - 0.9.0-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf -* Tue Apr 08 2008 Michael DeHaan - 0.8.3-1 -======= * Tue Apr 08 2008 Michael DeHaan - 0.8.3-2 ->>>>>>> master:cobbler.spec - Upstream changes (see CHANGELOG) * Fri Mar 07 2008 Michael DeHaan - 0.8.2-1 -- cgit From 4e33bffad605c41ebae28142eaf5203b4465f809 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Wed, 9 Apr 2008 16:42:57 -0400 Subject: Two things -- (A) remove rhpl dep as we aren't using it and we want to use more standard xlat for other distros potentially, (B) fix the kerb module some more. --- cobbler.spec | 1 - 1 file changed, 1 deletion(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index ca6640f..2b6c88d 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -14,7 +14,6 @@ Requires: python-devel Requires: createrepo Requires: mod_python Requires: python-cheetah -Requires: rhpl Requires: rsync Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig -- cgit From 51119d1acc532cfad68b9fe4a1daa945fe7cd3f0 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 14 Apr 2008 16:31:08 -0400 Subject: Better kerberos support. See the Wiki. --- cobbler.spec | 1 - 1 file changed, 1 deletion(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index 2b6c88d..9b775cd 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -120,7 +120,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %dir /tftpboot/images %{_bindir}/cobbler %{_bindir}/cobblerd -%{_bindir}/cobbler_auth_help %dir /etc/cobbler %config(noreplace) /etc/cobbler/*.ks %config(noreplace) /etc/cobbler/*.template -- cgit From 2ccbb4b130afac3d1707433b3988259ea109db7f Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 15 Apr 2008 17:34:50 -0400 Subject: Replaced the existing cobbler pre/post install triggers system with a much more flexible model that (for each system) passes in the following. First arg: the word "system" or "profile", Second arg: the name of the said system or profile, Third: the MAC if available, Fourth: the IP. This is all logged by a default "status" trigger to /var/log/cobbler/install.log, for being read by the soon-to-be-revamped cobbler check. The check system logs all of this in order, followed by the word "start" or "stop", followed by the number of seconds since Epoch. --- cobbler.spec | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index 9b775cd..5e63f48 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -163,11 +163,14 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %dir /var/lib/cobbler/triggers/delete/repo/post %dir /var/lib/cobbler/triggers/sync/pre %dir /var/lib/cobbler/triggers/sync/post +%dir /var/lib/cobbler/triggers/install/pre %dir /var/lib/cobbler/triggers/install/post %dir /var/lib/cobbler/snippets/ %defattr(744,root,root) %config(noreplace) /var/lib/cobbler/triggers/sync/post/restart-services.trigger +%config(noreplace) /var/lib/cobbler/triggers/install/pre/status_pre.trigger +%config(noreplace) /var/lib/cobbler/triggers/install/post/status_post.trigger %defattr(664,root,root) %config(noreplace) /var/lib/cobbler/settings -- cgit From efbcc041464733e90af670a5d1dfe13e70aaa05c Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 18 Apr 2008 17:31:26 -0400 Subject: Kickstarts are now dynamically generated by mod_python, CGI's now fall under mod_python, kickstart templating code now moved out of sync function. --- cobbler.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index 5e63f48..7b4e525 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -83,8 +83,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %defattr(755,apache,apache) %dir /var/www/cobbler/web/ /var/www/cobbler/web/*.py* -%dir /var/www/cgi-bin/cobbler/ -/var/www/cgi-bin/cobbler/*.cgi +%dir /var/www/cobbler/svc/ +/var/www/cobbler/svc/*.py* %defattr(755,apache,apache) %dir /usr/share/cobbler/webui_templates @@ -195,6 +195,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT * Tue Apr 08 2008 Michael DeHaan - 0.9.0-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf +- remaining CGI replaced with mod_python * Tue Apr 08 2008 Michael DeHaan - 0.8.3-2 - Upstream changes (see CHANGELOG) -- cgit From aae7d2bb2133fcd171207e0c2a70ed009136d447 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 18 Apr 2008 17:48:49 -0400 Subject: Update specfile to no longer package legacy directories --- cobbler.spec | 5 ----- 1 file changed, 5 deletions(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index 7b4e525..5ebe403 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -96,17 +96,12 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %dir /var/log/cobbler/kicklog %dir /var/www/cobbler/ %dir /var/www/cobbler/localmirror -%dir /var/www/cobbler/kickstarts -%dir /var/www/cobbler/kickstarts_sys %dir /var/www/cobbler/repo_mirror %dir /var/www/cobbler/repos_profile %dir /var/www/cobbler/repos_system %dir /var/www/cobbler/ks_mirror %dir /var/www/cobbler/ks_mirror/config %dir /var/www/cobbler/images -%dir /var/www/cobbler/distros -%dir /var/www/cobbler/profiles -%dir /var/www/cobbler/systems %dir /var/www/cobbler/links %defattr(755,apache,apache) %dir /var/www/cobbler/webui -- cgit From b3d798bd603d4c1fe6bb6740b9f95630ba4ee483 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 18 Apr 2008 18:25:14 -0400 Subject: Abstract out sync code into it's constituent parts, plus some packaging changes that I left out earlier. --- cobbler.spec | 1 + 1 file changed, 1 insertion(+) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index 5ebe403..2d0cc15 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -134,6 +134,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/cobbler.1.gz /etc/init.d/cobblerd %config(noreplace) /etc/httpd/conf.d/cobbler.conf +%config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf %dir /var/log/cobbler/syslog %defattr(755,root,root) -- cgit From 402ff49f5dd70671575e25d5224792f59a0c8408 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 9 May 2008 15:12:55 -0400 Subject: Release bump for test release --- cobbler.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index 2d0cc15..5b23ec2 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.9.0 +Version: 0.9.1 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -188,7 +188,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -* Tue Apr 08 2008 Michael DeHaan - 0.9.0-1 +* Fri May 09 2008 Michael DeHaan - 0.9.1-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf - remaining CGI replaced with mod_python -- cgit From bdcdc5b244ea5deb35ff92787e1fb4068968d9dd Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 12 May 2008 14:15:40 -0400 Subject: Apply patch to remove anti-createrepo conditions, bump version. --- cobbler.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index 5b23ec2..51ea3aa 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -188,6 +188,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 12 2008 Michael DeHaan - 0.9.2-1 +- Upstream changes (see CHANGELOG) + * Fri May 09 2008 Michael DeHaan - 0.9.1-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf -- cgit From 90666a4a0a3c918a31f7cdfd9fa9fd2a6ad48705 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 16 May 2008 14:42:37 -0400 Subject: The settings file is now /etc/cobbler/settings, and cobbler's command line will warn the user the old file is no longer in use and ask them to delete it before proceeding. --- cobbler.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index 51ea3aa..c4284f3 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -169,7 +169,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %config(noreplace) /var/lib/cobbler/triggers/install/post/status_post.trigger %defattr(664,root,root) -%config(noreplace) /var/lib/cobbler/settings +%config(noreplace) /etc/cobbler/settings %config(noreplace) /var/lib/cobbler/snippets/partition_select /var/lib/cobbler/elilo-3.6-ia64.efi /var/lib/cobbler/menu.c32 @@ -188,8 +188,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -* Mon May 12 2008 Michael DeHaan - 0.9.2-1 +* Fri May 16 2008 Michael DeHaan - 0.9.2-1 - Upstream changes (see CHANGELOG) +- moved /var/lib/cobbler/settings to /etc/cobbler/settings * Fri May 09 2008 Michael DeHaan - 0.9.1-1 - Upstream changes (see CHANGELOG) -- cgit From 6f5ad0b0fe3d43f5cf5efaa465f8eff4c92eb642 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 16 May 2008 16:26:52 -0400 Subject: Fix to make serializer look in the right place, also removed a debug print. --- cobbler.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cobbler.spec') diff --git a/cobbler.spec b/cobbler.spec index c4284f3..523485c 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -3,7 +3,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no Version: 0.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -188,7 +188,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -* Fri May 16 2008 Michael DeHaan - 0.9.2-1 +* Fri May 16 2008 Michael DeHaan - 0.9.2-2 - Upstream changes (see CHANGELOG) - moved /var/lib/cobbler/settings to /etc/cobbler/settings -- cgit