Changes to 'refs/tags/spacewalk-web-1.8.47-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.8.47-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-22 15:15 +0000
Tagging package [spacewalk-web] version [1.8.47-1] in directory [web/].
Changes since spacewalk-setup-1.8.20-1:
Jan Pazdziora (10):
Check against any rpm on the ISO.
No migration if the ISO has embedded Oracle software.
Installation is with embedded database if not told otherwise.
Support three possible scenarios.
It is the migration (to PostgreSQL) part which leads to removal of the Oracle client bits.
In the embedded case, install whatever bits we find on the ISO.
Revert oracle_setup_embedded_db part of "added embedded postgresql installation part"
When not using tnsnames.ora, the full service name has to be used.
We need to add Oracle client bits for external database and embedded Oracle.
Automatic commit of package [spacewalk-web] release [1.8.47-1].
Michael Mraka (2):
552628 - alter command can't use bind variables
552628 - added reset-password to man page
Milan Zazrivec (11):
don't pass db-name to upgrade-db.sh
don't support custom db-name in an answer file
don't duplicate database upgrade log
set upgrade_db.log size to 22M
don't restart services when upgrading
upgrade: start pg server only when migrating
524015 - remove /etc/NOCpulse.ini during upgrade
rename router-users.xml as well
remove /var/cache/rhn also for upgrades from Satellite 5.4
correct regexp
859955 - remove spacewalk-slf4j-1.6.1-4.el5sat for RHEL-5 upgrades (cherry picked from commit 111e5edb3502a5433a995a8cc0bc5e6d003e9689)
Stephen Herr (1):
852039 - get rid of useless error messages when verifying backup with db-control
Tomas Kasparek (1):
852038 - Using fetchall_arrayref instead of fullfetch_arrayref.
Tomas Lestach (2):
850714 - do not push strings into an array, when array is expected
562287 - pass proxy configuration to spacewalk-setup to store it into rhn.conf file
---
rel-eng/packages/spacewalk-web | 2
satellite/install/install.pl | 47 ++++++++---
spacewalk/setup/bin/spacewalk-setup | 20 ++---
spacewalk/setup/lib/Spacewalk/Setup.pm | 102 ++++++++++++++++++++++++--
spacewalk/setup/share/oracle/upgrade-db.sh | 2
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 4 -
web/modules/dobby/Dobby/DB.pm | 7 +
web/modules/dobby/Dobby/Files.pm | 9 +-
web/modules/dobby/Dobby/Reporting.pm | 2
web/modules/dobby/scripts/db-control | 5 +
web/spacewalk-web.spec | 10 ++
11 files changed, 168 insertions(+), 42 deletions(-)
---
11 years, 8 months
Changes to 'refs/tags/spacewalk-setup-embedded-postgresql-1.8.3-1'
by Jan Pazdziora
Tag 'spacewalk-setup-embedded-postgresql-1.8.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-10-22 15:16 +0000
Tagging package [spacewalk-setup-embedded-postgresql] version [1.8.3-1] in directory [spacewalk/spacewalk-setup-embedded-postgresql/].
Changes since spacewalk-setup-1.8.20-1:
Jan Pazdziora (10):
Check against any rpm on the ISO.
No migration if the ISO has embedded Oracle software.
Installation is with embedded database if not told otherwise.
Support three possible scenarios.
It is the migration (to PostgreSQL) part which leads to removal of the Oracle client bits.
In the embedded case, install whatever bits we find on the ISO.
Revert oracle_setup_embedded_db part of "added embedded postgresql installation part"
When not using tnsnames.ora, the full service name has to be used.
We need to add Oracle client bits for external database and embedded Oracle.
Automatic commit of package [spacewalk-web] release [1.8.47-1].
Michael Mraka (3):
552628 - alter command can't use bind variables
552628 - added reset-password to man page
Automatic commit of package [spacewalk-setup-embedded-postgresql] release [1.8.3-1].
Milan Zazrivec (11):
don't pass db-name to upgrade-db.sh
don't support custom db-name in an answer file
don't duplicate database upgrade log
set upgrade_db.log size to 22M
don't restart services when upgrading
upgrade: start pg server only when migrating
524015 - remove /etc/NOCpulse.ini during upgrade
rename router-users.xml as well
remove /var/cache/rhn also for upgrades from Satellite 5.4
correct regexp
859955 - remove spacewalk-slf4j-1.6.1-4.el5sat for RHEL-5 upgrades (cherry picked from commit 111e5edb3502a5433a995a8cc0bc5e6d003e9689)
Stephen Herr (1):
852039 - get rid of useless error messages when verifying backup with db-control
Tomas Kasparek (1):
852038 - Using fetchall_arrayref instead of fullfetch_arrayref.
Tomas Lestach (2):
850714 - do not push strings into an array, when array is expected
562287 - pass proxy configuration to spacewalk-setup to store it into rhn.conf file
---
rel-eng/packages/spacewalk-setup-embedded-postgresql | 2
rel-eng/packages/spacewalk-web | 2
satellite/install/install.pl | 47 +++-
spacewalk/setup/bin/spacewalk-setup | 20 -
spacewalk/setup/lib/Spacewalk/Setup.pm | 102 +++++++++-
spacewalk/setup/share/oracle/upgrade-db.sh | 2
spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec | 6
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 4
web/modules/dobby/Dobby/DB.pm | 7
web/modules/dobby/Dobby/Files.pm | 9
web/modules/dobby/Dobby/Reporting.pm | 2
web/modules/dobby/scripts/db-control | 5
web/spacewalk-web.spec | 10
13 files changed, 174 insertions(+), 44 deletions(-)
---
11 years, 8 months
2 commits - rel-eng/packages spacewalk/spacewalk-setup-embedded-postgresql web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-setup-embedded-postgresql | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec | 6 +++++-
web/spacewalk-web.spec | 10 +++++++++-
4 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 834b79721eed0c22333a6d8abff7f4b50a28f3f1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 22 17:16:05 2012 +0200
Automatic commit of package [spacewalk-setup-embedded-postgresql] release [1.8.3-1].
diff --git a/rel-eng/packages/spacewalk-setup-embedded-postgresql b/rel-eng/packages/spacewalk-setup-embedded-postgresql
index 946bfde..f2c0a2a 100644
--- a/rel-eng/packages/spacewalk-setup-embedded-postgresql
+++ b/rel-eng/packages/spacewalk-setup-embedded-postgresql
@@ -1 +1 @@
-1.8.2-1 spacewalk/spacewalk-setup-embedded-postgresql/
+1.8.3-1 spacewalk/spacewalk-setup-embedded-postgresql/
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec
index 1cb1ad2..002fce5 100644
--- a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec
+++ b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-embedded-postgresql
-Version: 1.8.2
+Version: 1.8.3
Release: 1%{?dist}
Summary: Tools to setup embedded PostgreSQL database for Spacewalk
Group: Applications/System
@@ -44,6 +44,10 @@ rm -rf %{buildroot}
%changelog
* Mon Oct 22 2012 Michael Mraka
+- wait for postmaster to be ready
+- made postgresql log more readable
+
+* Mon Oct 22 2012 Michael Mraka
- tuned default postgresql settings
- use current time not start of session time
- 821446 - turning on timestamp logging for pgsql by default
commit 4041ec6953fe61b88f5a8c672e907d0481126267
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 17:15:47 2012 +0200
Automatic commit of package [spacewalk-web] release [1.8.47-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 93f4b32..5c317dc 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.46-1 web/
+1.8.47-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index e7d5324..92712ba 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.46
+Version: 1.8.47
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,14 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Oct 22 2012 Jan Pazdziora 1.8.47-1
+- 852039 - get rid of useless error messages when verifying backup with db-
+ control
+- 552628 - added reset-password to man page
+- 552628 - alter command can't use bind variables
+- 852038 - Using fetchall_arrayref instead of fullfetch_arrayref.
+- 850714 - do not push strings into an array, when array is expected
+
* Mon Oct 22 2012 Jan Pazdziora 1.8.46-1
- removing spurious debugging line from check-database-space-usage.sh
- do not restore dirs if there is none to restore
11 years, 8 months
10 commits - satellite/install spacewalk/setup web/modules
by Jan Pazdziora
satellite/install/install.pl | 14 ++++++++++----
spacewalk/setup/bin/spacewalk-setup | 6 +++---
spacewalk/setup/lib/Spacewalk/Setup.pm | 3 +++
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 4 ++--
web/modules/dobby/Dobby/DB.pm | 7 ++++---
web/modules/dobby/Dobby/Files.pm | 9 +++++++--
web/modules/dobby/Dobby/Reporting.pm | 2 +-
web/modules/dobby/scripts/db-control | 5 +++++
8 files changed, 35 insertions(+), 15 deletions(-)
New commits:
commit dc4d978b0d87b918db9959b7441b32e54cbbce08
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 17:04:51 2012 +0200
859955 - remove spacewalk-slf4j-1.6.1-4.el5sat for RHEL-5 upgrades (cherry picked from commit 111e5edb3502a5433a995a8cc0bc5e6d003e9689)
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 90b455f..eed2288 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -500,6 +500,7 @@ sub remove_obsoleted_packages {
if (`rpm -q --qf='%{VERSION}' redhat-release 2>/dev/null` =~ /^5.+$/) {
push @pkgs, 'xml-commons';
push @pkgs, 'rhn-java-sat';
+ push @pkgs, 'spacewalk-slf4j-1.6.1-4.el5sat';
}
if (Spacewalk::Setup::is_db_migration()) {
commit 9be83b0124b4c3288d41a53d22d1e2c1917cbacf
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Oct 22 17:03:57 2012 +0200
852039 - get rid of useless error messages when verifying backup with db-control
diff --git a/web/modules/dobby/Dobby/Files.pm b/web/modules/dobby/Dobby/Files.pm
index 10afd37..0a14e3f 100644
--- a/web/modules/dobby/Dobby/Files.pm
+++ b/web/modules/dobby/Dobby/Files.pm
@@ -91,8 +91,13 @@ sub gunzip_copy {
$gz->gzclose;
close OUT if $write;
- chown $uid, $gid, $dst;
- chmod 0640, $dst;
+ if (defined($dst)) {
+ # if not defined set it to -1 i.e. no change
+ $uid = -1 if not defined $uid;
+ $gid = -1 if not defined $gid;
+ chown $uid, $gid, $dst;
+ chmod 0640, $dst;
+ }
return $ctx->hexdigest;
}
commit 288256a5becfc6e6d963b52e40c8b8e54d384398
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 22 17:03:06 2012 +0200
562287 - pass proxy configuration to spacewalk-setup to store it into rhn.conf file
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index dce49b1..90b455f 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -46,6 +46,7 @@ my %opts = Spacewalk::Setup::parse_options();
my %up2dateOptions = ();
my %rhnOptions = ();
+my @additionalOptions = ();
# read existing confgiuration
Spacewalk::Setup::read_config(DEFAULT_UP2DATE_CONF_LOCATION, \%up2dateOptions);
@@ -66,7 +67,7 @@ do_precondition_checks(\%opts, \%answers);
print loc("* Pre-install checks complete. Beginning installation.\n");
print loc("* RHN Registration.\n");
-rhn_register(\%opts, \%answers, \%up2dateOptions, \%rhnOptions);
+rhn_register(\%opts, \%answers, \%up2dateOptions, \%rhnOptions, \@additionalOptions);
Spacewalk::Setup::upgrade_stop_services(\%opts);
remove_obsoleted_packages(\%opts);
@@ -124,7 +125,7 @@ if (@not_installed_rpms) {
# Call spacewalk-setup:
print loc("* Now running spacewalk-setup.\n");
-system(SPACEWALK_SETUP_SCRIPT, @ARGV_ORIG, '--skip-logfile-init');
+system(SPACEWALK_SETUP_SCRIPT, @ARGV_ORIG, '--skip-logfile-init', @additionalOptions);
exit;
@@ -285,6 +286,8 @@ sub rhn_register {
my $opts = shift;
my $answers = shift;
my $up2dateopts = shift;
+ my $rhnOptions = shift;
+ my $proxyOptionsRef = shift;
my $proxyAccept;
if ($opts->{disconnected}) {
@@ -362,6 +365,8 @@ Import values to be used by Satellite [y/n]",
}
}
+ push @$proxyOptionsRef, map { "--$_=" . $answers{$_} } grep { defined $answers{$_} } grep /^rhn-http-proxy/, keys %answers;
+
my $sys_hostname = $answers->{hostname};
ask(-question => "RHN Profile Name",
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 0d7e694..876cada 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -1064,9 +1064,9 @@ sub populate_initial_configs {
(
mount_point => $answers->{'mount-point'} || '/var/satellite',
kickstart_mount_point => $answers->{'kickstart-mount-point'} || $answers->{'mount-point'} || '/var/satellite',
- serverDOTsatelliteDOThttp_proxy => $answers->{'rhn-http-proxy'} || '',
- serverDOTsatelliteDOThttp_proxy_username => $answers->{'rhn-http-proxy-username'} || '',
- serverDOTsatelliteDOThttp_proxy_password => $answers->{'rhn-http-proxy-password'} || '',
+ serverDOTsatelliteDOThttp_proxy => ($opts->{'rhn-http-proxy'} ? $opts->{'rhn-http-proxy'} : $answers->{'rhn-http-proxy'}) || '',
+ serverDOTsatelliteDOThttp_proxy_username => ($opts->{'rhn-http-proxy'} ? $opts->{'rhn-http-proxy-username'} : $answers->{'rhn-http-proxy-username'}) || '',
+ serverDOTsatelliteDOThttp_proxy_password => ($opts->{'rhn-http-proxy'} ? $opts->{'rhn-http-proxy-password'} :$answers->{'rhn-http-proxy-password'}) || '',
webDOTis_monitoring_backend => 0,
webDOTis_monitoring_scout => 0,
webDOTenable_solaris_support => 0,
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 770e27f..693a34c 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -120,6 +120,9 @@ sub parse_options {
"enable-tftp:s",
"external-db",
"db-only",
+ "rhn-http-proxy:s",
+ "rhn-http-proxy-username:s",
+ "rhn-http-proxy-password:s",
);
my $usage = loc("usage: %s %s\n",
commit 5daea56fc09f79a045b6e15803a9315620cf91b7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 22 17:02:26 2012 +0200
552628 - added reset-password to man page
diff --git a/web/modules/dobby/scripts/db-control b/web/modules/dobby/scripts/db-control
index 689c5e5..7e14ff0 100755
--- a/web/modules/dobby/scripts/db-control
+++ b/web/modules/dobby/scripts/db-control
@@ -65,6 +65,7 @@ B<db-control>
[B<report>]
[B<report-stats>]
[B<restore DIRNAME>]
+[B<reset-password>]
[B<set-optimizer>]
[B<shrink-segments>]
[B<start>]
@@ -119,6 +120,10 @@ Reports on current usage of database space.
Reports tables with stale or empty statistics. On Oracle DAYS are ignored. On PostgreSQL shows tables, which has not been ANALYZED (gather-stats do that) for DAYS days. Default is one day.
+=item B<reset-password>
+
+Resets database password according to value in /etc/rhn/rhn.conf.
+
=item B<restore DIRNAME>
Restores the database from backup kept in DIRNAME. Database must be stopped for this command to run successfully.
commit 2b02d80403d143eceef2ae6d7eef3f229babc2f8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 22 17:01:30 2012 +0200
552628 - alter command can't use bind variables
diff --git a/web/modules/dobby/Dobby/DB.pm b/web/modules/dobby/Dobby/DB.pm
index b5c696a..8dff2f7 100644
--- a/web/modules/dobby/Dobby/DB.pm
+++ b/web/modules/dobby/Dobby/DB.pm
@@ -490,9 +490,10 @@ sub password_reset {
my $backend = PXT::Config->get('db_backend');
my $dsn = "dbi:Pg:dbname=".PXT::Config->get("db_name");
my $dbh = ($backend eq 'postgresql') ? RHN::DB->direct_connect($dsn) : $self->sysdba_connect;
- my $query = ($backend eq 'postgresql') ? qq|ALTER USER $user WITH ENCRYPTED PASSWORD ?|
- : qq{ALTER USER $user IDENTIFIED BY ? ACCOUNT UNLOCK};
- if ($dbh->do($query, undef, $password)) {
+ my $query = ($backend eq 'postgresql') ?
+ qq{ALTER USER $user WITH ENCRYPTED PASSWORD '$password'}:
+ qq{ALTER USER $user IDENTIFIED BY "$password" ACCOUNT UNLOCK};
+ if ($dbh->do($query)) {
return $user;
}
return 0;
commit 45ae87217daf1283428a06c6e0acb5833aa6726b
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Oct 22 17:01:15 2012 +0200
852038 - Using fetchall_arrayref instead of fullfetch_arrayref.
diff --git a/web/modules/dobby/Dobby/Reporting.pm b/web/modules/dobby/Dobby/Reporting.pm
index 32e4a85..41501a1 100644
--- a/web/modules/dobby/Dobby/Reporting.pm
+++ b/web/modules/dobby/Dobby/Reporting.pm
@@ -131,7 +131,7 @@ SELECT tbs.segment_space_management, rec.*
EOQ
my $sth = $dbh->prepare($query);
$sth->execute;
- return $sth->fullfetch_hashref;
+ return @{$sth->fetchall_arrayref({ })};
}
1;
commit 5bd53373ec6b127a5f02c95e3ad6c0dcdff332d3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 22 17:00:33 2012 +0200
850714 - do not push strings into an array, when array is expected
diff --git a/web/modules/dobby/Dobby/CLI/BackupCommands.pm b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
index d60c697..0a9a43b 100644
--- a/web/modules/dobby/Dobby/CLI/BackupCommands.pm
+++ b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
@@ -114,8 +114,8 @@ sub command_backup {
my @files;
if ($backend eq 'oracle') {
- push @files, $d->lk_file;
- push @files, $d->sp_file;
+ push @files, [$d->lk_file, '/'];
+ push @files, [$d->sp_file, '/'];
}
for my $dir ($d->data_dir, $d->archive_log_dir) {
commit e275e126df612da4d79c00871a475d942ceeb63a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:59:59 2012 +0200
correct regexp
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index be3f7d7..dce49b1 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -545,7 +545,7 @@ sub remove_rhn_cache_and_kickstarts {
}
}
- if ($schema_version and $schema_version =~ /5.[01234].?/) {
+ if ($schema_version and $schema_version =~ /^5\.[01234]\./) {
system('rm -rf /var/cache/rhn/* > /dev/null 2>&1');
if (-d '/var/lib/rhn/kickstarts/wizard') {
commit 944e343c193c36aa3450c7a933de2dc27524dbef
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:59:53 2012 +0200
remove /var/cache/rhn also for upgrades from Satellite 5.4
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 0e85c45..be3f7d7 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -545,7 +545,7 @@ sub remove_rhn_cache_and_kickstarts {
}
}
- if ($schema_version and $schema_version =~ /5.[0123].?/) {
+ if ($schema_version and $schema_version =~ /5.[01234].?/) {
system('rm -rf /var/cache/rhn/* > /dev/null 2>&1');
if (-d '/var/lib/rhn/kickstarts/wizard') {
commit a0839950dd167f61abefed092b46b3c7fd66d9e4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:59:37 2012 +0200
rename router-users.xml as well
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index e1b5dd5..0e85c45 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -523,7 +523,7 @@ sub remove_jabberd_configs {
return if (`rpm -qp --qf='%{VERSION}-%{RELEASE}' Satellite/jabberd-2*.rpm` eq
`rpm -q --qf='%{VERSION}-%{RELEASE}' jabberd`);
- foreach my $cf ('c2s', 's2s', 'sm', 'router') {
+ foreach my $cf ('c2s', 's2s', 'sm', 'router', 'router-users') {
my $cf_path = "/etc/jabberd/$cf.xml";
if (-f $cf_path) {
system("mv -f $cf_path $cf_path.old");
11 years, 8 months
15 commits - satellite/install spacewalk/setup
by Jan Pazdziora
satellite/install/install.pl | 31 ++++++---
spacewalk/setup/bin/spacewalk-setup | 14 +---
spacewalk/setup/lib/Spacewalk/Setup.pm | 99 +++++++++++++++++++++++++++--
spacewalk/setup/share/oracle/upgrade-db.sh | 2
4 files changed, 122 insertions(+), 24 deletions(-)
New commits:
commit 1386b82babaf19de11e4c141aff0e0362a1583fa
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:59:00 2012 +0200
524015 - remove /etc/NOCpulse.ini during upgrade
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index ca37e1f..e1b5dd5 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -72,6 +72,7 @@ Spacewalk::Setup::upgrade_stop_services(\%opts);
remove_obsoleted_packages(\%opts);
remove_jabberd_configs(\%opts);
remove_rhn_cache_and_kickstarts(\%opts);
+remove_nocpulse_ini(\%opts);
my $run_updater;
if (defined $opts{'run-updater'}) {
@@ -553,6 +554,16 @@ sub remove_rhn_cache_and_kickstarts {
}
}
+sub remove_nocpulse_ini {
+ my $opts = shift;
+
+ return unless ($opts->{'upgrade'});
+
+ if (-f "/etc/NOCpulse.ini") {
+ system("rm -f /etc/NOCpulse.ini > /dev/null 2>&1");
+ }
+}
+
sub ask {
my %params = validate(@_, { question => 1,
test => 0,
commit 760940f92267456cf335abc02895025502f39a08
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:58:16 2012 +0200
upgrade: start pg server only when migrating
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index a3412b1..0d7e694 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -150,7 +150,7 @@ print Spacewalk::Setup::loc("* Setting up Cobbler..\n");
setup_cobbler(\%opts, \%answers);
if ($opts{'upgrade'}) {
- if (Spacewalk::Setup::is_embedded_db()) {
+ if (Spacewalk::Setup::is_embedded_db() and Spacewalk::Setup::is_db_migration()) {
Spacewalk::Setup::postgresql_start();
}
commit 8051e06758d16d3ee8d3ee0a9a3f694de1d5bac6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:57:45 2012 +0200
don't restart services when upgrading
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 6311531..a3412b1 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -149,14 +149,6 @@ final_db_config(\%opts, \%answers);
print Spacewalk::Setup::loc("* Setting up Cobbler..\n");
setup_cobbler(\%opts, \%answers);
-print Spacewalk::Setup::loc("* Restarting services.\n");
-Spacewalk::Setup::system_or_exit(['/usr/sbin/spacewalk-service', 'restart'], 40,
- 'Could not restart spacewalk services.');
-
-wait_for_tomcat($answers{hostname}) or exit 56;
-
-Spacewalk::Setup::upgrade_stop_services(\%opts);
-
if ($opts{'upgrade'}) {
if (Spacewalk::Setup::is_embedded_db()) {
Spacewalk::Setup::postgresql_start();
@@ -168,6 +160,10 @@ if ($opts{'upgrade'}) {
print Spacewalk::Setup::loc("for any remaining steps in the process.\n");
}
} else {
+ print Spacewalk::Setup::loc("* Restarting services.\n");
+ Spacewalk::Setup::system_or_exit(['/usr/sbin/spacewalk-service', 'restart'], 40,
+ 'Could not restart spacewalk services.');
+ wait_for_tomcat($answers{hostname}) or exit 56;
print Spacewalk::Setup::loc("Installation complete.\n");
print Spacewalk::Setup::loc("Visit https://%s to create the $product_name administrator account.\n", $answers{hostname});
}
commit 874261e7b6842270e95959cb3e981890761583ba
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:57:23 2012 +0200
set upgrade_db.log size to 22M
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index daa9088..770e27f 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -81,7 +81,7 @@ use constant RHN_LOG_DIR =>
use constant DB_UPGRADE_LOG_FILE =>
'/var/log/rhn/upgrade_db.log';
-use constant DB_UPGRADE_LOG_SIZE => 20000000;
+use constant DB_UPGRADE_LOG_SIZE => 22000000;
use constant DB_INSTALL_LOG_SIZE => 11416;
commit 8a58ad16cce60d2b19fc2fb0042d9db091380fa3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:57:19 2012 +0200
don't duplicate database upgrade log
diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/share/oracle/upgrade-db.sh
index fe9c443..2f13a34 100644
--- a/spacewalk/setup/share/oracle/upgrade-db.sh
+++ b/spacewalk/setup/share/oracle/upgrade-db.sh
@@ -116,6 +116,6 @@ m4 -I$ORACLE_ADMIN_DIR \
--define RHNORA_DB_USER=$DB_USER \
$UPGRADE_TMPL \
| $ORACLE_HOME/bin/sqlplus /nolog \
- | cat > /rhnsat/admin/rhnsat/logs/upgrade_$ORACLE_SID.log
+ | cat -
set +x
commit 25bfaf60faeea8b96216895dbfda89b4e9ef1511
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:56:24 2012 +0200
don't support custom db-name in an answer file
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index fbaaf31..daa9088 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1234,7 +1234,7 @@ sub oracle_setup_embedded_db {
} else {
$answers->{'db-user'} = 'rhnsat' if not defined $answers->{'db-user'};
$answers->{'db-password'} = 'rhnsat' if not defined $answers->{'db-password'};
- $answers->{'db-name'} = 'rhnsat.world' if not defined $answers->{'db-name'};
+ $answers->{'db-name'} = 'rhnsat.world';
$answers->{'db-host'} = 'localhost';
$answers->{'db-port'} = 1521;
}
commit 9f89f118716704f5e69af7c8781bf92b58d3b35a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:55:29 2012 +0200
don't pass db-name to upgrade-db.sh
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index c3b9c4a..fbaaf31 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1253,7 +1253,6 @@ EOQ
-err_code => 15,
-system_opts => ['/sbin/runuser', 'oracle', '-c',
SHARED_DIR . '/oracle/upgrade-db.sh' .
- " --db $answers->{'db-name'}" .
" --user $answers->{'db-user'}"]);
system_or_exit(['service', 'oracle', 'restart'], 41,
commit 04d35281e913ff4a3e564c0349d80b1554812d76
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:55:26 2012 +0200
We need to add Oracle client bits for external database and embedded Oracle.
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 9fb2c65..ca37e1f 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -783,7 +783,8 @@ sub install_rhn_packages {
if (Spacewalk::Setup::is_embedded_db($opts)) {
push(@rpms, glob("EmbeddedDB/*.rpm"), glob("PostgreSQL/*.rpm"));
- } else {
+ }
+ if (not(-d 'PostgreSQL' and Spacewalk::Setup::is_embedded_db($opts))) {
push(@rpms, glob("Oracle/*.rpm"));
}
system_or_exit(['yum', 'localinstall', '-y', @rpms],
commit b2158d59bacc19d4f422a6a33f0e13c918731595
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:55:08 2012 +0200
When not using tnsnames.ora, the full service name has to be used.
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index a68792d..c3b9c4a 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1234,7 +1234,7 @@ sub oracle_setup_embedded_db {
} else {
$answers->{'db-user'} = 'rhnsat' if not defined $answers->{'db-user'};
$answers->{'db-password'} = 'rhnsat' if not defined $answers->{'db-password'};
- $answers->{'db-name'} = 'rhnsat' if not defined $answers->{'db-name'};
+ $answers->{'db-name'} = 'rhnsat.world' if not defined $answers->{'db-name'};
$answers->{'db-host'} = 'localhost';
$answers->{'db-port'} = 1521;
}
@@ -1304,7 +1304,7 @@ EOQ
-log_file_size => DB_INSTALL_LOG_SIZE,
-err_message => "Could not install database.\n",
-err_code => 15,
- -system_opts => [ SHARED_DIR . "/oracle/install-db.sh", "--db", $answers->{'db-name'},
+ -system_opts => [ SHARED_DIR . "/oracle/install-db.sh",
"--user", $answers->{'db-user'}, "--password", $answers->{'db-password'}]);
print loc("** Database: Installation complete.\n");
commit 979de4e04009a5513b940ddf2cd47c2a39e12de2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:54:31 2012 +0200
Revert oracle_setup_embedded_db part of "added embedded postgresql installation part"
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index c89ab8d..a68792d 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1206,6 +1206,7 @@ sub oracle_setup_db {
oracle_check_for_users_and_groups($opts);
print loc("* Setting up database.\n");
+ oracle_setup_embedded_db($opts, $answers);
oracle_setup_db_connection($opts, $answers);
oracle_test_db_settings($opts, $answers);
write_rhn_conf($answers, 'db-backend', 'db-name', 'db-user', 'db-password');
@@ -1224,6 +1225,96 @@ sub oracle_check_for_users_and_groups {
}
}
+sub oracle_setup_embedded_db {
+ my $opts = shift;
+ my $answers = shift;
+
+ if (not is_embedded_db($opts)) {
+ return 0;
+ } else {
+ $answers->{'db-user'} = 'rhnsat' if not defined $answers->{'db-user'};
+ $answers->{'db-password'} = 'rhnsat' if not defined $answers->{'db-password'};
+ $answers->{'db-name'} = 'rhnsat' if not defined $answers->{'db-name'};
+ $answers->{'db-host'} = 'localhost';
+ $answers->{'db-port'} = 1521;
+ }
+
+
+ if ($opts->{'upgrade'}) {
+ printf loc(<<EOQ, DB_UPGRADE_LOG_FILE);
+** Database: Upgrading the database server to latest Oracle 10g:
+** Database: This is a long process that is logged in:
+** Database: %s
+EOQ
+ print_progress(-init_message => "*** Progress: #",
+ -log_file_name => DB_UPGRADE_LOG_FILE,
+ -log_file_size => DB_UPGRADE_LOG_SIZE,
+ -err_message => "Could not upgrade database.\n",
+ -err_code => 15,
+ -system_opts => ['/sbin/runuser', 'oracle', '-c',
+ SHARED_DIR . '/oracle/upgrade-db.sh' .
+ " --db $answers->{'db-name'}" .
+ " --user $answers->{'db-user'}"]);
+
+ system_or_exit(['service', 'oracle', 'restart'], 41,
+ 'Could not restart oracle service');
+
+ return 0;
+ }
+
+ if ($opts->{"skip-db-install"} || $opts->{"upgrade"}) {
+ print loc("** Database: Embedded database installation SKIPPED.\n");
+
+ return 0;
+ }
+
+ if (-d "/rhnsat/data") {
+ my $shared_dir = SHARED_DIR;
+ print loc(<<EOQ);
+The embedded database appears to be already installed. Either rerun
+this script with the --skip-db-install option, or use the
+'$shared_dir/oracle/remove-db.sh' script to remove the embedded database and try
+again.
+EOQ
+
+ exit 13;
+ }
+
+ if (not $opts->{"skip-db-diskspace-check"}) {
+ system_or_exit(['python', SHARED_DIR .
+ '/embedded_diskspace_check.py'], 14,
+ 'There is not enough space available for the embedded database.');
+ }
+ else {
+ print loc("** Database: Embedded database diskspace check SKIPPED!\n");
+ }
+
+ printf loc(<<EOQ, DB_INSTALL_LOG_FILE);
+** Database: Installing the database:
+** Database: This is a long process that is logged in:
+** Database: %s
+EOQ
+
+ if (have_selinux()) {
+ local *X; open X, '>', DB_INSTALL_LOG_FILE and close X;
+ system('/sbin/restorecon', DB_INSTALL_LOG_FILE);
+ }
+ print_progress(-init_message => "*** Progress: #",
+ -log_file_name => DB_INSTALL_LOG_FILE,
+ -log_file_size => DB_INSTALL_LOG_SIZE,
+ -err_message => "Could not install database.\n",
+ -err_code => 15,
+ -system_opts => [ SHARED_DIR . "/oracle/install-db.sh", "--db", $answers->{'db-name'},
+ "--user", $answers->{'db-user'}, "--password", $answers->{'db-password'}]);
+
+ print loc("** Database: Installation complete.\n");
+
+ sleep(5); # We need to sleep because sometimes the database doesn't
+ # come back up fast enough.
+
+ return 1;
+}
+
sub oracle_setup_db_connection {
my $opts = shift;
my $answers = shift;
commit ce19bc03e37ade4607d322b7575f8859c4334ec9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:53:45 2012 +0200
In the embedded case, install whatever bits we find on the ISO.
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 10cbb3b..9fb2c65 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -782,7 +782,7 @@ sub install_rhn_packages {
my @rpms = glob("Satellite/*.rpm");
if (Spacewalk::Setup::is_embedded_db($opts)) {
- push(@rpms, glob("PostgreSQL/*.rpm"));
+ push(@rpms, glob("EmbeddedDB/*.rpm"), glob("PostgreSQL/*.rpm"));
} else {
push(@rpms, glob("Oracle/*.rpm"));
}
commit 444b05dba0cbb400eb059b478cfa4b29f5910020
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:52:49 2012 +0200
It is the migration (to PostgreSQL) part which leads to removal of the Oracle client bits.
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 2af4193..10cbb3b 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -496,11 +496,8 @@ sub remove_obsoleted_packages {
push @pkgs, 'rhn-java-sat';
}
- if (Spacewalk::Setup::is_embedded_db($opts)) {
- push @pkgs, 'spacewalk-oracle', 'perl-NOCpulse-Probe-Oracle', 'NOCpulsePlugins-Oracle';
- }
-
if (Spacewalk::Setup::is_db_migration()) {
+ push @pkgs, 'spacewalk-oracle', 'perl-NOCpulse-Probe-Oracle', 'NOCpulsePlugins-Oracle';
push @pkgs, 'oracle-instantclient-sqlplus';
push @pkgs, 'oracle-instantclient-sqlplus-selinux';
}
commit 0c26a27bb0aee3331d0733bdc22986b67e71b2c6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:52:02 2012 +0200
Support three possible scenarios.
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index d63bdb4..2af4193 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -648,9 +648,13 @@ sub get_required_rpms {
my $NEEDRPMS_FILE = 'updates/rhelrpms';
my @NEEDRPMS_FILES = ($NEEDRPMS_FILE);
if (Spacewalk::Setup::is_embedded_db($opts)) {
- push @NEEDRPMS_FILES, "$NEEDRPMS_FILE.postgresql";
- } else {
- push @NEEDRPMS_FILES, "$NEEDRPMS_FILE.oracle";
+ if (-d 'PostgreSQL') {
+ push @NEEDRPMS_FILES, "$NEEDRPMS_FILE.postgresql";
+ } elsif (-d 'EmbeddedDB') {
+ push @NEEDRPMS_FILES, "$NEEDRPMS_FILE.oracle";
+ }
+ } else { # this is external database, meaning Oracle
+ push @NEEDRPMS_FILES, "$NEEDRPMS_FILE.external-oracle";
}
for my $f (@NEEDRPMS_FILES) {
open FH, $f
commit ee0593e1673d259a4d57cb3f7f17b2692de12a3e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:51:27 2012 +0200
Installation is with embedded database if not told otherwise.
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 859805c..c89ab8d 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -206,12 +206,10 @@ sub load_answer_file {
return;
}
-# Check if we're installing with an embedded database. Check for existence of
-# an "PostgreSQL" directory beneath the dir we're running from (i.e.
-# installing from ISO)
+# Check if we're installing with an embedded database.
sub is_embedded_db {
my $opts = shift;
- return (-d 'PostgreSQL' and not defined($opts->{'external-db'}) ? 1 : 0 );
+ return not defined($opts->{'external-db'});
}
# Return 1 in case setup should also migrate from embedded oracle -> embedded postgresql
commit bae4521e6c086b7fb85dccab1437ac81042eea53
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:50:47 2012 +0200
No migration if the ISO has embedded Oracle software.
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index a892807..859805c 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -216,6 +216,7 @@ sub is_embedded_db {
# Return 1 in case setup should also migrate from embedded oracle -> embedded postgresql
sub is_db_migration {
+ return 0 if not -d 'PostgreSQL';
foreach my $rpm ('oracle-server-i386', 'oracle-server-x86_64', 'oracle-server-s390x') {
system("rpm -q $rpm >& /dev/null");
if ($? >> 8 == 0) {
11 years, 8 months
Changes to 'refs/tags/spacewalk-web-1.8.46-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.8.46-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-22 14:49 +0000
Tagging package [spacewalk-web] version [1.8.46-1] in directory [web/].
Changes since spacewalk-setup-embedded-postgresql-1.8.2-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.8.46-1].
Michael Mraka (2):
made postgresql log more readable
wait for postmaster to be ready
Milan Zazrivec (6):
upgrades: remove cache and kickstart profiles automatically
remove oracle-rhnsat-selinux during oracle -> postgresql migration
set pipefail to correctly detect failed schema migration
run db migration in upgrade mode only
don't remove Oracle stuff during oracle->postgresql migration
upgrade: also remove 5.3 kickstarts
---
rel-eng/packages/spacewalk-web | 2
satellite/install/install.pl | 24 +++++++
spacewalk/setup/lib/Spacewalk/Setup.pm | 32 ----------
spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql | 13 +++-
web/spacewalk-web.spec | 9 ++
5 files changed, 47 insertions(+), 33 deletions(-)
---
11 years, 8 months
Changes to 'refs/tags/spacewalk-setup-1.8.20-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.8.20-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-22 14:50 +0000
Tagging package [spacewalk-setup] version [1.8.20-1] in directory [spacewalk/setup/].
Changes since spacewalk-setup-embedded-postgresql-1.8.2-1:
Jan Pazdziora (2):
Automatic commit of package [spacewalk-web] release [1.8.46-1].
Automatic commit of package [spacewalk-setup] release [1.8.20-1].
Michael Mraka (2):
made postgresql log more readable
wait for postmaster to be ready
Milan Zazrivec (6):
upgrades: remove cache and kickstart profiles automatically
remove oracle-rhnsat-selinux during oracle -> postgresql migration
set pipefail to correctly detect failed schema migration
run db migration in upgrade mode only
don't remove Oracle stuff during oracle->postgresql migration
upgrade: also remove 5.3 kickstarts
---
rel-eng/packages/spacewalk-setup | 2
rel-eng/packages/spacewalk-web | 2
satellite/install/install.pl | 24 +++++++
spacewalk/setup/lib/Spacewalk/Setup.pm | 32 ----------
spacewalk/setup/spacewalk-setup.spec | 9 ++
spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql | 13 +++-
web/spacewalk-web.spec | 9 ++
7 files changed, 56 insertions(+), 35 deletions(-)
---
11 years, 8 months
11 commits - rel-eng/packages satellite/install spacewalk/setup spacewalk/spacewalk-setup-embedded-postgresql web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2
rel-eng/packages/spacewalk-web | 2
satellite/install/install.pl | 26 +++++++-
spacewalk/setup/lib/Spacewalk/Setup.pm | 32 ----------
spacewalk/setup/spacewalk-setup.spec | 9 ++
spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql | 13 +++-
web/spacewalk-web.spec | 9 ++
7 files changed, 57 insertions(+), 36 deletions(-)
New commits:
commit f1c5c0b6115c7ee6dc3ebbdf5c9bce21a17993b4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:50:08 2012 +0200
Check against any rpm on the ISO.
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index e7a9ded..d63bdb4 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -105,7 +105,7 @@ install_rhn_packages(\%opts);
my %satellite_rpms = map { m!^.+/(.+)-.+-.+$! and ( $1 => 1 ); }
- glob("Satellite/*.rpm Oracle/*.rpm PostgreSQL/*.rpm");
+ glob("Satellite/*.rpm Oracle/*.rpm EmbeddedDB/*.rpm PostgreSQL/*.rpm");
my %current_rpm_qa =
map { ( $_ => 1 ) }
grep { not exists $rpm_qa{$_} and not exists $satellite_rpms{$_} }
commit fc39ec837c104f860a1b1c4b00b566a8bfb00326
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:50:03 2012 +0200
Automatic commit of package [spacewalk-setup] release [1.8.20-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index a15bfdc..3370b18 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.8.19-1 spacewalk/setup/
+1.8.20-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index c225465..23c20b7 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.8.19
+Version: 1.8.20
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -110,6 +110,13 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Mon Oct 22 2012 Jan Pazdziora 1.8.20-1
+- don't remove Oracle stuff during oracle->postgresql migration
+- run db migration in upgrade mode only
+- set pipefail to correctly detect failed schema migration
+- remove oracle-rhnsat-selinux during oracle -> postgresql migration
+- Logic for embedded database migration
+
* Mon Oct 22 2012 Michael Mraka
- check free space under /var/lib/pgsql/data
- modified embedded_diskspace_check to support non default directories
commit d1d94b7f20c71a5bbbf28c1232f7ebf89ed5bd37
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 22 16:49:52 2012 +0200
Automatic commit of package [spacewalk-web] release [1.8.46-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 64dddbc..93f4b32 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.45-1 web/
+1.8.46-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 6f3925e..e7d5324 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.45
+Version: 1.8.46
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,13 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Oct 22 2012 Jan Pazdziora 1.8.46-1
+- removing spurious debugging line from check-database-space-usage.sh
+- do not restore dirs if there is none to restore
+- ignore missing backup_dir on old dumps
+- 825804 - check-oracle-space-usage.sh renamed to check-database-space-usage.sh
+- 815236 - use df with POSIX compatibility
+
* Mon Oct 22 2012 Miroslav Suchý
- 805822 - warn about parsing backup log
- 805822 - mark some commands as Oracle only and sync --help with man page
commit 4148ffa7ed60698bc9aee39684ebedcd694f2cac
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:49:20 2012 +0200
upgrade: also remove 5.3 kickstarts
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 3002ed7..e7a9ded 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -547,7 +547,7 @@ sub remove_rhn_cache_and_kickstarts {
}
}
- if ($schema_version and $schema_version =~ /5.[012].?/) {
+ if ($schema_version and $schema_version =~ /5.[0123].?/) {
system('rm -rf /var/cache/rhn/* > /dev/null 2>&1');
if (-d '/var/lib/rhn/kickstarts/wizard') {
commit 2cf59c9ca96219500f4980cabe922175702e10a0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:48:57 2012 +0200
don't remove Oracle stuff during oracle->postgresql migration
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index d0aafeb..a892807 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1146,28 +1146,6 @@ sub embedded_oracle_stop {
}
}
-sub remove_oracle_packages {
- my @rpms = ('oracle-instantclient-jdbc', 'oracle-rhnsat-selinux', 'oracle-server-admin',
- 'oracle-server-scripts', 'oracle-server-scripts', 'oracle-server-i386',
- 'oracle-server-x86_64', 'oracle-server-s390x');
- my @delete = ();
-
- foreach my $rpm (@rpms) {
- system("rpm -q $rpm >& /dev/null");
- push(@delete, $rpm) if ($? >> 8 == 0);
- }
-
- system_or_exit(['rpm', '-e', @delete], 1, "*** Database: package removal failed");
-}
-
-sub remove_oracle_files {
- my @paths = ('/opt/apps/oracle', '/rhnsat');
-
- foreach my $path (@paths) {
- system_or_exit(['rm', '-rf', $path], 1, "*** Database: Removal of $path failed.\n");
- }
-}
-
sub migrate_embedded_db {
my $opts = shift;
my $answers = shift;
@@ -1211,12 +1189,6 @@ sub migrate_embedded_db {
print loc("** Database: Data migration successfully completed.\n");
print loc("** Database: Stoping embedded Oracle database.\n");
embedded_oracle_stop();
-
- print loc("** Database: Removing Oracle database.\n");
- print loc("*** Database: Removing packages.\n");
- remove_oracle_packages();
- print loc("*** Database: Removing configuration and database files.\n");
- remove_oracle_files();
}
commit e6c188d273624531bd36c6969596c0ff5dca7443
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:48:07 2012 +0200
run db migration in upgrade mode only
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 98be2cf..d0aafeb 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -934,7 +934,7 @@ sub postgresql_setup_db {
write_rhn_conf($answers, 'db-backend', 'db-host', 'db-port', 'db-name', 'db-user', 'db-password');
postgresql_populate_db($opts, $answers);
- if (is_db_migration()) {
+ if (is_db_migration() and $opts->{"upgrade"}) {
print loc("* Database: Starting embedded database migration.\n");
migrate_embedded_db($opts, $answers);
}
commit e44f8a06470196bedf05e9ba819dfce4f938ccb6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:47:45 2012 +0200
set pipefail to correctly detect failed schema migration
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index afa5c5d..98be2cf 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1198,7 +1198,7 @@ sub migrate_embedded_db {
print loc("*** Database: Migration process logged at: " . DB_MIGRATION_LOG_FILE . "\n");
log_rotate(DB_MIGRATION_LOG_FILE);
system_or_exit(["/bin/bash", "-c",
- "(/usr/bin/spacewalk-dump-schema" .
+ "(set -o pipefail; /usr/bin/spacewalk-dump-schema" .
" --db=" . $emb_oracle_creds->{'db-name'} .
" --user=" . $emb_oracle_creds->{'db-user'} .
" --password=" . $emb_oracle_creds->{'db-password'} . " | spacewalk-sql" .
commit 3e2895ba2b20acad6673fcc6520ce9bc4bbb456d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:46:49 2012 +0200
remove oracle-rhnsat-selinux during oracle -> postgresql migration
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index d343139..afa5c5d 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1147,7 +1147,7 @@ sub embedded_oracle_stop {
}
sub remove_oracle_packages {
- my @rpms = ('oracle-instantclient-jdbc', 'oracle-server-admin',
+ my @rpms = ('oracle-instantclient-jdbc', 'oracle-rhnsat-selinux', 'oracle-server-admin',
'oracle-server-scripts', 'oracle-server-scripts', 'oracle-server-i386',
'oracle-server-x86_64', 'oracle-server-s390x');
my @delete = ();
commit 4dfddf3dd38ec84423d493112c74ad1332864bf7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 22 16:46:29 2012 +0200
wait for postmaster to be ready
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
index b4aa735..33d2017 100755
--- a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
+++ b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
@@ -43,6 +43,8 @@ help() {
PG_DATA=/var/lib/pgsql/data
PG_HBA="$PG_DATA/pg_hba.conf"
POSTGRESQL="$PG_DATA/postgresql.conf"
+PG_PIDFILE="/var/run/postmaster.5432.pid"
+PG_SOCKET="/tmp/.s.PGSQL.5432"
create() {
if [ -z "$PGUSER" -o -z "$PGPASSWORD" -o -z "$PGNAME" ] ; then
@@ -84,6 +86,15 @@ EOF
service postgresql start
+ if /usr/sbin/lsof /proc > /dev/null ; then
+ while [ -f "$PG_PIDFILE" ] ; do
+ # wait for postmaster to be ready
+ /usr/sbin/lsof -t -p $(cat "$PG_PIDFILE" 2>/dev/null) -a "$PG_SOCKET" \
+ && break
+ sleep 1
+ done
+ fi
+
if ! exists_db ; then
runuser - postgres -c "createdb '$PGNAME'; createlang plpgsql '$PGNAME'"
fi
commit fdc2d954291be6e990e12ae04250c7802b125e4b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 22 16:45:58 2012 +0200
made postgresql log more readable
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
index 349a9fe..b4aa735 100755
--- a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
+++ b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
@@ -62,7 +62,7 @@ create() {
checkpoint_completion_target = 0.7
checkpoint_segments = 8
effective_cache_size = 1152MB
-log_line_prefix = '%m'
+log_line_prefix = '%m '
maintenance_work_mem = 96MB
max_connections = 600
shared_buffers = 384MB
commit 9df95709ec863b21dc05322158c5daa9e27eba37
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:45:17 2012 +0200
upgrades: remove cache and kickstart profiles automatically
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index c3985f2..3002ed7 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -71,6 +71,7 @@ rhn_register(\%opts, \%answers, \%up2dateOptions, \%rhnOptions);
Spacewalk::Setup::upgrade_stop_services(\%opts);
remove_obsoleted_packages(\%opts);
remove_jabberd_configs(\%opts);
+remove_rhn_cache_and_kickstarts(\%opts);
my $run_updater;
if (defined $opts{'run-updater'}) {
@@ -532,6 +533,29 @@ sub remove_jabberd_configs {
}
}
+sub remove_rhn_cache_and_kickstarts {
+ my $opts = shift;
+
+ return unless ($opts->{'upgrade'});
+
+ my $schema_version;
+
+ foreach my $schema ('satellite-schema', 'rhn-satellite-schema') {
+ system("rpm -q --qf='%{VERSION}' $schema >/dev/nul 2>&1");
+ if ($? >> 8 == 0) {
+ $schema_version = `rpm -q --qf='%{VERSION}' $schema 2>/dev/null`;
+ }
+ }
+
+ if ($schema_version and $schema_version =~ /5.[012].?/) {
+ system('rm -rf /var/cache/rhn/* > /dev/null 2>&1');
+
+ if (-d '/var/lib/rhn/kickstarts/wizard') {
+ system('rm -f /var/lib/rhn/kickstarts/wizard/* > /dev/null 2>&1');
+ }
+ }
+}
+
sub ask {
my %params = validate(@_, { question => 1,
test => 0,
11 years, 8 months
Changes to 'refs/tags/spacewalk-setup-embedded-postgresql-1.8.2-1'
by Jan Pazdziora
Tag 'spacewalk-setup-embedded-postgresql-1.8.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-10-22 14:44 +0000
Tagging package [spacewalk-setup-embedded-postgresql] version [1.8.2-1] in directory [spacewalk/spacewalk-setup-embedded-postgresql/].
Changes since spacewalk-web-1.8.45-1:
Michael Mraka (3):
use current time not start of session time
tuned default postgresql settings
Automatic commit of package [spacewalk-setup-embedded-postgresql] release [1.8.2-1].
Milan Zazrivec (9):
packages to remove for embedded PostgreSQL upgrades
upgrades: remove xml-commons on RHEL-5 only
rhel-5 upgrades: remove rhn-java-sat
let's start embedded database before checking its state
remove instantclient-sqlplus* packages for Satellite 5.5 @ PostgreSQL
remove old jabberd configs
use nicer statements
don't remove jabberd configs if we're on latest version already
Logic for embedded database migration
Miroslav Suchý (3):
815236 - use df with POSIX compatibility
ignore missing backup_dir on old dumps
do not restore dirs if there is none to restore
Stephen Herr (3):
825804 - check-oracle-space-usage.sh renamed to check-database-space-usage.sh
821446 - turning on timestamp logging for pgsql by default
removing spurious debugging line from check-database-space-usage.sh
---
rel-eng/packages/spacewalk-setup-embedded-postgresql | 2
satellite/install/install.pl | 40 +++
spacewalk/setup/bin/spacewalk-setup | 4
spacewalk/setup/lib/Spacewalk/Setup.pm | 122 +++++++++-
spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql | 20 +
spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec | 8
web/modules/dobby/Dobby/BackupLog.pm | 3
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 8
web/modules/dobby/scripts/check-database-space-usage.sh | 62 +++++
web/modules/dobby/scripts/check-oracle-space-usage.sh | 62 -----
web/spacewalk-web.spec | 4
11 files changed, 260 insertions(+), 75 deletions(-)
---
11 years, 8 months
18 commits - rel-eng/packages satellite/install spacewalk/setup spacewalk/spacewalk-setup-embedded-postgresql web/modules web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-setup-embedded-postgresql | 2
satellite/install/install.pl | 40 +++
spacewalk/setup/bin/spacewalk-setup | 4
spacewalk/setup/lib/Spacewalk/Setup.pm | 122 +++++++++-
spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql | 20 +
spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec | 8
web/modules/dobby/Dobby/BackupLog.pm | 3
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 8
web/modules/dobby/scripts/check-database-space-usage.sh | 62 +++++
web/modules/dobby/scripts/check-oracle-space-usage.sh | 62 -----
web/spacewalk-web.spec | 4
11 files changed, 260 insertions(+), 75 deletions(-)
New commits:
commit 320bd895e3fd1e2f17a92bf6fe6ca707e96bb0c7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 22 16:44:25 2012 +0200
Automatic commit of package [spacewalk-setup-embedded-postgresql] release [1.8.2-1].
diff --git a/rel-eng/packages/spacewalk-setup-embedded-postgresql b/rel-eng/packages/spacewalk-setup-embedded-postgresql
index 9f519d6..946bfde 100644
--- a/rel-eng/packages/spacewalk-setup-embedded-postgresql
+++ b/rel-eng/packages/spacewalk-setup-embedded-postgresql
@@ -1 +1 @@
-1.8.1-1 spacewalk/spacewalk-setup-embedded-postgresql/
+1.8.2-1 spacewalk/spacewalk-setup-embedded-postgresql/
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec
index 4bd07eb..1cb1ad2 100644
--- a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec
+++ b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-embedded-postgresql
-Version: 1.8.1
+Version: 1.8.2
Release: 1%{?dist}
Summary: Tools to setup embedded PostgreSQL database for Spacewalk
Group: Applications/System
@@ -44,5 +44,11 @@ rm -rf %{buildroot}
%changelog
* Mon Oct 22 2012 Michael Mraka
+- tuned default postgresql settings
+- use current time not start of session time
+- 821446 - turning on timestamp logging for pgsql by default
+- let's start embedded database before checking its state
+
+* Mon Oct 22 2012 Michael Mraka
- spacewalk-setup-embedded-postgresql 1.8
commit a810484e08ba108adbabba8273f809ddf1794375
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Oct 22 16:35:53 2012 +0200
removing spurious debugging line from check-database-space-usage.sh
diff --git a/web/modules/dobby/scripts/check-database-space-usage.sh b/web/modules/dobby/scripts/check-database-space-usage.sh
index 6de4e20..e9e2733 100755
--- a/web/modules/dobby/scripts/check-database-space-usage.sh
+++ b/web/modules/dobby/scripts/check-database-space-usage.sh
@@ -55,7 +55,6 @@ NUMBERS=$(echo "$REPORTUSAGE" | awk '{if (FNR > 1) {sub("%",""); print $5}}')
for num in $NUMBERS
do
# if number is over 90% then send warning email
- echo $num
if [ $num -gt 90 ]
then mailitout "$REPORTUSAGE"
fi
commit 5926a98a5c6ed09601876e1149a2826dc4e057be
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:35:13 2012 +0200
Logic for embedded database migration
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 1e8308d..6311531 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -158,6 +158,10 @@ wait_for_tomcat($answers{hostname}) or exit 56;
Spacewalk::Setup::upgrade_stop_services(\%opts);
if ($opts{'upgrade'}) {
+ if (Spacewalk::Setup::is_embedded_db()) {
+ Spacewalk::Setup::postgresql_start();
+ }
+
print Spacewalk::Setup::loc("This portion of the $product_name upgrade process has successfully completed.\n");
if ($product_name =~ /Satellite/) {
print Spacewalk::Setup::loc("Please refer to appropriate upgrade document in /etc/sysconfig/rhn/satellite-upgrade\n");
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index a024def..d343139 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -85,6 +85,9 @@ use constant DB_UPGRADE_LOG_SIZE => 20000000;
use constant DB_INSTALL_LOG_SIZE => 11416;
+use constant DB_MIGRATION_LOG_FILE =>
+ '/var/log/rhn/rhn_db_migration.log';
+
my $DEBUG;
@@ -211,6 +214,18 @@ sub is_embedded_db {
return (-d 'PostgreSQL' and not defined($opts->{'external-db'}) ? 1 : 0 );
}
+# Return 1 in case setup should also migrate from embedded oracle -> embedded postgresql
+sub is_db_migration {
+ foreach my $rpm ('oracle-server-i386', 'oracle-server-x86_64', 'oracle-server-s390x') {
+ system("rpm -q $rpm >& /dev/null");
+ if ($? >> 8 == 0) {
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
sub system_debug {
my @args = @_;
@@ -894,7 +909,9 @@ sub postgresql_setup_db {
print Spacewalk::Setup::loc("** Database: Setting up database connection for PostgreSQL backend.\n");
my $connected;
+ postgresql_start();
postgresql_setup_embedded_db($opts, $answers);
+
while (not $connected) {
postgresql_get_database_answers($opts, $answers);
@@ -917,9 +934,20 @@ sub postgresql_setup_db {
write_rhn_conf($answers, 'db-backend', 'db-host', 'db-port', 'db-name', 'db-user', 'db-password');
postgresql_populate_db($opts, $answers);
+ if (is_db_migration()) {
+ print loc("* Database: Starting embedded database migration.\n");
+ migrate_embedded_db($opts, $answers);
+ }
+
return 1;
}
+sub postgresql_start {
+ system('service postgresql status >&/dev/null');
+ system('service postgresql start >&/dev/null') if ($? >> 8);
+ return ($? >> 8);
+}
+
sub postgresql_setup_embedded_db {
my $opts = shift;
my $answers = shift;
@@ -928,7 +956,7 @@ sub postgresql_setup_embedded_db {
return 0;
}
- if ($opts->{"skip-db-install"}) {
+ if ($opts->{"skip-db-install"} or $opts->{"upgrade"} and not is_db_migration()) {
print loc("** Database: Embedded database installation SKIPPED.\n");
return 0;
}
@@ -987,7 +1015,7 @@ sub postgresql_populate_db {
print Spacewalk::Setup::loc("** Database: Populating database.\n");
- if ($opts->{"skip-db-population"} || $opts->{"upgrade"}) {
+ if ($opts->{"skip-db-population"} or ($opts->{"upgrade"} and not is_db_migration())) {
print Spacewalk::Setup::loc("** Database: Skipping database population.\n");
return 1;
}
@@ -1099,7 +1127,97 @@ sub postgresql_clear_db {
return 1;
}
+sub embedded_oracle_start {
+ if (-x "/etc/init.d/oracle") {
+ system("service oracle start >&/dev/null");
+ } else {
+ system("runuser", "oracle", "-l", "-c", "lsnrctl start >&/dev/null");
+ system("runuser", "oracle", "-l", "-c", "echo startup|ORACLE_SID=rhnsat sqlplus '/ as sysdba' >&/dev/null");
+ }
+}
+
+sub embedded_oracle_stop {
+ if (-x "/etc/init.d/oracle") {
+ system("service oracle stop >& /dev/null");
+ } else {
+ system("runuser", "oracle", "-l", "-c", "lsnrctl stop >&/dev/null");
+ system("runuser", "oracle", "-l", "-c",
+ "echo shutdown immediate|ORACLE_SID=rhnsat sqlplus '/ as sysdba' >&/dev/null");
+ }
+}
+
+sub remove_oracle_packages {
+ my @rpms = ('oracle-instantclient-jdbc', 'oracle-server-admin',
+ 'oracle-server-scripts', 'oracle-server-scripts', 'oracle-server-i386',
+ 'oracle-server-x86_64', 'oracle-server-s390x');
+ my @delete = ();
+
+ foreach my $rpm (@rpms) {
+ system("rpm -q $rpm >& /dev/null");
+ push(@delete, $rpm) if ($? >> 8 == 0);
+ }
+
+ system_or_exit(['rpm', '-e', @delete], 1, "*** Database: package removal failed");
+}
+
+sub remove_oracle_files {
+ my @paths = ('/opt/apps/oracle', '/rhnsat');
+
+ foreach my $path (@paths) {
+ system_or_exit(['rm', '-rf', $path], 1, "*** Database: Removal of $path failed.\n");
+ }
+}
+
+sub migrate_embedded_db {
+ my $opts = shift;
+ my $answers = shift;
+
+ # FIXME: Test sufficient disk space for migration
+ print loc("** Database: Starting embedded Oracle database.\n");
+ embedded_oracle_start();
+
+ my $emb_oracle_creds = {
+ 'db-backend' => 'oracle',
+ 'db-host' => 'localhost',
+ 'db-port' => 1521,
+ };
+
+ $emb_oracle_creds->{'db-name'} = $answers->{'embedded-oracle-name'} || 'rhnsat';
+ $emb_oracle_creds->{'db-user'} = $answers->{'embedded-oracle-user'} || 'rhnsat';
+ $emb_oracle_creds->{'db-password'} = $answers->{'embedded-oracle-password'} || 'rhnsat';
+
+ print loc("** Database: Trying to connect to embedded Oracle database: ");
+ if (_oracle_check_connect_info($emb_oracle_creds) != 2) {
+ print loc("failed.\n*** Please make sure you are using correct Oracle database login credentials.\n");
+ exit 1;
+ } else {
+ print loc("succeded.\n");
+ }
+ print loc("** Database: Migrating data.\n");
+ print loc("*** Database: Migration process logged at: " . DB_MIGRATION_LOG_FILE . "\n");
+ log_rotate(DB_MIGRATION_LOG_FILE);
+ system_or_exit(["/bin/bash", "-c",
+ "(/usr/bin/spacewalk-dump-schema" .
+ " --db=" . $emb_oracle_creds->{'db-name'} .
+ " --user=" . $emb_oracle_creds->{'db-user'} .
+ " --password=" . $emb_oracle_creds->{'db-password'} . " | spacewalk-sql" .
+ " --verbose" .
+ " --select-mode-direct" .
+ " - ) > " . DB_MIGRATION_LOG_FILE . ' 2>&1'],
+ 1,
+ "*** Data migration failed.");
+
+ print loc("** Database: Data migration successfully completed.\n");
+ print loc("** Database: Stoping embedded Oracle database.\n");
+ embedded_oracle_stop();
+
+ print loc("** Database: Removing Oracle database.\n");
+ print loc("*** Database: Removing packages.\n");
+ remove_oracle_packages();
+ print loc("*** Database: Removing configuration and database files.\n");
+ remove_oracle_files();
+}
commit f03954b581e4d267167127ab2fe497881ac25403
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:35:03 2012 +0200
don't remove jabberd configs if we're on latest version already
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 75d1548..c3985f2 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -520,6 +520,9 @@ sub remove_jabberd_configs {
my $opts = shift;
return unless ($opts->{'upgrade'});
+ # Don't remove the config files if we're on latest version already
+ return if (`rpm -qp --qf='%{VERSION}-%{RELEASE}' Satellite/jabberd-2*.rpm` eq
+ `rpm -q --qf='%{VERSION}-%{RELEASE}' jabberd`);
foreach my $cf ('c2s', 's2s', 'sm', 'router') {
my $cf_path = "/etc/jabberd/$cf.xml";
commit d2d3ec1f9269d0d018a645373f7d143148d4fd99
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:34:10 2012 +0200
use nicer statements
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 91a463b..75d1548 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -519,7 +519,7 @@ sub remove_obsoleted_packages {
sub remove_jabberd_configs {
my $opts = shift;
- return if (not $opts->{'upgrade'});
+ return unless ($opts->{'upgrade'});
foreach my $cf ('c2s', 's2s', 'sm', 'router') {
my $cf_path = "/etc/jabberd/$cf.xml";
commit c68eea2e1a3a506f482488f8dc02674398fd55fa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 22 16:34:02 2012 +0200
do not restore dirs if there is none to restore
diff --git a/web/modules/dobby/Dobby/CLI/BackupCommands.pm b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
index 57e7825..d60c697 100644
--- a/web/modules/dobby/Dobby/CLI/BackupCommands.pm
+++ b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
@@ -294,9 +294,11 @@ sub command_restore {
print "done.\n";
print "Restoring empty directories... ";
- for my $dir_entry (@{$log->cold_dirs}) {
- if (my @dirs = File::Path::mkpath($dir_entry->from, 0, 0700)) {
- chown $uid, $gid, @dirs;
+ if ($log->cold_dirs) {
+ for my $dir_entry (@{$log->cold_dirs}) {
+ if (my @dirs = File::Path::mkpath($dir_entry->from, 0, 0700)) {
+ chown $uid, $gid, @dirs;
+ }
}
}
print "done.\n";
commit 24a8274b09397abaadb279f4d025067bf7275560
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 22 16:33:47 2012 +0200
ignore missing backup_dir on old dumps
diff --git a/web/modules/dobby/Dobby/BackupLog.pm b/web/modules/dobby/Dobby/BackupLog.pm
index 3928531..0439cef 100644
--- a/web/modules/dobby/Dobby/BackupLog.pm
+++ b/web/modules/dobby/Dobby/BackupLog.pm
@@ -61,7 +61,8 @@ sub fromXml() {
$log->start(getTextValue($doc,'start'));
$log->type(getTextValue($doc,'type'));
$log->finish(getTextValue($doc,'finish'));
- $log->base_dir(getTextValue($doc,'basedir'));
+ # this may fail on 5.4- dumps, it is safe to ignore it
+ eval { $log->base_dir(getTextValue($doc,'basedir')); };
foreach my $fileentry ($doc->getElementsByTagName('fileentry')){
commit 6b8b8aee4443dc326ebfe132ce733649b83e2fc7
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:33:45 2012 +0200
remove old jabberd configs
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index e2764db..91a463b 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -70,7 +70,7 @@ rhn_register(\%opts, \%answers, \%up2dateOptions, \%rhnOptions);
Spacewalk::Setup::upgrade_stop_services(\%opts);
remove_obsoleted_packages(\%opts);
-
+remove_jabberd_configs(\%opts);
my $run_updater;
if (defined $opts{'run-updater'}) {
@@ -513,6 +513,22 @@ sub remove_obsoleted_packages {
return 1;
}
+# We need to remove jabberd configs before the package installation so that
+# they can be replaced by configs from latest jabberd build. These will later
+# be properly configured by spacewalk-setup-jabberd.
+sub remove_jabberd_configs {
+ my $opts = shift;
+
+ return if (not $opts->{'upgrade'});
+
+ foreach my $cf ('c2s', 's2s', 'sm', 'router') {
+ my $cf_path = "/etc/jabberd/$cf.xml";
+ if (-f $cf_path) {
+ system("mv -f $cf_path $cf_path.old");
+ }
+ }
+}
+
sub ask {
my %params = validate(@_, { question => 1,
test => 0,
commit 45929ac17ccf2174137dbee1d7dcba07325ca559
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:33:08 2012 +0200
remove instantclient-sqlplus* packages for Satellite 5.5 @ PostgreSQL
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 290898d..e2764db 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -499,6 +499,11 @@ sub remove_obsoleted_packages {
push @pkgs, 'spacewalk-oracle', 'perl-NOCpulse-Probe-Oracle', 'NOCpulsePlugins-Oracle';
}
+ if (Spacewalk::Setup::is_db_migration()) {
+ push @pkgs, 'oracle-instantclient-sqlplus';
+ push @pkgs, 'oracle-instantclient-sqlplus-selinux';
+ }
+
for my $pkg (@pkgs) {
if (system_debug('rpm', '-q', $pkg) == 0) {
system_debug('rpm', '-ev', '--nodeps', $pkg);
commit 3c08c95fd11df1da90c6595afa00ccddb6fd4fae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 22 16:32:42 2012 +0200
tuned default postgresql settings
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
index 82e15b0..349a9fe 100755
--- a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
+++ b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
@@ -55,7 +55,20 @@ create() {
service postgresql initdb
# see bug 821446, we enable timestamps in logs by default
- sed -i 's/^\(.*log_line_prefix.*\)$/### Edited by spacewalk-setup-embedded-postgresql: ###\n# was: \1\nlog_line_prefix = '\''%m'\''/ ' $POSTGRESQL
+ sed -i 's/^\(max_connections.*\|shared_buffers.*\)$/### next line has been commented out by spacewalk-setup-embedded-postgresql: ###\n##\1/ ' $POSTGRESQL
+ cat >> $POSTGRESQL <<EOF
+
+### spacewalk-setup-embedded-postgresql modified values
+checkpoint_completion_target = 0.7
+checkpoint_segments = 8
+effective_cache_size = 1152MB
+log_line_prefix = '%m'
+maintenance_work_mem = 96MB
+max_connections = 600
+shared_buffers = 384MB
+wal_buffers = 4MB
+work_mem = 2560kB
+EOF
sed -i 's/^\([^#].*\)$/### next line has been commented out by spacewalk-setup-embedded-postgresql: ###\n##\1/ ' $PG_HBA
cat >> $PG_HBA <<EOF
commit e89ce7637c6dcb76b167a214aed6d0c5d6d6ff33
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 22 16:32:31 2012 +0200
use current time not start of session time
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
index 8a25adf..82e15b0 100755
--- a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
+++ b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
@@ -55,7 +55,7 @@ create() {
service postgresql initdb
# see bug 821446, we enable timestamps in logs by default
- sed -i 's/^\(.*log_line_prefix.*\)$/### Edited by spacewalk-setup-embedded-postgresql: ###\n# was: \1\nlog_line_prefix = '\''%s'\''/ ' $POSTGRESQL
+ sed -i 's/^\(.*log_line_prefix.*\)$/### Edited by spacewalk-setup-embedded-postgresql: ###\n# was: \1\nlog_line_prefix = '\''%m'\''/ ' $POSTGRESQL
sed -i 's/^\([^#].*\)$/### next line has been commented out by spacewalk-setup-embedded-postgresql: ###\n##\1/ ' $PG_HBA
cat >> $PG_HBA <<EOF
commit fbeff8464e841df175ea769d55fd0aa8bed076a4
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Oct 22 16:32:16 2012 +0200
821446 - turning on timestamp logging for pgsql by default
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
index 07ae368..8a25adf 100755
--- a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
+++ b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
@@ -42,6 +42,7 @@ help() {
PG_DATA=/var/lib/pgsql/data
PG_HBA="$PG_DATA/pg_hba.conf"
+POSTGRESQL="$PG_DATA/postgresql.conf"
create() {
if [ -z "$PGUSER" -o -z "$PGPASSWORD" -o -z "$PGNAME" ] ; then
@@ -53,6 +54,9 @@ create() {
if [ ! -d "$PG_DATA/base" ] ; then
service postgresql initdb
+ # see bug 821446, we enable timestamps in logs by default
+ sed -i 's/^\(.*log_line_prefix.*\)$/### Edited by spacewalk-setup-embedded-postgresql: ###\n# was: \1\nlog_line_prefix = '\''%s'\''/ ' $POSTGRESQL
+
sed -i 's/^\([^#].*\)$/### next line has been commented out by spacewalk-setup-embedded-postgresql: ###\n##\1/ ' $PG_HBA
cat >> $PG_HBA <<EOF
commit 2a95871963cd9e857055a76a95dd9a65e37a55eb
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Oct 22 16:31:55 2012 +0200
825804 - check-oracle-space-usage.sh renamed to check-database-space-usage.sh
diff --git a/web/modules/dobby/scripts/check-database-space-usage.sh b/web/modules/dobby/scripts/check-database-space-usage.sh
new file mode 100755
index 0000000..6de4e20
--- /dev/null
+++ b/web/modules/dobby/scripts/check-database-space-usage.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# Example shell script which can be added to roots cron job to check the
+# Embedded Satellite disk space usage. If any table is over 90% usage, send
+# a notice to the default email address configured within the Satellite.
+
+#
+# This script is supplied as a working example and is not supported by Red Hat
+#
+
+# Example cron entry:
+# 1 */6 * * * /root/check-oracle-space-usage.sh
+
+PATH=/usr/bin:/bin
+export PATH
+
+reportusage() {
+ # both command produce percent as 5th field and first row is header, which is ignored
+ if [ 0$(spacewalk-cfg-get db_backend) = "0postgresql" ]; then
+ df -hP /var/lib/pgsql/data/
+ else
+ # don't report UNDO usage
+ /sbin/runuser oracle -c "db-control report" | grep -E -v 'UNDO|TEMP'
+ fi
+}
+
+mailitout() {
+ local reportusage=$1
+
+ #get Satellite email address
+ MAILADDRESS=$(spacewalk-cfg-get traceback_mail)
+
+ if [ 0$(spacewalk-cfg-get db_backend) = "0postgresql" ]; then
+ SUBJECT="Warning - PostgreSQL database mount point is running out of space"
+ BODY="This is a notice to let you know that you have gone over 90% usage of
+the mount point where the PostgreSQL database resides. We recommend to be
+proactive and increase the storage before getting to 100% usage."
+ else
+ SUBJECT="Warning - high tablespace usage on Satellite oracle DB"
+
+ BODY="This is a notice to let you know that you have gone over 90% usage in
+one of the Oracle Tablespaces. We recommend to be proactive and increase the
+size of the tablespace before getting to 100% usage. Please consult
+the Satellite documentation on using db-control to increase the size or
+contact Red Hat Support for assistance."
+ fi
+
+ echo -e "$BODY\n\n$reportusage" | mail -s "$SUBJECT" $MAILADDRESS
+ exit 0
+}
+#grab the usage numbers from the db-control report output
+REPORTUSAGE=$(reportusage)
+NUMBERS=$(echo "$REPORTUSAGE" | awk '{if (FNR > 1) {sub("%",""); print $5}}')
+# run db-control and then use awk and sed to get the % numbers
+for num in $NUMBERS
+ do
+ # if number is over 90% then send warning email
+ echo $num
+ if [ $num -gt 90 ]
+ then mailitout "$REPORTUSAGE"
+ fi
+done
+exit 0
diff --git a/web/modules/dobby/scripts/check-oracle-space-usage.sh b/web/modules/dobby/scripts/check-oracle-space-usage.sh
deleted file mode 100755
index e9e2733..0000000
--- a/web/modules/dobby/scripts/check-oracle-space-usage.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# Example shell script which can be added to roots cron job to check the
-# Embedded Satellite disk space usage. If any table is over 90% usage, send
-# a notice to the default email address configured within the Satellite.
-
-#
-# This script is supplied as a working example and is not supported by Red Hat
-#
-
-# Example cron entry:
-# 1 */6 * * * /root/check-oracle-space-usage.sh
-
-PATH=/usr/bin:/bin
-export PATH
-
-reportusage() {
- # both command produce percent as 5th field and first row is header, which is ignored
- if [ 0$(spacewalk-cfg-get db_backend) = "0postgresql" ]; then
- df -hP /var/lib/pgsql/data/
- else
- # don't report UNDO usage
- /sbin/runuser oracle -c "db-control report" | grep -E -v 'UNDO|TEMP'
- fi
-}
-
-mailitout() {
- local reportusage=$1
-
- #get Satellite email address
- MAILADDRESS=$(spacewalk-cfg-get traceback_mail)
-
- if [ 0$(spacewalk-cfg-get db_backend) = "0postgresql" ]; then
- SUBJECT="Warning - PostgreSQL database mount point is running out of space"
- BODY="This is a notice to let you know that you have gone over 90% usage of
-the mount point where the PostgreSQL database resides. We recommend to be
-proactive and increase the storage before getting to 100% usage."
- else
- SUBJECT="Warning - high tablespace usage on Satellite oracle DB"
-
- BODY="This is a notice to let you know that you have gone over 90% usage in
-one of the Oracle Tablespaces. We recommend to be proactive and increase the
-size of the tablespace before getting to 100% usage. Please consult
-the Satellite documentation on using db-control to increase the size or
-contact Red Hat Support for assistance."
- fi
-
- echo -e "$BODY\n\n$reportusage" | mail -s "$SUBJECT" $MAILADDRESS
- exit 0
-}
-#grab the usage numbers from the db-control report output
-REPORTUSAGE=$(reportusage)
-NUMBERS=$(echo "$REPORTUSAGE" | awk '{if (FNR > 1) {sub("%",""); print $5}}')
-# run db-control and then use awk and sed to get the % numbers
-for num in $NUMBERS
- do
- # if number is over 90% then send warning email
- if [ $num -gt 90 ]
- then mailitout "$REPORTUSAGE"
- fi
-done
-exit 0
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 267facc..6f3925e 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -137,7 +137,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
install -m 644 conf/rhn_web.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
install -m 644 conf/rhn_dobby.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
-install -m 755 modules/dobby/scripts/check-oracle-space-usage.sh $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/check-oracle-space-usage.sh
+install -m 755 modules/dobby/scripts/check-database-space-usage.sh $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/check-database-space-usage.sh
%clean
@@ -230,7 +230,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/db-control.1.gz
%{perl_vendorlib}/Dobby.pm
%attr(640,root,apache) %{_prefix}/share/rhn/config-defaults/rhn_dobby.conf
-%attr(0755,root,root) %{_sysconfdir}/cron.daily/check-oracle-space-usage.sh
+%attr(0755,root,root) %{_sysconfdir}/cron.daily/check-database-space-usage.sh
%{perl_vendorlib}/Dobby/
%files -n spacewalk-grail
commit 9e779810e3544643c5e60df2b190f304b6c5a7c0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:31:18 2012 +0200
let's start embedded database before checking its state
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
index d697fd5..07ae368 100755
--- a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
+++ b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql
@@ -95,6 +95,9 @@ check() {
help
exit 1
fi
+
+ service postgresql status >& /dev/null || service postgresql start
+
RET=0
if [ -n "$PGUSER" ] ; then
if exists_user ; then
commit d78bedf1444474b8f8d350125ca19c47eda9c7f8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:30:47 2012 +0200
rhel-5 upgrades: remove rhn-java-sat
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index af62463..290898d 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -492,6 +492,7 @@ sub remove_obsoleted_packages {
# Remove xml-commons on RHEL-5 only
if (`rpm -q --qf='%{VERSION}' redhat-release 2>/dev/null` =~ /^5.+$/) {
push @pkgs, 'xml-commons';
+ push @pkgs, 'rhn-java-sat';
}
if (Spacewalk::Setup::is_embedded_db($opts)) {
commit 6dc03f2d028e6a8c5e82bfecfe9e9a556460c02a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:30:12 2012 +0200
upgrades: remove xml-commons on RHEL-5 only
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 41a509d..af62463 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -487,8 +487,12 @@ sub remove_obsoleted_packages {
my @pkgs = ('rhn-apache', 'rhn-modpython', 'rhn-modssl', 'rhn-modperl',
'perl-libapreq', 'bouncycastle-jdk1.4',
'quartz-oracle', 'jaf', 'jta',
- 'python-sgmlop', 'xml-commons-apis', 'jakarta-commons-io',
- 'geronimo-specs-compat', 'spacewalk-backend-upload-server');
+ 'python-sgmlop', 'geronimo-specs-compat', 'spacewalk-backend-upload-server');
+
+ # Remove xml-commons on RHEL-5 only
+ if (`rpm -q --qf='%{VERSION}' redhat-release 2>/dev/null` =~ /^5.+$/) {
+ push @pkgs, 'xml-commons';
+ }
if (Spacewalk::Setup::is_embedded_db($opts)) {
push @pkgs, 'spacewalk-oracle', 'perl-NOCpulse-Probe-Oracle', 'NOCpulsePlugins-Oracle';
commit a654385ef0aef967afb4f0e7908309a2d8163c7b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 22 16:29:14 2012 +0200
packages to remove for embedded PostgreSQL upgrades
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 5d6fb56..41a509d 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -489,6 +489,11 @@ sub remove_obsoleted_packages {
'quartz-oracle', 'jaf', 'jta',
'python-sgmlop', 'xml-commons-apis', 'jakarta-commons-io',
'geronimo-specs-compat', 'spacewalk-backend-upload-server');
+
+ if (Spacewalk::Setup::is_embedded_db($opts)) {
+ push @pkgs, 'spacewalk-oracle', 'perl-NOCpulse-Probe-Oracle', 'NOCpulsePlugins-Oracle';
+ }
+
for my $pkg (@pkgs) {
if (system_debug('rpm', '-q', $pkg) == 0) {
system_debug('rpm', '-ev', '--nodeps', $pkg);
commit d6fcc771be42dc3547394f051386ac001b1a889c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 22 16:29:07 2012 +0200
815236 - use df with POSIX compatibility
diff --git a/web/modules/dobby/scripts/check-oracle-space-usage.sh b/web/modules/dobby/scripts/check-oracle-space-usage.sh
index 1f4ac58..e9e2733 100755
--- a/web/modules/dobby/scripts/check-oracle-space-usage.sh
+++ b/web/modules/dobby/scripts/check-oracle-space-usage.sh
@@ -17,7 +17,7 @@ export PATH
reportusage() {
# both command produce percent as 5th field and first row is header, which is ignored
if [ 0$(spacewalk-cfg-get db_backend) = "0postgresql" ]; then
- df -h /var/lib/pgsql/data/
+ df -hP /var/lib/pgsql/data/
else
# don't report UNDO usage
/sbin/runuser oracle -c "db-control report" | grep -E -v 'UNDO|TEMP'
11 years, 8 months