spacewalk/setup/share/upgrade/rhn-enable-push.pl | 95 ----------
spacewalk/setup/share/upgrade/rhn-load-config.pl | 203 -----------------------
2 files changed, 298 deletions(-)
New commits:
commit cdbd1d82be665b05f67d649a664e406b5d33e39b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 2 13:40:21 2011 +0100
Removing rhn-enable-push.pl as it is not referenced from anywhere.
diff --git a/spacewalk/setup/share/upgrade/rhn-enable-push.pl
b/spacewalk/setup/share/upgrade/rhn-enable-push.pl
deleted file mode 100644
index 848cfdc..0000000
--- a/spacewalk/setup/share/upgrade/rhn-enable-push.pl
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use lib '/var/www/lib';
-
-use English;
-
-use Data::Dumper;
-use Getopt::Long;
-use Sys::Hostname;
-
-use PXT::Utils;
-use PXT::Request;
-use RHN::SatInstall;
-use RHN::DB;
-use Spacewalk::Setup;
-
-my %opts = ();
-my @valid_opts = (
- "hostname:s",
- "ssl-dir:s",
- "pub-ssl-cert:s",
- "force",
- "help",
- );
-
-my $usage = "usage: $0 [ --hostname=<override_hostname> ] [
--ssl-dir=<ssl_build_directory> ]"
- . " [ --pub-ssl-cert=<public_ssl_certificate> ] [ --force ]"
- . " [ --help ]\n";
-
-GetOptions(\%opts, @valid_opts) or die $usage;
-
-if ($opts{help}) {
- die $usage;
-}
-
-unless ($opts{force}) {
- my $jabber_server = PXT::Config->get('osa-dispatcher',
'jabber_server') || '';
-
- if ($jabber_server and $jabber_server !~ /@@/) {
- die "Push is already enabled - do not run this script more than once. Use
--force to override.\n";
- }
-}
-
-my $db_connect = RHN::SatInstall->test_db_connection();
-
-die "Could not connect to the database"
- unless $db_connect;
-
-my @hostname_parts = split(/\./, $opts{hostname} || Sys::Hostname::hostname);
-my $system_name;
-
-if (scalar @hostname_parts > 2) {
- $system_name = join('.', splice(@hostname_parts, 0, -2));
-}
-else {
- $system_name = join('.', @hostname_parts);
-}
-
-
-# nuke the jabberd generated authentication database
-if (-e '/var/lib/jabberd/authreg.db') {
- unlink ('/var/lib/jabberd/authreg.db');
-}
-
-if (-e '/var/lib/jabberd/sm.db') {
- unlink ('/var/lib/jabberd/sm.db');
-}
-
-Spacewalk::Setup::generate_server_pem(-ssl_dir => $opts{"ssl-dir"} ||
'/root/ssl-build',
- -system => $system_name,
- -out_file => '/etc/jabberd/server.pem');
-
-my %config_opts;
-
-$config_opts{jabberDOThostname} = $opts{hostname} || Sys::Hostname::hostname();
-$config_opts{jabberDOTusername} = 'rhn-dispatcher-sat';
-$config_opts{jabberDOTpassword} = 'rhn-dispatcher-' .
PXT::Utils->random_password(6);
-$config_opts{osadispatcherDOTosa_ssl_cert} = $opts{'pub-ssl-cert'} ||
'/var/www/html/pub/RHN-ORG-TRUSTED-SSL-CERT';
-
-RHN::SatInstall->write_config(\%config_opts,
- '/var/lib/rhn/rhn-satellite-prep/satellite-local-rules.conf');
-
-print "Deploying config\n";
-
-Spacewalk::Setup::satcon_deploy();
-
-print "Restarting satellite services\n";
-system("/usr/sbin/rhn-satellite", "restart");
-
-print "Done\n";
-
-exit 0;
commit 1451c0961362b2bec1ad2994c515846a400e8f69
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 2 13:38:14 2011 +0100
Removing rhn-load-config.pl as it is not referenced from anywhere.
diff --git a/spacewalk/setup/share/upgrade/rhn-load-config.pl
b/spacewalk/setup/share/upgrade/rhn-load-config.pl
deleted file mode 100755
index 33eb7f3..0000000
--- a/spacewalk/setup/share/upgrade/rhn-load-config.pl
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use lib '/var/www/lib';
-
-use English;
-
-use Data::Dumper;
-use Getopt::Long;
-use Sys::Hostname;
-
-use PXT::Utils;
-
-use RHN::SatInstall;
-use RHN::SatCluster;
-use RHN::DB;
-use RHN::DataSource::Simple;
-use PXT::Config;
-use PXT::Request;
-use Spacewalk::Setup;
-
-my %opts = ();
-my @valid_opts = (
- "force",
- "disable-solaris",
- "help",
- );
-
-my $usage = "usage: $0 [ --force ]"
- . " [ --disable-solaris ]"
- . " [ --help ]\n";
-
-GetOptions(\%opts, @valid_opts) or die $usage;
-
-if ($opts{help}) {
- die $usage;
-}
-
-my ($already_monitoring, $already_monitoring_scout, $already_osad);
-
-my $mon_backend = PXT::Config->get('is_monitoring_backend') || '';
-if ($mon_backend and $mon_backend !~ /@@/) {
- $already_monitoring = 1;
-}
-
-my $mon_scout = PXT::Config->get('is_monitoring_scout') || '';
-if ($mon_scout and $mon_scout !~ /@@/) {
- $already_monitoring_scout = 1;
-}
-
-my $jabber_server = PXT::Config->get('osa-dispatcher',
'jabber_server') || '';
-if ($jabber_server and $jabber_server !~ /@@/) {
- $already_osad = 1;
-}
-
-print "Generating RHN Satellite configuration dictionary\n";
-
-Spacewalk::Setup::generate_satcon_dict();
-
-print "Examining current configuration\n";
-
-my %config_opts;
-
-my @valid_keys = qw/db_name db_user db_password encrypted_passwords
- kickstart_mount_point mount_point serverDOTsatelliteDOTca_chain
- serverDOTsatelliteDOThttp_proxy
- serverDOTsatelliteDOThttp_proxy_username
- serverDOTsatelliteDOTrhn_parent session_secret_1 session_secret_2
- session_secret_3 session_secret_4 session_swap_secret_1
- session_swap_secret_2 session_swap_secret_3 session_swap_secret_4
- traceback_mail webDOTis_monitoring_backend webDOTis_monitoring_scout
- webDOTssl_available serverDOTsatelliteDOThttp_proxy_password/;
-
-foreach my $key (@valid_keys) {
- $config_opts{$key} = check_current_config($key);
-}
-
-$config_opts{server_secret_key} = RHN::SatInstall->generate_secret;
-
-load_jabber_configs(\%config_opts);
-
-if ($opts{disable_solaris}) {
- $config_opts{webDOTenable_solaris_support} = 0;
-}
-else {
- $config_opts{webDOTenable_solaris_support} = 1;
-}
-
-if ($already_monitoring) {
- $config_opts{monitoringDOTdbd} = 'Oracle';
- $config_opts{monitoringDOTorahome} = $ENV{ORACLE_HOME} || '/opt/oracle';
- $config_opts{monitoringDOTdbname} = $config_opts{'db_name'};
- $config_opts{monitoringDOTusername} = $config_opts{'db_user'};
- $config_opts{monitoringDOTpassword} = $config_opts{'db_password'};
-
- if ($already_monitoring_scout) {
- my $scout_shared_key = find_scout_key();
-
- $config_opts{monitoringDOTsmonDOTaddr} = '127.0.0.1';
- $config_opts{monitoringDOTsmonDOTfqdn} = 'localhost';
- $config_opts{monitoringDOTsmonDOTtestaddr} = '127.0.0.1';
- $config_opts{monitoringDOTsmonDOTtestfqdn} = 'localhost';
- $config_opts{monitoringDOTscout_shared_key} = $scout_shared_key;
-
- # if the satellite is already a monitoring scout, we need to update some ip address
fields
- update_ip_addresses();
- }
-}
-
-my %nls_database_paramaters = RHN::SatInstall->get_nls_database_parameters();
-$config_opts{serverDOTnls_lang} = 'english.' .
$nls_database_paramaters{NLS_CHARACTERSET};
-$config_opts{cobblerDOThost} = Sys::Hostname::hostname;
-print "Writing configuration\n";
-RHN::SatInstall->write_config(\%config_opts,
- '/var/lib/rhn/rhn-satellite-prep/satellite-local-rules.conf');
-
-
-Spacewalk::Setup::satcon_deploy();
-
-print "Done\n";
-
-exit 0;
-
-sub update_ip_addresses {
- my $hostname = Sys::Hostname::hostname;
- my $ip_addr = RHN::Utils::find_ip_address($hostname);
-
- my $dbh = RHN::DB->connect();
- my $sth;
-
- # update recid 1 of the rhn_sat_cluster table,
- # which is always the cluster record for the scout on the satellite
- $sth = $dbh->prepare(<<EOQ);
-UPDATE rhn_Sat_Cluster
- SET vip = :ip
- WHERE recid = 1
-EOQ
- $sth->execute_h(ip => $ip_addr);
-
- # update recid 2 of the rhn_sat_node table,
- # which is always the node record for the scout on the satellite
- $sth = $dbh->prepare(<<EOQ);
-UPDATE rhn_Sat_Node
- SET ip = :ip
- WHERE recid = 2
-EOQ
- $sth->execute_h(ip => $ip_addr);
-
- $dbh->commit;
-}
-
-sub check_current_config {
- my $key = shift;
-
- $key =~ s/DOT/./g;
-
- my ($domain, $var);
- if ($key =~ /^(.*)\.(.*)$/) {
- $domain = $1;
- $var = $2;
- }
- else {
- $domain = 'web';
- $var = $key;
- }
-
- my $value = PXT::Config->get($domain, $var);
- if ($value =~ /^@@/) {
- return;
- }
-
- return $value;
-}
-
-#We have to do a mapping of the fake options to real options
-sub load_jabber_configs {
- my $config_opts = shift;
- my %jabberOpts = (
- "jabberDOThostname" => "server.jabber_server",
- "osadispatcherDOTosa_ssl_cert" =>
"osa-dispatcher.osa_ssl_cert",
- "jabberDOTusername" =>
"osa-dispatcher.jabber_username",
- "jabberDOTpassword" =>
"osa-dispatcher.jabber_password"
- );
- while ( my ($key, $value) = each(%jabberOpts) ) {
- $config_opts->{$key} = PXT::Config->get(split('\.', $value));
- }
-
-}
-
-sub find_scout_key {
- my $ds = new RHN::DataSource::Simple(-querybase => "scout_queries",
- -mode => 'scouts_for_org');
- my $data = $ds->execute_query(-org_id => 1);
-
- my ($sat_scout) = grep { not $_->{SERVER_ID} } @{$data};
-
- die "No satellite scout found!" unless $sat_scout;
-
- return $sat_scout->{SCOUT_SHARED_KEY};
-}
-
Show replies by date