web/modules/rhn/RHN/DB/ConfigFile.pm | 21 -
web/modules/rhn/RHN/DB/Scheduler.pm | 104 -------
web/modules/rhn/RHN/DB/Server.pm | 15 -
web/modules/rhn/RHN/DB/User.pm | 31 --
web/modules/sniglets/Sniglets/ConfigManagement.pm | 6
web/modules/sniglets/Sniglets/ServerActions.pm | 153 ----------
web/modules/sniglets/Sniglets/Servers.pm | 318 ----------------------
7 files changed, 648 deletions(-)
New commits:
commit d8be0c21552195cef5e47710a4c98ddba54b7419
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:42:24 2009 +0100
rhn:osa-ping not used, removing, as well as osa_ping_cb.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 6ef30fb..e836214 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -107,23 +107,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:remote-command-cb' =>
\&remote_command_cb);
$pxt->register_callback('rhn:package-action-command-cb' =>
\&package_action_command_cb);
-
- $pxt->register_callback('rhn:osa-ping' => \&osa_ping_cb);
-}
-
-sub osa_ping_cb {
- my $pxt = shift;
- my $sid = $pxt->param('sid');
-
- die "no sid" unless $sid;
-
- my $server = RHN::Server->lookup(-id => $sid);
- die "no server" unless $server;
-
- $server->osa_ping();
-
- # $pxt->push_message(site_info => "<strong>" . $server->name .
"</strong> has been pinged. OSA Status will update within the next
minute.");
- $pxt->redirect('/rhn/systems/details/Overview.do?sid=' . $sid .
"&message=system.osad.pinged&messagep1=" . $server->name);
}
sub system_pending_actions_count {
commit d2e525ba597ce3886056047a82b39de4dca447d5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:39:12 2009 +0100
rhn:server_lock_cb not used, removing, as well as server_lock_cb.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 95f1cf5..6ef30fb 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -103,7 +103,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:system-activation-key-cb' =>
\&system_activation_key_cb);
- $pxt->register_callback('rhn:server_lock_cb' => \&server_lock_cb);
$pxt->register_callback('rhn:server_set_lock_cb' =>
\&server_set_lock_cb);
$pxt->register_callback('rhn:remote-command-cb' =>
\&remote_command_cb);
@@ -1330,26 +1329,6 @@ sub system_activation_key_cb {
$pxt->redirect($url . "?sid=" . $sid);
}
-sub server_lock_cb {
- my $pxt = shift;
- my $sid = $pxt->param('sid');
- my $lock = $pxt->dirty_param('lock');
-
- my $system = RHN::Server->lookup(-id => $sid);
- my $msg;
- if ($lock) {
- $system->lock_server($pxt->user, "Manually locked");
- $msg = "<strong>%s</strong> has been locked.";
- }
- else {
- $system->unlock_server();
- $msg = "<strong>%s</strong> has been unlocked.";
- }
-
- $pxt->push_message(site_info => sprintf($msg, $system->name));
- $pxt->redirect("index.pxt?sid=$sid");
-}
-
sub server_set_lock_cb {
my $pxt = shift;
my $lock = $pxt->dirty_param('lock');
commit df4126d0477d040fdd92a70ec18890040a788430
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:37:53 2009 +0100
Removal of add_filenames_to_set_cb made validate_path_name unused, removing as dead
code.
diff --git a/web/modules/rhn/RHN/DB/ConfigFile.pm b/web/modules/rhn/RHN/DB/ConfigFile.pm
index 277963d..7ea4a20 100644
--- a/web/modules/rhn/RHN/DB/ConfigFile.pm
+++ b/web/modules/rhn/RHN/DB/ConfigFile.pm
@@ -79,25 +79,4 @@ sub file_id_to_path {
return $class->file_name_id_to_path($ret);
}
-sub validate_path_name {
- my $class = shift;
- my $path = shift;
-
- return "No path defined" unless $path;
-
- my @path = split m([/]), $path;
-
- if ($path =~ m(^[^/])) {
- return "Paths must begin with a forward slash ('/').";
- }
- if ($path =~ m(/$)) {
- return "Paths must not end with a forward slash ('/').";
- }
- if (grep { $_ eq ".." } @path) {
- return "Paths must be absolute paths (no '..' in the pathname).";
- }
-
- return;
-}
-
1;
commit 9779a1eb0f5472020fb79268edbce95f46cae37c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:37:05 2009 +0100
rhn:add-filenames-to-set-cb not used, removing, as well as add_filenames_to_set_cb.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index d01b1b7..95f1cf5 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -102,7 +102,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:delete_servers_cb' =>
\&delete_servers_cb);
$pxt->register_callback('rhn:system-activation-key-cb' =>
\&system_activation_key_cb);
- $pxt->register_callback('rhn:add-filenames-to-set-cb' =>
\&add_filenames_to_set_cb);
$pxt->register_callback('rhn:server_lock_cb' => \&server_lock_cb);
$pxt->register_callback('rhn:server_set_lock_cb' =>
\&server_set_lock_cb);
@@ -1331,40 +1330,6 @@ sub system_activation_key_cb {
$pxt->redirect($url . "?sid=" . $sid);
}
-sub add_filenames_to_set_cb {
- my $pxt = shift;
-
- my $filenames = $pxt->dirty_param('input_filenames');
-
- my @filenames = split(/,\s*/, $filenames);
-
- my $errors;
-
- foreach my $file (@filenames) {
- my $errmsg = RHN::ConfigFile->validate_path_name($file);
- if ($errmsg) {
- $pxt->push_message(local_alert => sprintf('Invalid path
<strong>%s</strong>: %s', PXT::Utils->escapeHTML($file), $errmsg));
- $errors++;
- }
- }
-
- return if $errors;
-
- my $set_label = 'selected_configfilenames';
- my $set = RHN::Set->lookup(-label => $set_label, -uid =>
$pxt->user->id);
-
- foreach my $file (@filenames) {
- $set->add(RHN::ConfigFile->path_to_id($file));
- }
-
- $set->commit;
-
- my $sid = $pxt->param('sid');
- my $uri = $pxt->uri;
-
- $pxt->redirect($uri . '?sid=' . $sid);
-}
-
sub server_lock_cb {
my $pxt = shift;
my $sid = $pxt->param('sid');
commit b978aa88d3c12c3582ed39fd9db902da68c1c33b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:34:21 2009 +0100
Removal of system_package_list_refresh_cb made schedule_package_refresh unused,
removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index 7ba4e44..744c412 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.pm
@@ -390,40 +390,6 @@ EOQ
return $action_id;
}
-sub schedule_package_refresh {
- my $class = shift;
- my %params = @_;
-
- my ($org_id, $user_id, $server_id, $earliest, $transaction) =
- map { $params{"-" . $_} } qw/org_id user_id server_id earliest
transaction/;
-
- my $action_label;
- my $server_packaging_type = RHN::Server->packaging_type($server_id);
-
- if ($server_packaging_type eq 'rpm') {
- $action_label = 'packages.refresh_list';
- }
- elsif ($server_packaging_type eq 'sysv-solaris') {
- $action_label = 'solarispkgs.refresh_list';
- }
- else {
- throw "Unknown packaging type ($server_packaging_type) for system
($server_id)";
- }
-
- my ($action_id, $stat_id) = $class->make_base_action(-org_id => $org_id,
- -user_id => $user_id,
- -type_label => $action_label,
- -earliest => $earliest,
- -transaction => $transaction
- );
-
- $class->add_servers_to_action($action_id, $stat_id, $user_id, undef, $server_id);
-
- osa_wakeup_tickle();
-
- return $action_id;
-}
-
sub sscd_schedule_package_refresh {
my $class = shift;
my %params = @_;
commit 80c918cd8473a2871af01a77025d67210b81da0f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:32:47 2009 +0100
rhn:system_package_list_refresh_cb not used, removing, as well as
system_package_list_refresh_cb.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index aae8578..d01b1b7 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -95,7 +95,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:server_prefs_form_cb' =>
\&server_prefs_form_cb);
- $pxt->register_callback('rhn:system_package_list_refresh_cb' =>
\&system_package_list_refresh_cb);
$pxt->register_callback('rhn:server_hardware_list_refresh_cb' =>
\&server_hardware_list_refresh_cb);
$pxt->register_callback('rhn:ssm_change_system_prefs_cb' =>
\&ssm_change_system_prefs_cb);
@@ -390,24 +389,6 @@ sub cancel_scheduled_proxy_install {
$pxt->redirect($url . "?sid=$sid");
}
-sub system_package_list_refresh_cb {
- my $pxt = shift;
-
- my $sid = $pxt->param('sid');
- throw "no server id" unless $sid;
-
- my $earliest_date = RHN::Date->now->long_date;
- my $action_id = RHN::Scheduler->schedule_package_refresh(-org_id =>
$pxt->user->org_id,
- -user_id => $pxt->user->id,
- -earliest => $earliest_date,
- -server_id => $sid);
-
- my $system = RHN::Server->lookup(-id => $sid);
-
- $pxt->push_message(site_info => sprintf("You have successfully scheduled a
package profile refresh for <strong>%s</strong>.",
PXT::Utils->escapeHTML($system->name)));
- return;
-}
-
sub server_hardware_list_refresh_cb {
my $pxt = shift;
commit 903162791a2dc66ed25c0533bc051f18c57886da
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:31:49 2009 +0100
rhn:system_update_brb_cb not used anywhere; system_update_brb_cb even does not exist.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index d8fd6c0..aae8578 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -95,9 +95,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:server_prefs_form_cb' =>
\&server_prefs_form_cb);
- # this now gets called in some cases by admin_server_edit_cb
- $pxt->register_callback('rhn:system_update_brb_cb' =>
\&system_update_brb_cb);
-
$pxt->register_callback('rhn:system_package_list_refresh_cb' =>
\&system_package_list_refresh_cb);
$pxt->register_callback('rhn:server_hardware_list_refresh_cb' =>
\&server_hardware_list_refresh_cb);
commit 5250c85313fdb2296df93045121b55cdc505d386
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:27:45 2009 +0100
server_location not used, removing.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 19a9053..d8fd6c0 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -884,38 +884,6 @@ sub server_network_interfaces {
return $block;
}
-sub server_location {
- my $pxt = shift;
- my %params = @_;
- my $sid = $pxt->param('sid');
- die "no server id" unless ($sid);
-
- # if possible, reuse existing server object
- my $server = RHN::Server->lookup(-id => $sid);
-
- my %subst;
-
- $subst{country} = defined $server->location_country ? $server->location_country :
"";
-
- $subst{state} = defined $server->location_state ? $server->location_state :
"";
-
- $subst{city} = defined $server->location_city ? $server->location_city :
"";
-
- $subst{address1} = defined $server->location_address1 ?
$server->location_address1 : "";
- $subst{address2} = defined $server->location_address2 ?
$server->location_address2 : "";
-
- $subst{building} = defined $server->location_building ?
$server->location_building : "";
-
- $subst{room} = defined $server->location_room ? $server->location_room :
"" ;
- $subst{rack} = defined $server->location_rack ? $server->location_rack :
"" ;
-
- $subst{machine} = defined $server->location_machine ? $server->location_machine :
"";
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- return PXT::Utils->perform_substitutions($params{__block__}, \%subst);
-}
-
# must happen *after* server_hardware_profile... so use tags
# correctly!
sub server_device {
commit cc4955d4f0b634fa05f83eebfa246c815f0739f4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:24:50 2009 +0100
Removal of handle_system_entitlement_change made schedule_sat_cluster_push unused,
removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 94fff25..498573d 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -52,7 +52,6 @@ use Carp;
use RHN::Utils;
use RHN::Exception qw/throw/;
use RHN::API::Exception;
-use RHN::SatCluster;
# fields in the rhnServer table
@@ -3738,20 +3737,6 @@ sub sat_clusters_for_system {
return @{$data};
}
-sub schedule_sat_cluster_push {
- my $self = shift;
- my $uid = shift;
- my @clusters = @_;
-
- my $org_id = $self->org_id();
-
- foreach my $row (@clusters) {
- RHN::SatCluster->push_config($org_id, $row->{SAT_CLUSTER_ID}, $uid);
- }
-
- return;
-}
-
sub virtual_guest_details {
my $self = shift;
commit ece013824410f3d2866ff4d095997df2d653ccb1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:22:31 2009 +0100
Removal of admin_server_edit_cb made server_edit_location_cb unused, removing as dead
code.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index d13f854..19a9053 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -759,28 +759,6 @@ sub addon_entitlement_box {
return join("<br/>\n", $boxes->render);
}
-sub server_edit_location_cb {
- my $pxt = shift;
- my $transaction = shift;
-
- my $sid = $pxt->param('sid');
- die "no server id" unless $sid;
-
- my $server = $transaction || RHN::Server->lookup(-id => $sid);
-
- die "Orgs for admin server edit mistatch (admin: @{[$pxt->user->org_id]} !=
@{[$server->org_id]}"
- unless $pxt->user->org_id == $server->org_id;
-
- foreach my $form_var (qw/country state city address1 address2 building room rack/) {
- my $function = 'location_' . $form_var;
- $server->$function($pxt->dirty_param($form_var));
- }
-
- $server->commit unless $transaction;
-
- return $server;
-}
-
sub reboot_server_cb {
my $pxt = shift;
my $sid = $pxt->param('sid');
commit 040d67943be4639a4228e4a0f10743d8f5e11c0b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:22:02 2009 +0100
Removal of admin_server_edit_cb made handle_system_entitlement_change unused, removing
as dead code.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index b6a5765..d13f854 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -806,103 +806,6 @@ sub reboot_server_cb {
$pxt->redirect("/rhn/systems/details/Overview.do?sid=$sid&message=system.reboot.scheduled&messagep1="
. $server->name . "&messagep2=" . $pretty_earliest_date .
"&messagep3=" . $action_id);
}
-# Not a sniglet - handle system entitlement changes from server
-# properties edit page.
-sub handle_system_entitlement_change {
- my $pxt = shift;
- my $server = shift;
-
- my $base_entitlement = $pxt->dirty_param('base_entitlement');
-
- my $transaction = RHN::DB->connect();
- $transaction->nest_transactions();
-
- eval {
- my $changed = 0;
-
- my %addon_entitlements = map { ($_, 1) }
$pxt->dirty_param('addon_entitlements');
- my %current_entitlements = map { ($_->{LABEL}, $_) }
- grep { $_->{IS_BASE} eq 'N' } $server->entitlements;
-
- my $has_monitoring = ( grep { $_ eq 'monitoring_entitled' } keys
%current_entitlements ) ? 1 : 0;
- my $removed_monitoring = 0;
- my @sat_clusters;
-
- if ($has_monitoring) {
- @sat_clusters = RHN::Server->sat_clusters_for_system($server->id);
- }
-
- foreach my $ent (keys %addon_entitlements) {
- unless (exists $current_entitlements{$ent}) {
- $server->entitle_server($ent);
- $changed = 1;
- }
- }
-
- foreach my $ent (keys %current_entitlements) {
- unless (exists $addon_entitlements{$ent}) {
- if ($ent eq 'monitoring_entitled') {
- $removed_monitoring = 1;
- }
- $server->remove_entitlement($ent);
- $changed = 1;
- }
- }
-
- if ($base_entitlement eq 'unentitle') {
- $changed = 1;
-
- if ($has_monitoring) {
- $removed_monitoring = 1;
- }
-
- $server->unentitle_server();
- } elsif ($base_entitlement ne 'none' and
- not $server->has_entitlement($base_entitlement)) {
- $changed = 1;
-
- if ($has_monitoring) {
- $removed_monitoring = 1;
- }
-
- $server->unentitle_server();
- $server->entitle_server($base_entitlement);
- }
-
- if ($changed and $server->has_feature('ftr_snapshotting')) {
- RHN::Server->snapshot_server(-server_id => $server->id,
- -reason => "Entitlement change");
- }
-
- if ($removed_monitoring) {
- $server->schedule_sat_cluster_push($pxt->user->id, @sat_clusters);
- }
- };
-
- if ($@) {
- my $E = $@;
- $transaction->nested_rollback();
-
- if (ref $E and catchable($E)) {
- if ($E->is_rhn_exception('servergroup_max_members')) {
- $pxt->push_message(local_alert => sprintf("You do not have enough
entitlements to entitle <strong>%s</strong>.",
PXT::Utils->escapeHTML($server->name)));
- return;
- }
- else {
- throw $E;
- }
- }
- else {
- die $E;
- }
- }
- else {
- $transaction->nested_commit();
- }
-
- return;
-}
-
sub server_network_details {
my $pxt = shift;
my %params = @_;
commit 0fb07ff19aee40b2c660604296e7a48c5c1bdae9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:21:19 2009 +0100
Removal of admin_server_edit_cb made set_server_pref unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index d8e49f6..cb7daf4 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -2024,37 +2024,6 @@ sub get_server_pref {
return $val;
}
-sub set_server_pref {
- my $self = shift;
- my $server_id = shift;
- my $pref = shift;
- my $new_val = shift;
- my $assumed_default = shift;
-
- my $dbh = RHN::DB->connect;
- my $query = <<EOS;
-DELETE FROM rhnUserServerPrefs
- WHERE user_id = ?
- AND server_id = ?
- AND name = ?
-EOS
- my $sth = $dbh->prepare($query);
- $sth->execute($self->id, $server_id, $pref);
-
- if ($new_val ne $assumed_default) {
- my $query = <<EOS;
-INSERT INTO rhnUserServerPrefs
-(user_id, server_id, name, value)
-VALUES
-(?, ?, ?, ?)
-EOS
- my $sth = $dbh->prepare($query);
- $sth->execute($self->id, $server_id, $pref, $new_val);
- }
-
- $dbh->commit;
-}
-
sub set_pref {
my $self = shift;
my $pref = shift;
commit 8a4d2a29fd0bf0f1389dd80d4db9bbb4be94aa90
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:20:22 2009 +0100
rhn:admin_server_edit_cb not used, removing, as well as admin_server_edit_cb.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index a64d855..b6a5765 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -90,8 +90,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:proxy_entitlement_cb' =>
\&proxy_entitlement_cb);
$pxt->register_callback('rhn:cancel_scheduled_proxy_install_cb' =>
\&cancel_scheduled_proxy_install);
- $pxt->register_callback('rhn:admin_server_edit_cb' =>
\&admin_server_edit_cb);
-
$pxt->register_callback('rhn:delete_server_cb' =>
\&delete_server_cb);
$pxt->register_callback('rhn:reboot_server_cb' =>
\&reboot_server_cb);
@@ -808,76 +806,6 @@ sub reboot_server_cb {
$pxt->redirect("/rhn/systems/details/Overview.do?sid=$sid&message=system.reboot.scheduled&messagep1="
. $server->name . "&messagep2=" . $pretty_earliest_date .
"&messagep3=" . $action_id);
}
-sub admin_server_edit_cb {
- my $pxt = shift;
-
- my @extra_messages;
-
- my $sid = $pxt->param('sid');
- die "no server id" unless ($sid);
-
- my $server = RHN::Server->lookup(-id => $sid);
-
- my $trunc_name = substr($pxt->dirty_param('name'), 0, 128);
- $trunc_name =~ s/^\s+//;
- $trunc_name =~ s/\s+$//;
-
- unless (length $trunc_name > 2) {
- $pxt->push_message(local_alert => "A system name must be at least three
characters in length.");
- return;
- }
-
- unless ($trunc_name =~ /^[\x20-\x7e]+$/) {
- $pxt->push_message(local_alert => "Desired System Name contains invalid
characters. In addition to alphanumeric characters, '-', '_', '.',
and '\@' are allowed. Please try again");
- return;
- }
-
-
- $server->name($trunc_name);
- my $trunc_desc = substr($pxt->dirty_param('description'), 0, 256);
- $server->description($trunc_desc);
-
- $pxt->user->set_server_pref($server->id,
- 'receive_notifications',
- $pxt->dirty_param('receive_notifications') ? 1 : 0, 1);
- $pxt->user->set_server_pref($server->id,
- 'include_in_daily_summary',
- ($pxt->dirty_param('include_in_daily_summary') and
- $server->has_feature('ftr_daily_summary')
- ) ? 1 : 0, 1);
-
- if ($pxt->user->is('org_admin')) {
- handle_system_entitlement_change($pxt, $server);
- }
-
- $server = server_edit_location_cb($pxt, $server);
-
- my $auto_update = $pxt->dirty_param('auto_update') ? 'Y' :
'N';
-
- if (($auto_update ne uc $server->auto_update) and
$server->has_feature('ftr_auto_errata_updates')) {
- $server->auto_update($auto_update);
-
-# only do the auto update if we're switching to an auto-updated enterprise slot
system...
- if ($auto_update eq 'Y') {
- RHN::Scheduler->schedule_all_errata_updates_for_system(-earliest =>
RHN::Date->now->long_date,
- -org_id => $pxt->user->org_id,
- -user_id => $pxt->user->id,
- -server_id => $server->id,
- );
-
- push @extra_messages, $server->name . " will be <strong>fully
updated</strong> in accordance with Auto Errata Update preference.";
- }
- }
-
- $server->commit;
- $pxt->push_message(site_info => "System properties changed for
<strong>" . $server->name . "</strong>.");
-
- foreach my $message (@extra_messages) {
- $pxt->push_message(site_info => $message);
- }
- $pxt->redirect("/rhn/systems/details/Overview.do?sid=$sid");
-}
-
# Not a sniglet - handle system entitlement changes from server
# properties edit page.
sub handle_system_entitlement_change {
commit a0c990453490df7ce202589f661b5a7f1a87a83a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:18:09 2009 +0100
rhn:configfile_copy_files_cb not used, removing (configfile_copy_files_cb kept as
still referenced).
diff --git a/web/modules/sniglets/Sniglets/ConfigManagement.pm
b/web/modules/sniglets/Sniglets/ConfigManagement.pm
index 07d38b0..b12bc8d 100644
--- a/web/modules/sniglets/Sniglets/ConfigManagement.pm
+++ b/web/modules/sniglets/Sniglets/ConfigManagement.pm
@@ -39,12 +39,6 @@ sub register_tags {
# use -150 for priority since we need to set a {foo} that is consumed by a the navi
tag
}
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
- $pxt->register_callback('rhn:configfile_copy_files_cb' =>
\&configfile_copy_files_cb);
-}
-
sub configfile_copy_files_cb {
my $pxt = shift;
my $mode = $pxt->dirty_param('copy_mode') || '';
commit 0a429a066040c2379c12ea8ea638e9dbacd6b651
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:13:29 2009 +0100
Removal of schedule_ssm_config_action_cb made
_schedule_config_action_schedule_config_action and thus %config_actions unused, removing
as dead code.
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm
b/web/modules/sniglets/Sniglets/ServerActions.pm
index 7db6db3..f60c7c9 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -431,39 +431,6 @@ sub server_set_actions_cb {
}
}
-my %config_actions = ('configfiles.verify' => 'verification',
- 'configfiles.diff' => 'diff',
- 'configfiles.upload' => 'upload',
- 'configfiles.deploy' => 'deploy');
-
-sub _schedule_config_action {
- my $user = shift;
- my $action = shift;
- my $earliest_date = shift;
- my $sid = shift;
- my $ids = shift;
- my %id_map = %{$ids};
-
- my $server = RHN::Server->lookup(-id => $sid);
-
- my @revisions;
-
- foreach my $revision ($server->latest_managed_config_revisions()) {
- # skip file/rev unless it's truly under management on the server...
- next unless $id_map{$revision->{LATEST_CONFIG_REVISION_ID}};
- push @revisions, $revision->{LATEST_CONFIG_REVISION_ID};
- }
-
- RHN::Scheduler->schedule_config_action(-org_id => $user->org_id,
- -user_id => $user->id,
- -earliest => $earliest_date,
- -server_id => $sid,
- -action_type => $action,
- -action_name => 'Configuration ' . $config_actions{$action} .
' for '. $server->name,
- -revision_ids => [@revisions],
- );
-}
-
sub package_event_result {
my $pxt = shift;
my %attr = @_;
commit 970c8604f84ac3dcef03faa983cbbdcd2a13f29c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:11:44 2009 +0100
rhn:schedule_ssm_config_action_cb not used, removing, as well as
schedule_ssm_config_action_cb.
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm
b/web/modules/sniglets/Sniglets/ServerActions.pm
index 7d97c54..7db6db3 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -58,9 +58,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:reschedule_action_cb' =>
\&reschedule_action_cb);
$pxt->register_callback('rhn:sscd_reboot_servers_cb' =>
\&sscd_reboot_servers_cb);
-
- $pxt->register_callback('rhn:schedule_ssm_config_action_cb' =>
\&schedule_ssm_config_action_cb);
-
}
sub raw_script_output {
@@ -467,61 +464,6 @@ sub _schedule_config_action {
);
}
-sub schedule_ssm_config_action_cb {
-
- my $pxt = shift;
-
- my $action;
-
- foreach my $action_type (keys %config_actions) {
- $action = $action_type if $pxt->dirty_param($action_type);
- }
-
- die "no action" unless $action;
-
-
- my $earliest_date = Sniglets::ServerActions->parse_date_pickbox($pxt);
-
- # grab all the latest revisions per server
- my $ds = new RHN::DataSource::Simple(-querybase => 'config_queries',
- -mode => 'ssm_configfile_revisions',
- );
-
- my $data = $ds->execute_query(-user_id => $pxt->user->id);
-
- # Here's the plan. ssm_configfile_revisions is ordered by
- # SERVER_ID, and SCC.POSITION. So as we loop through the data, all
- # of the paths for each system are ordered by the
- # priority/position/rank for that system of the config channel they
- # were found in. So we just take the first instance of each path,
- # and thus avoid scheduling a diff for a path twice if it is in two
- # config channels that a system is subscribed to.
-
- my %paths_by_server_id;
- foreach my $row (@{$data}) {
- my $sid = $row->{SERVER_ID};
- my $path = $row->{PATH};
- my $crid = $row->{ID};
-
- next if exists $paths_by_server_id{$sid}->{$path};
- $paths_by_server_id{$sid}->{$path} = $crid;
- }
-
- my $server;
- foreach my $sid (keys %paths_by_server_id) {
- my %ids = map { ( $_ => 1 ) } values %{$paths_by_server_id{$sid}};
- _schedule_config_action($pxt->user, $action, $earliest_date, $sid, \%ids);
- }
-
- my $count = keys %paths_by_server_id;
- $pxt->push_message(site_info => sprintf("%d system%s scheduled for
%s.",
- $count, $count > 1 ? "s" : "", $config_actions{$action}));
-
- $pxt->redirect("/network/systems/ssm/index.pxt");
-
-}
-
-
sub package_event_result {
my $pxt = shift;
my %attr = @_;
commit 44627d0862a8c825a65dcca2694d9a5f5f589fb4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:10:44 2009 +0100
rhn:add_managed_filenames_to_set_cb not used, removing, as well as
add_managed_filenames_to_set_cb.
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm
b/web/modules/sniglets/Sniglets/ServerActions.pm
index a4e5705..7d97c54 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -59,7 +59,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:sscd_reboot_servers_cb' =>
\&sscd_reboot_servers_cb);
- $pxt->register_callback('rhn:add_managed_filenames_to_set_cb' =>
\&add_managed_filenames_to_set_cb);
$pxt->register_callback('rhn:schedule_ssm_config_action_cb' =>
\&schedule_ssm_config_action_cb);
}
@@ -523,36 +522,6 @@ sub schedule_ssm_config_action_cb {
}
-sub add_managed_filenames_to_set_cb {
- my $pxt = shift;
-
- my $sid = $pxt->param('sid');
- my $ds = new RHN::DataSource::Simple(-querybase => 'config_queries',
- -mode => 'configfiles_for_system',
- );
-
- my $data = $ds->execute_query(-sid => $sid);
-
- my %seen;
-
- $data = [ sort { $a->{PATH} cmp $b->{PATH} }
- grep { not $seen{$_->{PATH}}++ } @{$data} ];
-
- my @ids = map { $_->{CONFIG_FILE_NAME_ID} } @{$data};
-
- my $set_label = $pxt->dirty_param('set_label');
- die "No set label" unless $set_label;
-
- my $set = RHN::Set->lookup(-label => $set_label, -uid =>
$pxt->user->id);
- $set->empty;
- $set->commit;
- $set->add(@ids);
- $set->commit;
-
- my $uri = $pxt->uri;
- $pxt->redirect($uri . sprintf('?sid=%d&set_label=%s', $sid,
$set_label));
-}
-
sub package_event_result {
my $pxt = shift;
my %attr = @_;
commit b11db6ff8259e6b1e9a7d6613de79f8ffdffa3b4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:09:49 2009 +0100
rhn:add_managed_files_to_set_cb not used, removing, as well as
add_managed_files_to_set_cb.
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm
b/web/modules/sniglets/Sniglets/ServerActions.pm
index 5751671..a4e5705 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -59,7 +59,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:sscd_reboot_servers_cb' =>
\&sscd_reboot_servers_cb);
- $pxt->register_callback('rhn:add_managed_files_to_set_cb' =>
\&add_managed_files_to_set_cb);
$pxt->register_callback('rhn:add_managed_filenames_to_set_cb' =>
\&add_managed_filenames_to_set_cb);
$pxt->register_callback('rhn:schedule_ssm_config_action_cb' =>
\&schedule_ssm_config_action_cb);
@@ -524,36 +523,6 @@ sub schedule_ssm_config_action_cb {
}
-sub add_managed_files_to_set_cb {
- my $pxt = shift;
-
- my $sid = $pxt->param('sid');
- my $mode = $pxt->dirty_param('mode') eq 'diff' ?
'configfiles_for_system_diff' : 'configfiles_for_system';
- my $ds = new RHN::DataSource::Simple(-querybase => 'config_queries',
- -mode => $mode,
- );
- my $data = $ds->execute_query(-sid => $sid);
-
- my %seen;
-
- $data = [ sort { $a->{PATH} cmp $b->{PATH} }
- grep { not $seen{$_->{PATH}}++ } @{$data} ];
-
- my @ids = map { $_->{ID} } @{$data};
-
- my $set_label = $pxt->dirty_param('set_label');
- die "No set label" unless $set_label;
-
- my $set = RHN::Set->lookup(-label => $set_label, -uid =>
$pxt->user->id);
- $set->empty;
- $set->commit;
- $set->add(@ids);
- $set->commit;
-
- my $uri = $pxt->uri;
- $pxt->redirect($uri . sprintf('?sid=%d&set_label=%s', $sid,
$set_label));
-}
-
sub add_managed_filenames_to_set_cb {
my $pxt = shift;
commit 56715cc949c15451b7d83efe6d6556dc40c659e2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 10:07:28 2009 +0100
Removal of schedule_config_action_cb made schedule_config_upload unused, removing as
dead code.
diff --git a/web/modules/rhn/RHN/DB/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index 59d7c48..7ba4e44 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.pm
@@ -1752,76 +1752,6 @@ EOQ
}
-# treat uploads differently, because, well, they're different.
-sub schedule_config_upload {
- my $class = shift;
- my %params = validate(@_, { org_id => 1,
- user_id => 1,
- server_id => 1,
- earliest => 1,
- action_name => 1,
- transaction => 0,
- prerequisite => 0,
- filename_ids => 1,
- config_channel_id => 1,
- });
-
- my $dbh = $params{transaction} || RHN::DB->connect;
-
- my ($action_id, $stat_id) = $class->make_base_action(-org_id => $params{org_id},
- -user_id => $params{user_id},
- -type_label => 'configfiles.upload',
- -earliest => $params{earliest},
- -action_name => $params{action_name},
- -prerequisite => $params{prerequisite},
- -transaction => $dbh,
- );
-
- $class->add_servers_to_action($action_id, $stat_id, $params{user_id}, undef,
$params{server_id});
-
- my $server = RHN::Server->lookup(-id => $params{server_id});
-
- my $query;
- my $sth;
-
- $query =<<EOQ;
-INSERT
- INTO rhnActionConfigFileName
- (action_id, config_file_name_id, server_id)
-VALUES (:aid, :cfnid, :server_id)
-EOQ
-
- $sth = $dbh->prepare($query);
-
- foreach my $file_name_id (@{$params{filename_ids}}) {
- $sth->execute_h(server_id => $params{server_id},
- aid => $action_id,
- cfnid => $file_name_id,
- );
- }
-
- $query =<<EOQ;
-INSERT
- INTO rhnActionConfigChannel
- (action_id, server_id, config_channel_id)
-VALUES (:aid, :server_id, :config_channel_id)
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute_h(aid => $action_id,
- config_channel_id => $params{config_channel_id},
- server_id => $params{server_id},
- );
-
- $dbh->commit unless $params{transaction};
-
- # XXX FIXME: trace and percolate up
- osa_wakeup_tickle();
-
- return ($action_id, $dbh);
-}
-
-
sub schedule_kickstart_inject {
my $class = shift;
my %params = validate(@_, { org_id => 1, user_id => 1, server_id => 1,
earliest => 1, kstree_id => 1, append_string => 1, prerequisite => 0,
transaction => 0, static_device => 1, ksid => 0});