java/code
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 634ab833da7595cfccc8d8b9dd4b06e3795299cc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 15:41:03 2009 +0200
498661 - added **Oracle Password_confirm** to translation strings
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
index 09dcc22..22390e4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
@@ -1332,6 +1332,13 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
</context-group>
</trans-unit>
+ <trans-unit id="Oracle Password_confirm">
+ <source>Oracle Password Confirm</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/probes/ProbeEdit.do</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="Oracle Port">
<source>Oracle Port</source>
<context-group name="ctx">
14 years, 8 months
client/tools
by Milan Zazrivec
client/tools/rhncfg/config_management/rhncfg-manager.8 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 4d0997ff41eada69d9263ac8e445dca6271324c4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Sep 1 16:09:47 2009 +0200
519195 - fix typos in rhncfg-manager manual page
diff --git a/client/tools/rhncfg/config_management/rhncfg-manager.8 b/client/tools/rhncfg/config_management/rhncfg-manager.8
index cc7a0cb..47e6f28 100644
--- a/client/tools/rhncfg/config_management/rhncfg-manager.8
+++ b/client/tools/rhncfg/config_management/rhncfg-manager.8
@@ -58,7 +58,7 @@ rhncfg-manager diff-revisions --help
This tool utilizes a "cvs style" command syntax: command mode options
-For example: rhncfg-manager diff-revisions --help/
+For example: rhncfg-manager diff-revisions --help
.SH "MODES"
.TP
\fBadd [ \fIOPTIONS\fB ] \fIFILE\fB [ \fIFILE\fB ... ]\fR
@@ -103,7 +103,7 @@ Download all the configuration files in a channel to disk.
-t\fITOPDIR\fR, --topdir=\fITOPDIR\fR -- directory all the file paths are relative to
.TP
\fBget [ \fIOPTIONS\fB ] \fIFILE\fB [ \fIFILE\fB ... ]\fR
-Get the contents of a particulare configuration file. Outputs
+Get the contents of a particular configuration file. Outputs
to stdout.
-c\fICHANNEL_LABEL\fR, --channel=\fICHANNEL_LABEL\fR -- get file(s) from this config channel
@@ -160,7 +160,7 @@ disk.
Display the help screen with a list of options.
Use context sensitive help as well with the diffent "modes".
-E.g., rhncfg-manager upload-channe --help
+E.g., rhncfg-manager upload-channel --help
.SH "SEE ALSO"
rhncfg-client (8)
14 years, 8 months
projects/perl-Satcon spacewalk/setup web/modules
by Milan Zazrivec
projects/perl-Satcon/Makefile.PL | 8 ++++++++
spacewalk/setup/Makefile.PL | 8 ++++++++
web/modules/dobby/Makefile.PL | 8 ++++++++
3 files changed, 24 insertions(+)
New commits:
commit a9ee83d25fb5135caada005c68b66787308b4692
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Sep 1 15:41:46 2009 +0200
520441 - don't apply ExtUtils::MY->fixin(shift) to perl executables
diff --git a/projects/perl-Satcon/Makefile.PL b/projects/perl-Satcon/Makefile.PL
index 911a6e8..d5e6c3f 100644
--- a/projects/perl-Satcon/Makefile.PL
+++ b/projects/perl-Satcon/Makefile.PL
@@ -8,3 +8,11 @@ WriteMakefile(
'AUTHOR' => 'Spacewalk <spacewalk-devel(a)redhat.com>',
'EXE_FILES' => [ 'bin/satcon-build-dictionary.pl', 'bin/satcon-deploy-tree.pl'],
);
+
+package MY;
+sub tools_other {
+ my $self = shift;
+ my $ret = $self->SUPER::tools_other(@_);
+ $ret =~ s/^(FIXIN\b.+)$/## $1\nFIXIN = \$(PERLRUN) -e 1/m;
+ return $ret;
+}
diff --git a/spacewalk/setup/Makefile.PL b/spacewalk/setup/Makefile.PL
index 2f6579f..5440217 100644
--- a/spacewalk/setup/Makefile.PL
+++ b/spacewalk/setup/Makefile.PL
@@ -19,3 +19,11 @@ WriteMakefile(
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
clean => { FILES => 'Spacewalk-Setup-*' },
);
+
+package MY;
+sub tools_other {
+ my $self = shift;
+ my $ret = $self->SUPER::tools_other(@_);
+ $ret =~ s/^(FIXIN\b.+)$/## $1\nFIXIN = \$(PERLRUN) -e 1/m;
+ return $ret;
+}
diff --git a/web/modules/dobby/Makefile.PL b/web/modules/dobby/Makefile.PL
index 54d5393..4532953 100644
--- a/web/modules/dobby/Makefile.PL
+++ b/web/modules/dobby/Makefile.PL
@@ -23,3 +23,11 @@ WriteMakefile('NAME' => "Dobby",
'MAKEFILE' => "Makefile.perl", # the name of the output Makefile file
'EXE_FILES' => [ "scripts/db-control" ],
);
+
+package MY;
+sub tools_other {
+ my $self = shift;
+ my $ret = $self->SUPER::tools_other(@_);
+ $ret =~ s/^(FIXIN\b.+)$/## $1\nFIXIN = \$(PERLRUN) -e 1/m;
+ return $ret;
+}
14 years, 8 months
Changes to 'refs/tags/spacewalk-setup-0.7.3-1'
by Milan Zazrivec
Tag 'spacewalk-setup-0.7.3-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2009-09-01 13:26 +0000
Tagging package [spacewalk-setup] version [0.7.3-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-0.7.3-1:
Milan Zazrivec (1):
Automatic commit of package [spacewalk-setup] release [0.7.3-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
14 years, 8 months
rel-eng/packages spacewalk/setup
by Milan Zazrivec
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2129254e1d73074d10aa7876a8740f3a59c9b4fa
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Sep 1 15:26:09 2009 +0200
Automatic commit of package [spacewalk-setup] release [0.7.3-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 57aab70..60c363d 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-0.7.2-1 spacewalk/setup/
+0.7.3-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index efe7ac5..4a42b07 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 0.7.2
+Version: 0.7.3
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -106,6 +106,10 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
+* 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
+
* Fri Aug 28 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.7.2-1
- add spacewalk-setup-jabberd script (mzazrivec(a)redhat.com)
- bumping Version to 0.7.0 (jmatthew(a)redhat.com)
14 years, 8 months
Changes to 'refs/tags/spacewalk-backend-0.7.3-1'
by Michael Mraka
Tag 'spacewalk-backend-0.7.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-09-01 12:59 +0000
Tagging package [spacewalk-backend] version [0.7.3-1] in directory [backend/].
Changes since spacewalk-web-0.7.3-1:
Michael Mraka (2):
494813 - print meaninful error message instead of traceback when database is not running
Automatic commit of package [spacewalk-backend] release [0.7.3-1].
Milan Zazrivec (2):
manual page for spacewalk-setup-jabberd
die if jabberd config file is not found
---
backend/satellite_tools/satsync.py | 6 -
backend/spacewalk-backend.spec | 6 +
rel-eng/packages/spacewalk-backend | 2
spacewalk/setup/Makefile.PL | 1
spacewalk/setup/bin/spacewalk-setup-jabberd | 96 ++++++++++++++++++++++++++--
5 files changed, 100 insertions(+), 11 deletions(-)
---
14 years, 8 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 385d99d122064c94361d5867ce519eabe691eccb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 14:59:52 2009 +0200
Automatic commit of package [spacewalk-backend] release [0.7.3-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 20d0ac9..62ddb2a 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.7.2
+Version: 0.7.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -579,6 +579,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Sep 01 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.3-1
+- 494813 - print error message instead of traceback
+- postgresql dependency moved to spacewalk-postgresql
+
* Fri Aug 28 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.2-1
- use spacewalk-cfg-get instead of awk
- added mirror list support to spacewalk-repo-sync
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e0678ef..1d05277 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.7.2-1 backend/
+0.7.3-1 backend/
14 years, 8 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/satsync.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit dd2b5398a0e1c18ee497199867957610fb93d3fc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 14:55:59 2009 +0200
494813 - print meaninful error message instead of traceback when database is not running
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 40458ad..cbc6ece 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -2182,10 +2182,8 @@ def processCommandline():
rhnSQL.initDB(CFG.DEFAULT_DB)
except (SQLError, SQLSchemaError, SQLConnectError), e:
# An SQL error is fatal... crash and burn
- tbOut = cStringIO.StringIO()
- Traceback(mail=0, ostream=tbOut, with_locals=1)
- log(-1, 'SQL ERROR during xml processing: %s' % e, stream=sys.stderr)
- log(-1, 'TRACEBACK: %s' % tbOut.getvalue(), stream=sys.stderr)
+ log(-1, "ERROR: Can't connect to the database: %s" % e, stream=sys.stderr)
+ log(-1, "ERROR: Check if your database is running.", stream=sys.stderr)
sys.exit(20)
# check the validity of the debug level
14 years, 8 months
2 commits - spacewalk/setup
by Milan Zazrivec
spacewalk/setup/Makefile.PL | 1
spacewalk/setup/bin/spacewalk-setup-jabberd | 96 ++++++++++++++++++++++++++--
2 files changed, 92 insertions(+), 5 deletions(-)
New commits:
commit 491f845134dba067cdfee29cf15af860490c514a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Sep 1 14:21:59 2009 +0200
die if jabberd config file is not found
diff --git a/spacewalk/setup/bin/spacewalk-setup-jabberd b/spacewalk/setup/bin/spacewalk-setup-jabberd
index 5897c31..7f6967b 100755
--- a/spacewalk/setup/bin/spacewalk-setup-jabberd
+++ b/spacewalk/setup/bin/spacewalk-setup-jabberd
@@ -54,15 +54,15 @@ foreach my $basename ('c2s', 's2s', 'sm') {
{
local $/ = undef;
- print Spacewalk::Setup::loc("Calling /usr/bin/xsltproc $template $configfile...\n") if $verbose;
- my $transformed = `/usr/bin/xsltproc $template $configfile`;
- die "There was an error running xsltproc\n" if $?;
-
local *F;
- open F, $configfile;
+ open F, $configfile or die "Error opening $configfile: $!\n";
my $original = <F>;
close F;
+ print Spacewalk::Setup::loc("Calling /usr/bin/xsltproc $template $configfile...\n") if $verbose;
+ my $transformed = `/usr/bin/xsltproc $template $configfile`;
+ die "There was an error running xsltproc\n" if $?;
+
for my $key (keys %macros) {
$transformed =~ s/\@$key\@/$macros{$key}/mg;
}
commit 1c0cf1b5901987ca56ac543643e3ba0c1ff5d37b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Sep 1 14:14:50 2009 +0200
manual page for spacewalk-setup-jabberd
diff --git a/spacewalk/setup/Makefile.PL b/spacewalk/setup/Makefile.PL
index a66e087..2f6579f 100644
--- a/spacewalk/setup/Makefile.PL
+++ b/spacewalk/setup/Makefile.PL
@@ -14,6 +14,7 @@ WriteMakefile(
},
MAN1PODS => { 'lib/Spacewalk/Setup.pm' => '$(INST_MAN1DIR)/spacewalk-setup.$(MAN1EXT)',
'bin/cobbler-setup' => '$(INST_MAN1DIR)/cobbler-setup.$(MAN1EXT)',
+ 'bin/spacewalk-setup-jabberd' => '$(INST_MAN1DIR)/spacewalk-setup-jabberd.$(MAN1EXT)',
},
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
clean => { FILES => 'Spacewalk-Setup-*' },
diff --git a/spacewalk/setup/bin/spacewalk-setup-jabberd b/spacewalk/setup/bin/spacewalk-setup-jabberd
index 92a78a5..5897c31 100755
--- a/spacewalk/setup/bin/spacewalk-setup-jabberd
+++ b/spacewalk/setup/bin/spacewalk-setup-jabberd
@@ -86,3 +86,89 @@ foreach my $basename ('c2s', 's2s', 'sm') {
}
}
+
+1;
+
+=head1 NAME
+
+spacewalk-setup-jabberd - utility for configuring jabberd services to work with
+Spacewalk / Satellite
+
+=head1 SYNOPSIS
+
+B<spacewalk-setup-jabberd>
+[B<--help>]
+[B<--verbose>]
+[B<--macros macro1:macro1value,macro2:macro2value...>]
+
+=head1 OPTIONS
+
+=over 5
+
+=item B<--macros>
+
+Specify macro names and corresponding macro values that will be used for
+substitution after document transformation. You can specify multiple
+macro:value pairs which you need to delimit by commas (example:
+--macros hostname:host.domain.org,pemfile:/etc/pki/tls/certs/localhost.pem).
+
+=item B<--verbose>
+
+Verbose script operation.
+
+=item B<--help>
+
+Print help message.
+
+=back
+
+=head1 DESCRIPTION
+
+B<spacewalk-setup-jabberd> is utility for configuring jabbberd services to work
+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.
+
+The script workflow is:
+
+=over 5
+
+=item
+
+Using xsltproc, apply appropriate XSL template to existing jabberd configuration
+file and read the transformed document.
+
+=item
+
+Substitute macros in transformed document (marked by two @ symbols, for example:
+@hostname@) with macro values (for example: host.domain.org).
+
+=item
+
+Resulting file is written out while the original file is backed up.
+
+=back
+
+=head1 FILES
+
+XSL templates used for transformation of existing jabberd configuration files:
+
+F</usr/share/spacewalk/setup/jabberd/c2s.xsl>
+
+F</usr/share/spacewalk/setup/jabberd/s2s.xsl>
+
+F</usr/share/spacewalk/setup/jabberd/sm.xsl>
+
+=head1 SEE ALSO
+
+B<spacewalk-setup>(1) - Spacewalk setup program
+
+B<xsltproc>(1) - command line XSLT processor
+
+=head1 AUTHORS
+
+Milan Zazrivec
+
+=cut
14 years, 8 months
Changes to 'refs/tags/spacewalk-web-0.7.3-1'
by Michael Mraka
Tag 'spacewalk-web-0.7.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-09-01 12:32 +0000
Tagging package [spacewalk-web] version [0.7.3-1] in directory [web/].
Changes since rhn-client-tools-0.7.1-1:
Michael Mraka (3):
488431 - don't report high usage on UNDO
run db-control report only once
Automatic commit of package [spacewalk-web] release [0.7.3-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/modules/dobby/scripts/check-oracle-space-usage.sh | 12 ++++++++----
web/spacewalk-web.spec | 5 ++++-
3 files changed, 13 insertions(+), 6 deletions(-)
---
14 years, 8 months