rel-eng/packages/spacewalk-setup | 2 - satellite/install/install.pl | 4 +- spacewalk/setup/lib/Spacewalk/Setup.pm | 59 ++++++++++++++++++--------------- spacewalk/setup/spacewalk-setup.spec | 5 ++ 4 files changed, 41 insertions(+), 29 deletions(-)
New commits: commit b6b83b304514ba2cfeaccaa634dfe46bbcb4a95f Author: Michael Mraka michael.mraka@redhat.com Date: Tue Jul 30 14:32:58 2013 +0200
Automatic commit of package [spacewalk-setup] release [2.1.3-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index f9356e4..23953c3 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -2.1.2-1 spacewalk/setup/ +2.1.3-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 9b43b29..f6430bf 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,7 +1,7 @@ %{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot} %doc LICENSE
%changelog +* Tue Jul 30 2013 Michael Mraka michael.mraka@redhat.com 2.1.3-1 +- recognize external/embedded variant + * Wed Jul 24 2013 Michael Mraka michael.mraka@redhat.com 2.1.2-1 - single parameter system_debug is not supported
commit 3497675cb89269b5ed73d05acf727919237c65b2 Author: Michael Mraka michael.mraka@redhat.com Date: Tue Mar 26 13:40:13 2013 +0100
recognize external/embedded variant
diff --git a/satellite/install/install.pl b/satellite/install/install.pl index 5aae338..1e63bb2 100755 --- a/satellite/install/install.pl +++ b/satellite/install/install.pl @@ -47,7 +47,9 @@ my %up2dateOptions = (); my %rhnOptions = (); my @additionalOptions = (); # read existing confgiuration -Spacewalk::Setup::read_config(DEFAULT_UP2DATE_CONF_LOCATION, %up2dateOptions); +if (-e DEFAULT_UP2DATE_CONF_LOCATION) { + Spacewalk::Setup::read_config(DEFAULT_UP2DATE_CONF_LOCATION, %up2dateOptions); +}
if (-e Spacewalk::Setup::DEFAULT_RHN_CONF_LOCATION) { Spacewalk::Setup::read_config(Spacewalk::Setup::DEFAULT_RHN_CONF_LOCATION, %rhnOptions); diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 266d606..271d48f 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -123,7 +123,8 @@ sub parse_options { "run-updater:s", "run-cobbler", "enable-tftp:s", - "external-db", + "external-oracle", + "external-postgresql", "db-only", "rhn-http-proxy:s", "rhn-http-proxy-username:s", @@ -133,7 +134,7 @@ sub parse_options {
my $usage = loc("usage: %s %s\n", $0, - "[ --help ] [ --answer-file=<filename> ] [ --non-interactive ] [ --skip-system-version-test ] [ --skip-selinux-test ] [ --skip-fqdn-test ] [ --skip-db-install ] [ --skip-db-diskspace-check ] [ --skip-db-population ] [ --skip-gpg-key-import ] [ --skip-ssl-cert-generation ] [--skip-ssl-vhost-setup] [ --skip-services-check ] [ --clear-db ] [ --re-register ] [ --disconnected ] [ --upgrade ] [ --run-updater=<yes|no>] [--run-cobbler] [ --enable-tftp=<yes|no>] [--external-db]" ); + "[ --help ] [ --answer-file=<filename> ] [ --non-interactive ] [ --skip-system-version-test ] [ --skip-selinux-test ] [ --skip-fqdn-test ] [ --skip-db-install ] [ --skip-db-diskspace-check ] [ --skip-db-population ] [ --skip-gpg-key-import ] [ --skip-ssl-cert-generation ] [--skip-ssl-vhost-setup] [ --skip-services-check ] [ --clear-db ] [ --re-register ] [ --disconnected ] [ --upgrade ] [ --run-updater=<yes|no>] [--run-cobbler] [ --enable-tftp=<yes|no>] [ --external-oracle | --external-postgresql ]" );
# Terminate if any errors were encountered parsing the command line args: my %opts; @@ -222,7 +223,9 @@ sub load_answer_file { # Check if we're installing with an embedded database. sub is_embedded_db { my $opts = shift; - return not (defined($opts->{'external-db'}) or defined($opts->{'managed-db'})); + return not (defined($opts->{'external-oracle'}) + or defined($opts->{'external-postgresql'}) + or defined($opts->{'managed-db'})); }
sub contains_embedded_oracle { @@ -1003,7 +1006,7 @@ sub postgresql_setup_embedded_db { if (not -x '/usr/bin/spacewalk-setup-postgresql') { print loc(<<EOQ); The spacewalk-setup-postgresql does not seem to be available. -You might want to use --external-db command line option. +You might want to use --external-oracle or --external-postgresql command line option. EOQ exit 24; } @@ -2046,9 +2049,13 @@ Only runs the necessary steps to setup cobbler
Set to 'yes' to automatically enable tftp and xinetd services needed for Cobbler PXE provisioning functionality. Set to 'no' if you do not want the installer to enable these services.
-=item B<--external-db> +=item B<--external-oracle>
-Assume the Red Hat Satellite installation uses an external database (Red Hat Satellite only). +Assume the Red Hat Satellite installation uses an external Oracle database (Red Hat Satellite only). + +=item B<--external-postgresql> + +Assume the Red Hat Satellite installation uses an external PostgreSQL database (Red Hat Satellite only).
=back
commit 09572890b824fe39a5a194a94753d748510c7651 Author: Michael Mraka michael.mraka@redhat.com Date: Thu Mar 28 09:57:49 2013 +0100
fixed spaces
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 38ff7db..266d606 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -100,31 +100,31 @@ $DEBUG = 0;
sub parse_options { my @valid_opts = ( - "help", - "skip-system-version-test", - "skip-selinux-test", - "skip-fqdn-test", - "skip-python-test", - "skip-updates-install", - "skip-db-install", - "skip-db-diskspace-check", - "skip-db-population", - "skip-gpg-key-import", - "skip-ssl-cert-generation", - "skip-ssl-vhost-setup", + "help", + "skip-system-version-test", + "skip-selinux-test", + "skip-fqdn-test", + "skip-python-test", + "skip-updates-install", + "skip-db-install", + "skip-db-diskspace-check", + "skip-db-population", + "skip-gpg-key-import", + "skip-ssl-cert-generation", + "skip-ssl-vhost-setup", "skip-services-check", "skip-logfile-init", - "clear-db", - "re-register", - "disconnected", - "answer-file=s", - "non-interactive", - "upgrade", - "run-updater:s", + "clear-db", + "re-register", + "disconnected", + "answer-file=s", + "non-interactive", + "upgrade", + "run-updater:s", "run-cobbler", "enable-tftp:s", - "external-db", - "db-only", + "external-db", + "db-only", "rhn-http-proxy:s", "rhn-http-proxy-username:s", "rhn-http-proxy-password:s",
spacewalk-commits@lists.fedorahosted.org