java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java | 14 ---------- web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml | 9 ------ 2 files changed, 23 deletions(-)
New commits: commit c3f81fadb12613dedac43442266fd3009086fc82 Author: Miroslav Suchý msuchy@redhat.com Date: Fri May 29 15:39:32 2009 +0200
501797 - no need to install Monitoring service
Monitoring service is now installed by spacewalk-setup and is always on (in chkconfig terminology) whether it will start or not is detected inside the startup scripts Therefore we can safely remove the installation from here (cherry picked from commit 0e11c024fd79f7e626a50dbfc4cbe20636ea7fb7)
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java index ec70bf4..bc89e07 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java @@ -308,20 +308,6 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand lookupConfigMacroByName("RHN_SAT_WEB_PORT"); setConfigMacroDefault(port, "443");
- // Setup the Monitoring Service - e = getExecutor(); - args.clear(); - args.add("/usr/bin/sudo"); - args.add("/etc/rc.d/np.d/step"); - args.add("Monitoring"); - args.add("install"); - exitcode = e.execute((String[]) args.toArray(new String[0])); - if (exitcode != 0) { - String message = "Not able to execute: [" + - args.toString() + "] got back exit code: " + exitcode; - logger.error(message); - throw new RuntimeException(message); - } if (logger.isDebugEnabled()) { logger.debug("enableMonitoring() - end"); }
commit 7fc14a12a5161989bc6a962441079dedd5f3726b Author: Miroslav Suchý msuchy@redhat.com Date: Fri May 29 15:32:04 2009 +0200
501797 - remove /etc/rc.d/np.d/step MonitoringScout install
it is obsolete by <action-name>Enable ${app.name} services</action-name> action (cherry picked from commit f8510568495380d2a71eeeb3154231e8febc315d)
diff --git a/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml index b786ef7..b32a29c 100644 --- a/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml @@ -625,15 +625,6 @@ fi <configfile acl="global_config(ssl_available);session_data_true(enable_osad)">/etc/jabberd/sm.xml</configfile> </deploy-configs>
- <run-script acl="session_data_true(enable_monitoring)"> - <action-name>Enable Monitoring Services</action-name> - <script> -#!/bin/sh - -/etc/rc.d/np.d/step MonitoringScout install - </script> - </run-script> - <run-script> <action-name>Allow Proxy service to read Satellite Configuration</action-name> <script>
spacewalk-commits@lists.fedorahosted.org