spacewalk-commits September 2009

spacewalk-commits@lists.fedorahosted.org

8 participants
121 discussions

spacewalk/setup
by Milan Zazrivec 03 Sep '09

03 Sep '09

spacewalk/setup/bin/spacewalk-setup-jabberd | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) New commits: commit 6ba2f64037cfaafbda6cd60d3e3de21119e5c95d Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Sep 3 08:24:24 2009 +0200 spacewalk-setup-jabberd man page fixes diff --git a/spacewalk/setup/bin/spacewalk-setup-jabberd b/spacewalk/setup/bin/spacewalk-setup-jabberd index 7f6967b..52f67f6 100755 --- a/spacewalk/setup/bin/spacewalk-setup-jabberd +++ b/spacewalk/setup/bin/spacewalk-setup-jabberd @@ -129,7 +129,7 @@ with Spacewalk / Satellite. The script uses XSL transformations to change existing jabberd configuration files. Ordinarily, spacewalk-setup-jabberd is called by spacewalk-setup(1) during -initial Spacewalk / Satellite configuration or Spacewalk / Satellite upgrade. +initial Spacewalk / Satellite configuration or upgrade. The script workflow is: @@ -137,7 +137,7 @@ The script workflow is: =item -Using xsltproc, apply appropriate XSL template to existing jabberd configuration +Using xsltproc, apply appropriate XSL stylesheet to existing jabberd configuration file and read the transformed document. =item @@ -153,7 +153,7 @@ Resulting file is written out while the original file is backed up. =head1 FILES -XSL templates used for transformation of existing jabberd configuration files: +XSL stylesheets used for transformation of existing jabberd configuration files: F</usr/share/spacewalk/setup/jabberd/c2s.xsl> @@ -161,12 +161,22 @@ F</usr/share/spacewalk/setup/jabberd/s2s.xsl> F</usr/share/spacewalk/setup/jabberd/sm.xsl> +Jabberd configuration files modified by spacewalk-setup-jabberd: + +F</etc/jabberd/c2s.xsl> + +F</etc/jabberd/s2s.xsl> + +F</etc/jabberd/sm.xsl> + =head1 SEE ALSO B<spacewalk-setup>(1) - Spacewalk setup program B<xsltproc>(1) - command line XSLT processor +B<c2s>(8), B<router>(8), B<s2s>(8), B<sm>(8) - jabberd components + =head1 AUTHORS Milan Zazrivec

1 0

2 commits - java/code
by Justin Sherrill 02 Sep '09

02 Sep '09

java/code/src/com/redhat/rhn/domain/task/TaskFactory.java | 2 +- java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 6 +++++- java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java | 6 +++--- java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) New commits: commit 62180fea3023e62eb321e9884947169a4dc28c1a Author: Justin Sherrill <jsherril(a)redhat.com> Date: Wed Sep 2 14:16:36 2009 -0400 fixing issue where repo_sync tasks would not get removed under certain conditions diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java index d34d805..7037ef6 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java @@ -16,6 +16,7 @@ package com.redhat.rhn.taskomatic.task; import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.conf.ConfigDefaults; +import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.ContentSource; import com.redhat.rhn.domain.task.Task; @@ -64,7 +65,9 @@ public class RepoSyncTask implements Job { for (Task task : TaskFactory.listTasks(DISPLAY_NAME)) { //workaround in case task is null (which can happen) + if (task == null || task.getData() == null) { + TaskFactory.removeTask(task); continue; } ContentSource src = ChannelFactory.lookupContentSource(task.getData()); @@ -74,8 +77,10 @@ public class RepoSyncTask implements Job { } if (src == null) { log.error("Content Source could not be found: " + task.getData()); + TaskFactory.removeTask(task); continue; } + TaskFactory.removeTask(task); try { Process p = Runtime.getRuntime().exec( @@ -92,7 +97,6 @@ public class RepoSyncTask implements Job { log.fatal(e.getMessage()); e.printStackTrace(); } - TaskFactory.removeTask(task); } } commit d658b53c2bac8b44b7e061faf35b74090ff30c06 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Wed Sep 2 14:16:09 2009 -0400 fixing issue where errata cache task was pulling ALL tasks out of the queue and not just the two it actually was using diff --git a/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java b/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java index af74c20..707accb 100644 --- a/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java +++ b/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java @@ -171,7 +171,7 @@ public class TaskFactory extends HibernateFactory { * @param nameIn to lookup * @return List of Tasks or null if not found. */ - public static List getTaskListByNameLike(String nameIn) { + public static List<Task> getTaskListByNameLike(String nameIn) { return HibernateFactory.getSession().getNamedQuery("Task.lookupByNameLike") .setString("namelike", nameIn + "%") .list(); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java index 2417c7e..b8642dd 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java @@ -50,10 +50,10 @@ public class ErrataCacheDriver implements QueueDriver { * {@inheritDoc} */ public List getCandidates() { - List tasks = TaskFactory.getTaskList(true, TaskFactory.NO_MAXIMUM); + List<Task> tasks = TaskFactory.getTaskListByNameLike(ErrataCacheWorker.BY_CHANNEL); + tasks.addAll(TaskFactory.getTaskListByNameLike(ErrataCacheWorker.FOR_SERVER)); List retval = new LinkedList(); - for (Iterator iter = tasks.iterator(); iter.hasNext();) { - Task current = (Task) iter.next(); + for (Task current : tasks) { Map item = new HashMap(); item.put("task", current); item.put("orgId", current.getOrg().getId()); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java index 885e170..aa59adb 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java @@ -34,8 +34,8 @@ import java.util.Map; */ class ErrataCacheWorker implements QueueWorker { - private static final String BY_CHANNEL = "update_errata_cache_by_channel"; - private static final String FOR_SERVER = "update_server_errata_cache"; + public static final String BY_CHANNEL = "update_errata_cache_by_channel"; + public static final String FOR_SERVER = "update_server_errata_cache"; private Task task;

1 0

Branch 'SPACEWALK-0.6' - client/tools rel-eng/packages
by Justin Sherrill 02 Sep '09

02 Sep '09

client/tools/rhncfg/rhncfg.spec | 6 +++++- rel-eng/packages/rhncfg | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 469fb1382fb513993196883e653ee625052d70c9 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Mon Aug 31 14:48:17 2009 -0400 Automatic commit of package [rhncfg] release [5.9.7.2-1]. diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec index 3bfed62..c62c482 100644 --- a/client/tools/rhncfg/rhncfg.spec +++ b/client/tools/rhncfg/rhncfg.spec @@ -8,7 +8,7 @@ Group: Applications/System License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 5.9.7.1 +Version: 5.9.7.2 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -105,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Mon Aug 31 2009 Justin Sherrill <jsherril(a)redhat.com> 5.9.7.2-1 +- bumping release of spacewalk 0.6s rhncfg for backport (jsherril(a)redhat.com) +- fix an ISE relating to config management w/selinux (msuchy(a)redhat.com) + * Wed Aug 05 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 5.9.7-1 - bugfix patch on selinux config file deploy (joshua.roys(a)gtri.gatech.edu) - Patch: Selinux Context support for config files (joshua.roys(a)gtri.gatech.edu) diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg index 2ddaf16..35286d0 100644 --- a/rel-eng/packages/rhncfg +++ b/rel-eng/packages/rhncfg @@ -1 +1 @@ -5.9.7-1 client/tools/rhncfg/ +5.9.7.2-1 client/tools/rhncfg/

1 0

3 commits - client/rhel
by Miroslav Suchý 02 Sep '09

02 Sep '09

client/rhel/rhnsd/rhnsd.init | 19 +++++++++++++++++-- client/rhel/rhnsd/rhnsd.spec | 10 +++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) New commits: commit d295180e5fbc3d49fd4891d9f2e36a9decaf0187 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Sep 1 21:02:30 2009 +0200 implement try-restart as alias for condrestart diff --git a/client/rhel/rhnsd/rhnsd.init b/client/rhel/rhnsd/rhnsd.init index 6b9eb2f..5c9cdbc 100644 --- a/client/rhel/rhnsd/rhnsd.init +++ b/client/rhel/rhnsd/rhnsd.init @@ -81,7 +81,7 @@ case "$1" in stop start ;; - condrestart) + condrestart|try-restart) if [ -f /var/lock/subsys/rhnsd ]; then stop start @@ -92,7 +92,7 @@ case "$1" in RETVAL=$? ;; *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}" exit 1 esac exit $RETVAL commit 9bda88e0f1fb815337ce24332b549ecbf49c9724 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Sep 1 20:54:45 2009 +0200 add LSB header diff --git a/client/rhel/rhnsd/rhnsd.init b/client/rhel/rhnsd/rhnsd.init index b98e004..6b9eb2f 100644 --- a/client/rhel/rhnsd/rhnsd.init +++ b/client/rhel/rhnsd/rhnsd.init @@ -13,6 +13,21 @@ # pidfile: /var/run/rhnsd.pid # +### BEGIN INIT INFO +# Provides: rhnsd +# Required-Start: $local_fs $network $remote_fs $named $time +# Required-Stop: $local_fs $network $remote_fs $named +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Starts the Red Hat Network Daemon +# Description: This is a daemon which handles the task of connecting +# periodically to the Red Hat Network servers to +# check for updates, notifications and perform system +# monitoring tasks according to the service level that +# this server is subscribed for. +### END INIT INFO + + # interval in minutes to connect to Red Hat Network. The minimum allowed # value is currently 1 hour; by default rhnsd will connect every other hour. # This should be more than suitable for the vast majority of systems. You commit d15a7a17c278b2b467cae7407c71785b89333ed3 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Sep 1 20:46:40 2009 +0200 change url, source0 and requires according to packaging guidelines diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index 997dced..3208ede 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -1,8 +1,8 @@ Summary: Red Hat Network query daemon License: GPLv2 Group: System Environment/Base -Source0: %{name}-%{version}.tar.gz -Url: http://rhn.redhat.com +Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz +URL: https://fedorahosted.org/spacewalk Name: rhnsd Version: 4.5.11 Release: 1%{?dist} @@ -10,8 +10,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext -Requires: chkconfig Requires: rhn-check >= 0.0.8 +Requires(post): chkconfig +Requires(preun): chkconfig +# This is for /sbin/service +Requires(preun): initscripts +Requires(postun): initscripts %description The Red Hat Update Agent that automatically queries the Red Hat

1 0

Changes to 'refs/tags/spacewalk-setup-0.7.4-1'
by Michael Mraka 02 Sep '09

02 Sep '09

Tag 'spacewalk-setup-0.7.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-09-02 12:20 +0000 Tagging package [spacewalk-setup] version [0.7.4-1] in directory [spacewalk/setup/]. Changes since spacewalk-0.7.2-1: Michael Mraka (1): Automatic commit of package [spacewalk-setup] release [0.7.4-1]. --- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages spacewalk/setup
by Michael Mraka 02 Sep '09

02 Sep '09

rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 252dcd780924cee6e0baf2622fb36f899526086f Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Sep 2 14:20:21 2009 +0200 Automatic commit of package [spacewalk-setup] release [0.7.4-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index 60c363d..5e84c01 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -0.7.3-1 spacewalk/setup/ +0.7.4-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 4a42b07..596b834 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 0.7.3 +Version: 0.7.4 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk @@ -106,6 +106,10 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/pki/spacewalk/jabberd %changelog +* Wed Sep 02 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.4-1 +- db-backend is set in idefaults +- 520441 - don't apply ExtUtils::MY->fixin(shift) to perl executables + * Tue Sep 01 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.7.3-1 - spacewalk-setup-jabberd code cleanup - manual page for spacewalk-setup-jabberd

1 0

Changes to 'refs/tags/spacewalk-0.7.2-1'
by Michael Mraka 02 Sep '09

02 Sep '09

Tag 'spacewalk-0.7.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-09-02 12:18 +0000 Tagging package [spacewalk] version [0.7.2-1] in directory [spacewalk/package/]. Changes since spacewalk-schema-0.7.2-1: Michael Mraka (3): don't even ask about db-backend when it's set in answer file added database backend to defaults; installer will not ask about it Automatic commit of package [spacewalk] release [0.7.2-1]. --- rel-eng/packages/spacewalk | 2 +- spacewalk/package/spacewalk.spec | 16 +++++++++++++++- spacewalk/setup/bin/spacewalk-setup | 32 ++++++++++++-------------------- 3 files changed, 28 insertions(+), 22 deletions(-) ---

1 0

rel-eng/packages spacewalk/package
by Michael Mraka 02 Sep '09

02 Sep '09

rel-eng/packages/spacewalk | 2 +- spacewalk/package/spacewalk.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit daf8b27a610ed3f1ae69408a2572f96b921d4f80 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Sep 2 14:18:47 2009 +0200 Automatic commit of package [spacewalk] release [0.7.2-1]. diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk index 78cf010..7d22077 100644 --- a/rel-eng/packages/spacewalk +++ b/rel-eng/packages/spacewalk @@ -1 +1 @@ -0.7.1-1 spacewalk/package/ +0.7.2-1 spacewalk/package/ diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index be6b1d7..4fd1857 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -1,7 +1,7 @@ %define release_name Gemini Name: spacewalk -Version: 0.7.1 +Version: 0.7.2 Release: 1%{?dist} Summary: Spacewalk Systems Management Application URL: https://fedorahosted.org/spacewalk @@ -162,6 +162,9 @@ rm -rf %{buildroot} %{_datadir}/spacewalk/setup/defaults.d/postgresql-backend.conf %changelog +* Wed Sep 02 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.2-1 +- added database backend to defaults + * Tue Sep 01 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.1-1 - let's change codename to something new - split spacewalk metapackage into spacewalk-oracle/postgresql

1 0

2 commits - spacewalk/package spacewalk/setup
by Michael Mraka 02 Sep '09

02 Sep '09

spacewalk/package/spacewalk.spec | 11 +++++++++++ spacewalk/setup/bin/spacewalk-setup | 32 ++++++++++++-------------------- 2 files changed, 23 insertions(+), 20 deletions(-) New commits: commit e9819cdcbadd63806beb31c4c51b4e9a7007a0d2 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Sep 2 14:11:55 2009 +0200 added database backend to defaults; installer will not ask about it diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index c55ffd7..be6b1d7 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -138,6 +138,13 @@ Solaris machines. rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/%{_sysconfdir} echo "Spacewalk release %{version} (%{release_name})" > $RPM_BUILD_ROOT/%{_sysconfdir}/spacewalk-release +install -d $RPM_BUILD_ROOT/%{_datadir}/spacewalk/setup/defaults.d +for i in oracle postgresql ; do + cat <<EOF >$RPM_BUILD_ROOT/%{_datadir}/spacewalk/setup/defaults.d/$i-backend.conf +# database backend to be used by spacewalk +db-backend = $i +EOF +done %clean rm -rf %{buildroot} @@ -147,8 +154,12 @@ rm -rf %{buildroot} %{_sysconfdir}/spacewalk-release %files oracle +%defattr(-,root,root) +%{_datadir}/spacewalk/setup/defaults.d/oracle-backend.conf %files postgresql +%defattr(-,root,root) +%{_datadir}/spacewalk/setup/defaults.d/postgresql-backend.conf %changelog * Tue Sep 01 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.1-1 commit 2d0b070b55ccb846436b1582d0da24a2ebbafb48 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Sep 2 14:02:04 2009 +0200 don't even ask about db-backend when it's set in answer file diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index d034585..6e1299c 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -168,33 +168,25 @@ exit 0; sub choose_database_schema { my $answers = shift; - my @valid_schemas = (); - push(@valid_schemas, "oracle"); - # Uncomment this to enable installation of postgresql schema: - # NOTE: useful for development ONLY at this time. - push(@valid_schemas, "postgresql"); - my %is_valid_schema = (); - - if (scalar(@valid_schemas) eq 1) { - $answers->{'db-backend'} = $valid_schemas[0]; - } - else { - print "Available database backends:\n"; - # Hash just used for checking if a schema is valid: - while (my $i = shift @valid_schemas) { - print " $i\n"; - $is_valid_schema{$i} = 1; - } + my %is_valid_schema = ( + 'oracle' => 1, + # Uncomment this to enable installation of postgresql schema: + # NOTE: useful for development ONLY at this time. + 'postgresql' => 1, + ); - Spacewalk::Setup::ask( + my $question = "Choose your database backend (" + . join(", ", sort(keys(%is_valid_schema))) + . ")"; + + Spacewalk::Setup::ask( -noninteractive => $opts{"non-interactive"}, - -question => 'Database', + -question => $question, -test => sub { my $text = shift; $is_valid_schema{$text} }, -answer => \$answers->{'db-backend'}); - } }

1 0

Changes to 'refs/tags/spacewalk-schema-0.7.2-1'
by Michael Mraka 02 Sep '09

02 Sep '09

Tag 'spacewalk-schema-0.7.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-09-02 09:22 +0000 Tagging package [spacewalk-schema] version [0.7.2-1] in directory [schema/spacewalk/]. Changes since spacewalk-java-0.7.5-1: Michael Mraka (1): Automatic commit of package [spacewalk-schema] release [0.7.2-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

← Newer
1
...
6
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits September 2009