java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d684613913bd6d9095905fec8c5faf9dfdcaeb98
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jun 3 10:54:18 2009 -0400
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
index 7818c97..35a4441 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
@@ -39,7 +39,6 @@ import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.server.VirtualInstance;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.action.user.AdminUserEditAction;
import com.redhat.rhn.frontend.dto.ChannelOverview;
import com.redhat.rhn.frontend.dto.ErrataOverview;
import com.redhat.rhn.frontend.dto.EssentialChannelDto;
@@ -801,7 +800,8 @@ public class ChannelManagerTest extends BaseTestCaseWithUser {
set.add(ce.getId());
RhnSetManager.store(set);
- List<PackageOverview> result = ChannelManager.listErrataPackagesForResync(cchan, user, set.getLabel());
+ List<PackageOverview> result = ChannelManager.listErrataPackagesForResync(
+ cchan, user, set.getLabel());
assertTrue(result.size() == 1);
assertEquals(result.get(0).getId(), testPackage.getId());
14 years, 11 months
Branch 'VADER' - java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 625d41b5361289639ef75654d2a36126772972fc
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jun 3 10:54:18 2009 -0400
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
index 7818c97..35a4441 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
@@ -39,7 +39,6 @@ import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.server.VirtualInstance;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.action.user.AdminUserEditAction;
import com.redhat.rhn.frontend.dto.ChannelOverview;
import com.redhat.rhn.frontend.dto.ErrataOverview;
import com.redhat.rhn.frontend.dto.EssentialChannelDto;
@@ -801,7 +800,8 @@ public class ChannelManagerTest extends BaseTestCaseWithUser {
set.add(ce.getId());
RhnSetManager.store(set);
- List<PackageOverview> result = ChannelManager.listErrataPackagesForResync(cchan, user, set.getLabel());
+ List<PackageOverview> result = ChannelManager.listErrataPackagesForResync(
+ cchan, user, set.getLabel());
assertTrue(result.size() == 1);
assertEquals(result.get(0).getId(), testPackage.getId());
14 years, 11 months
Branch 'VADER' - backend/satellite_tools backend/spacewalk-backend.spec
by Milan Zazrivec
backend/satellite_tools/rhn-db-stats.sgml | 81 ++++++++++++++++++++++++++++++
backend/spacewalk-backend.spec | 1
2 files changed, 82 insertions(+)
New commits:
commit 439fcb2f84ebdbb4d475c838f2be80dc43c53aeb
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 3 16:48:16 2009 +0200
add rhn-db-stats manual page
diff --git a/backend/satellite_tools/rhn-db-stats.sgml b/backend/satellite_tools/rhn-db-stats.sgml
new file mode 100644
index 0000000..ac07a3d
--- /dev/null
+++ b/backend/satellite_tools/rhn-db-stats.sgml
@@ -0,0 +1,81 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
+<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY THECOMMAND "rhn-db-stats" >
+
+]>
+<refentry>
+
+<RefMeta>
+<RefEntryTitle>&THECOMMAND;</RefEntryTitle><manvolnum>8</manvolnum>
+<RefMiscInfo>Version 1.0.0</RefMiscInfo>
+</RefMeta>
+
+<RefNameDiv>
+<RefName><command>&THECOMMAND;</command></RefName>
+<RefPurpose>
+utility for querying important database parameters used by
+ Satellite / Spacewalk.
+</RefPurpose>
+</RefNameDiv>
+
+<RefSynopsisDiv>
+<Synopsis>
+ <cmdsynopsis>
+ <command>&THECOMMAND;</command>
+ <arg choice="req">output-file</arg>
+ <arg>db-conect-string</arg>
+ </cmdsynopsis>
+</Synopsis>
+</RefSynopsisDiv>
+
+<RefSect1><Title>Description</Title>
+
+<para>
+rhn-db-stats retrieves important statistics and parameters from Oracle database
+used by your Satellite / Spacewalk installation. It is used by spacewalk-debug
+(satellite-debug) or it can be used standalone.
+</para>
+
+</RefSect1>
+
+<RefSect1><Title>Options</Title>
+<variablelist>
+ <varlistentry>
+ <term>output-file</term>
+ <listitem>
+ <para>File name to save the retrieved information to.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>db-connect-string</term>
+ <listitem>
+ <para>Connection string to your Oracle database.</para>
+ </listitem>
+ </varlistentry>
+</variablelist>
+</RefSect1>
+
+<RefSect1><Title>Files</Title>
+<simplelist>
+ <member>/usr/bin/&THECOMMAND;</member>
+</simplelist>
+</RefSect1>
+
+<RefSect1><Title>Example</Title>
+<simplelist>
+ <member><command>&THECOMMAND; database.log</command></member>
+</simplelist>
+</RefSect1>
+
+<RefSect1><Title>See Also</Title>
+<simplelist>
+ <member>spacewalk-debug(8)</member>
+</simplelist>
+</RefSect1>
+
+<RefSect1><Title>Authors</Title>
+<simplelist>
+ <member>Milan Zazrivec <email>mzazrivec(a)redhat.com</email></member>
+</simplelist>
+</RefSect1>
+</RefEntry>
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 2b70f74..630dfe0 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -540,6 +540,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{_mandir}/man8/rhn-satellite-activate.8*
%{_mandir}/man8/rhn-schema-version.8*
%{_mandir}/man8/rhn-ssl-dbstore.8*
+%{_mandir}/man8/rhn-db-stats.8*
%{_mandir}/man8/satellite-sync.8*
%{_mandir}/man8/spacewalk-debug.8*
%{_mandir}/man8/satpasswd.8*
14 years, 11 months
backend/satellite_tools backend/spacewalk-backend.spec
by Milan Zazrivec
backend/satellite_tools/rhn-db-stats.sgml | 81 ++++++++++++++++++++++++++++++
backend/spacewalk-backend.spec | 1
2 files changed, 82 insertions(+)
New commits:
commit 86a2d74eba61652e9e1116354f7410eaa1d4132d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 3 16:48:16 2009 +0200
add rhn-db-stats manual page
diff --git a/backend/satellite_tools/rhn-db-stats.sgml b/backend/satellite_tools/rhn-db-stats.sgml
new file mode 100644
index 0000000..ac07a3d
--- /dev/null
+++ b/backend/satellite_tools/rhn-db-stats.sgml
@@ -0,0 +1,81 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
+<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY THECOMMAND "rhn-db-stats" >
+
+]>
+<refentry>
+
+<RefMeta>
+<RefEntryTitle>&THECOMMAND;</RefEntryTitle><manvolnum>8</manvolnum>
+<RefMiscInfo>Version 1.0.0</RefMiscInfo>
+</RefMeta>
+
+<RefNameDiv>
+<RefName><command>&THECOMMAND;</command></RefName>
+<RefPurpose>
+utility for querying important database parameters used by
+ Satellite / Spacewalk.
+</RefPurpose>
+</RefNameDiv>
+
+<RefSynopsisDiv>
+<Synopsis>
+ <cmdsynopsis>
+ <command>&THECOMMAND;</command>
+ <arg choice="req">output-file</arg>
+ <arg>db-conect-string</arg>
+ </cmdsynopsis>
+</Synopsis>
+</RefSynopsisDiv>
+
+<RefSect1><Title>Description</Title>
+
+<para>
+rhn-db-stats retrieves important statistics and parameters from Oracle database
+used by your Satellite / Spacewalk installation. It is used by spacewalk-debug
+(satellite-debug) or it can be used standalone.
+</para>
+
+</RefSect1>
+
+<RefSect1><Title>Options</Title>
+<variablelist>
+ <varlistentry>
+ <term>output-file</term>
+ <listitem>
+ <para>File name to save the retrieved information to.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>db-connect-string</term>
+ <listitem>
+ <para>Connection string to your Oracle database.</para>
+ </listitem>
+ </varlistentry>
+</variablelist>
+</RefSect1>
+
+<RefSect1><Title>Files</Title>
+<simplelist>
+ <member>/usr/bin/&THECOMMAND;</member>
+</simplelist>
+</RefSect1>
+
+<RefSect1><Title>Example</Title>
+<simplelist>
+ <member><command>&THECOMMAND; database.log</command></member>
+</simplelist>
+</RefSect1>
+
+<RefSect1><Title>See Also</Title>
+<simplelist>
+ <member>spacewalk-debug(8)</member>
+</simplelist>
+</RefSect1>
+
+<RefSect1><Title>Authors</Title>
+<simplelist>
+ <member>Milan Zazrivec <email>mzazrivec(a)redhat.com</email></member>
+</simplelist>
+</RefSect1>
+</RefEntry>
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 3afe932..6982648 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -540,6 +540,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{_mandir}/man8/rhn-satellite-activate.8*
%{_mandir}/man8/rhn-schema-version.8*
%{_mandir}/man8/rhn-ssl-dbstore.8*
+%{_mandir}/man8/rhn-db-stats.8*
%{_mandir}/man8/satellite-sync.8*
%{_mandir}/man8/spacewalk-debug.8*
%{_mandir}/man8/satpasswd.8*
14 years, 11 months
Branch 'VADER' - monitoring/NOCpulsePlugins
by Miroslav Suchý
monitoring/NOCpulsePlugins/Oracle/TNSping.pm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 73256c087eb6aa5c1e0e0f9a7bb16d56eab1cd34
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jun 3 16:30:30 2009 +0200
502595 - use ip instead of hostname
(cherry picked from commit f04ed5d3cde75f9135beca831b4a5396ff78dadb)
diff --git a/monitoring/NOCpulsePlugins/Oracle/TNSping.pm b/monitoring/NOCpulsePlugins/Oracle/TNSping.pm
index 4c21abf..7c2fc87 100644
--- a/monitoring/NOCpulsePlugins/Oracle/TNSping.pm
+++ b/monitoring/NOCpulsePlugins/Oracle/TNSping.pm
@@ -44,12 +44,13 @@ sub tnscmd {
my ($sendbuf) = pack("C*", @packet);
- my ($tns_sock) = IO::Socket::INET->new(
+ my $tns_sock = IO::Socket::INET->new(
PeerAddr => $hostname,
PeerPort => $port,
Proto => 'tcp',
Type => SOCK_STREAM,
- Timeout => $timeout) or return (-1, '');
+ Timeout => $timeout);
+ return (-1, '') unless $tns_sock; #could not connect
$tns_sock->autoflush(1);
my $count = length($sendbuf);
@@ -79,11 +80,11 @@ sub run {
my $start= Time::HiRes::time();
my ($code, $response)=tnscmd("(CONNECT_DATA=(COMMAND=ping))",
- $params{'hostname'}, $params{'port'}, $params{'timeout'});
+ $params{'ip'}, $params{'port'}, $params{'timeout'});
my $time=Time::HiRes::time()-$start;
if ($code <= 0) {
- $result->item_critical("Could not connect to host ", $params{'hostname'});
+ $result->item_critical("Could not connect to host $params{'ip'} on port $params{'port'}");
} elsif ($response =~ /\(ERR=\d+\)/) {
$result->context("TNS Listener");
$result->metric_value('latency', $time, '%.3f');
14 years, 11 months
monitoring/NOCpulsePlugins
by Miroslav Suchý
monitoring/NOCpulsePlugins/Oracle/TNSping.pm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit f04ed5d3cde75f9135beca831b4a5396ff78dadb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jun 3 16:30:30 2009 +0200
502595 - use ip instead of hostname
diff --git a/monitoring/NOCpulsePlugins/Oracle/TNSping.pm b/monitoring/NOCpulsePlugins/Oracle/TNSping.pm
index 4c21abf..7c2fc87 100644
--- a/monitoring/NOCpulsePlugins/Oracle/TNSping.pm
+++ b/monitoring/NOCpulsePlugins/Oracle/TNSping.pm
@@ -44,12 +44,13 @@ sub tnscmd {
my ($sendbuf) = pack("C*", @packet);
- my ($tns_sock) = IO::Socket::INET->new(
+ my $tns_sock = IO::Socket::INET->new(
PeerAddr => $hostname,
PeerPort => $port,
Proto => 'tcp',
Type => SOCK_STREAM,
- Timeout => $timeout) or return (-1, '');
+ Timeout => $timeout);
+ return (-1, '') unless $tns_sock; #could not connect
$tns_sock->autoflush(1);
my $count = length($sendbuf);
@@ -79,11 +80,11 @@ sub run {
my $start= Time::HiRes::time();
my ($code, $response)=tnscmd("(CONNECT_DATA=(COMMAND=ping))",
- $params{'hostname'}, $params{'port'}, $params{'timeout'});
+ $params{'ip'}, $params{'port'}, $params{'timeout'});
my $time=Time::HiRes::time()-$start;
if ($code <= 0) {
- $result->item_critical("Could not connect to host ", $params{'hostname'});
+ $result->item_critical("Could not connect to host $params{'ip'} on port $params{'port'}");
} elsif ($response =~ /\(ERR=\d+\)/) {
$result->context("TNS Listener");
$result->metric_value('latency', $time, '%.3f');
14 years, 11 months
Changes to 'refs/tags/nocpulse-common-2.1.14-1'
by Milan Zazrivec
Tag 'nocpulse-common-2.1.14-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2009-06-03 14:14 +0000
Tagging package [nocpulse-common] version [2.1.14-1] in directory [monitoring/nocpulse-common/].
Changes since oracle-server-scripts-10.2.0-29-19:
---
0 files changed
---
14 years, 11 months
monitoring/nocpulse-common rel-eng/packages
by Milan Zazrivec
monitoring/nocpulse-common/nocpulse-common.spec | 5 ++++-
rel-eng/packages/nocpulse-common | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 29b6856c85ba0d8b255c2af863176b7039dc1975
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 3 16:14:05 2009 +0200
Automatic commit of package [nocpulse-common] release [2.1.14-1].
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index 75cb813..cccee8e 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -1,5 +1,5 @@
Name: nocpulse-common
-Version: 2.1.13
+Version: 2.1.14
Release: 1%{?dist}
Summary: NOCpulse common
License: GPLv2
@@ -136,6 +136,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jun 03 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.14-1
+- switch nocpulse to a system user if needed
+
* Mon May 11 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.13-1
- 498257 - migrate existing files into new nocpulse homedir
diff --git a/rel-eng/packages/nocpulse-common b/rel-eng/packages/nocpulse-common
index eb8b169..1edcc75 100644
--- a/rel-eng/packages/nocpulse-common
+++ b/rel-eng/packages/nocpulse-common
@@ -1 +1 @@
-2.1.13-1 monitoring/nocpulse-common/
+2.1.14-1 monitoring/nocpulse-common/
14 years, 11 months
Branch 'VADER' - monitoring/nocpulse-common
by Milan Zazrivec
monitoring/nocpulse-common/nocpulse-common.spec | 28 ++++++++++++++++++++++++
1 file changed, 28 insertions(+)
New commits:
commit a3c7b110b276018d36a0e497fb98deab210d96a3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 3 16:06:50 2009 +0200
switch nocpulse to a system user if needed
Basically all nocpulse user accounts prior to Spacewalk were created
as non-system. This needs to be changed for existing installations
to be consistent.
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index db15fdd..2a5085b 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -62,6 +62,34 @@ install -m644 perl-API/NOCpulse/test/TestConfig.pm $RPM_BUILD_ROOT%{perl_vendorl
install -m 755 npConfigValue $RPM_BUILD_ROOT%{_bindir}/
%pre
+# change nocpulse user & group to system user & group if needed
+dirs="/home/nocpulse /opt/notification /opt/nocpulse /var/log/nocpulse /var/www/templates /var/tmp"
+
+if [ -d /home/nocpulse -a `id -u nocpulse 2> /dev/null` -ge 500 ]; then
+ if [ `id -g nocpulse` -ge 500 ]; then
+ groupmod -n nocpulse-old nocpulse
+ groupadd -r nocpulse
+ usermod -g nocpulse nocpulse
+ # chgrp of existing fs objects owned by previous nocpulse group
+ for i in $dirs; do
+ find $i -group nocpulse-old -exec chgrp nocpulse '{}' ';'
+ done
+ groupdel nocpulse-old
+ fi
+
+ # find lowest unused system uid to change nocpulse uid to
+ old_uid=`id -u nocpulse`
+ useradd -r tempnoc
+ uid=`id -u tempnoc`
+ userdel tempnoc
+ usermod -u $uid nocpulse
+
+ # chown of existing fs objects owned by previous nocpulse user
+ for i in $dirs; do
+ find $i -user $old_uid -exec chown nocpulse '{}' ';'
+ done
+fi
+
getent group %{package_name} >/dev/null || groupadd -r %{package_name}
getent passwd %{package_name} >/dev/null || \
useradd -r -g %{package_name} -G apache -d %{_var}/lib/%{package_name} -c "NOCpulse user" %{package_name}
14 years, 11 months
monitoring/nocpulse-common
by Milan Zazrivec
monitoring/nocpulse-common/nocpulse-common.spec | 28 ++++++++++++++++++++++++
1 file changed, 28 insertions(+)
New commits:
commit b0601894ef93861b3a13288b754a7cae935f4079
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 3 16:06:50 2009 +0200
switch nocpulse to a system user if needed
Basically all nocpulse user accounts prior to Spacewalk were created
as non-system. This needs to be changed for existing installations
to be consistent.
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index 70c935d..75cb813 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -62,6 +62,34 @@ install -m644 perl-API/NOCpulse/test/TestConfig.pm $RPM_BUILD_ROOT%{perl_vendorl
install -m 755 npConfigValue $RPM_BUILD_ROOT%{_bindir}/
%pre
+# change nocpulse user & group to system user & group if needed
+dirs="/home/nocpulse /opt/notification /opt/nocpulse /var/log/nocpulse /var/www/templates /var/tmp"
+
+if [ -d /home/nocpulse -a `id -u nocpulse 2> /dev/null` -ge 500 ]; then
+ if [ `id -g nocpulse` -ge 500 ]; then
+ groupmod -n nocpulse-old nocpulse
+ groupadd -r nocpulse
+ usermod -g nocpulse nocpulse
+ # chgrp of existing fs objects owned by previous nocpulse group
+ for i in $dirs; do
+ find $i -group nocpulse-old -exec chgrp nocpulse '{}' ';'
+ done
+ groupdel nocpulse-old
+ fi
+
+ # find lowest unused system uid to change nocpulse uid to
+ old_uid=`id -u nocpulse`
+ useradd -r tempnoc
+ uid=`id -u tempnoc`
+ userdel tempnoc
+ usermod -u $uid nocpulse
+
+ # chown of existing fs objects owned by previous nocpulse user
+ for i in $dirs; do
+ find $i -user $old_uid -exec chown nocpulse '{}' ';'
+ done
+fi
+
getent group %{package_name} >/dev/null || groupadd -r %{package_name}
getent passwd %{package_name} >/dev/null || \
useradd -r -g %{package_name} -G apache -d %{_var}/lib/%{package_name} -c "NOCpulse user" %{package_name}
14 years, 11 months