From msuchy at fedoraproject.org Thu Aug 20 11:57:15 2015 Content-Type: multipart/mixed; boundary="===============9071118254622389847==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - java/code web/html Date: Fri, 29 May 2009 13:41:10 +0000 Message-ID: <20090529134110.0EA65120152@lists.fedorahosted.org> --===============9071118254622389847== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.j= ava | 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=C3=BD 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/ConfigureSatell= iteCommand.java b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureS= atelliteCommand.java index ec70bf4..bc89e07 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteComm= and.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteComm= and.java @@ -308,20 +308,6 @@ public class ConfigureSatelliteCommand extends BaseCon= figureCommand lookupConfigMacroByName("RHN_SAT_WEB_PORT"); setConfigMacroDefault(port, "443"); = - // Setup the Monitoring Service - e =3D getExecutor(); - args.clear(); - args.add("/usr/bin/sudo"); - args.add("/etc/rc.d/np.d/step"); - args.add("Monitoring"); - args.add("install"); - exitcode =3D e.execute((String[]) args.toArray(new String[0])); - if (exitcode !=3D 0) { - String message =3D "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=C3=BD Date: Fri May 29 15:32:04 2009 +0200 501797 - remove /etc/rc.d/np.d/step MonitoringScout install = it is obsolete by Enable ${app.name} services action (cherry picked from commit f8510568495380d2a71eeeb3154231e8febc315d) diff --git a/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml b/we= b/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 /etc/jabberd/sm.xml = = - - Enable Monitoring Services - - - Allow Proxy service to read Satellite Configuration