java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java | 12 ---------- 1 file changed, 12 deletions(-)
New commits: commit 43ae2156021757e71ce53cad8a928201a95c4948 Author: Tomas Lestach tlestach@redhat.com Date: Wed Feb 1 12:10:48 2012 +0100
do not store DB information into the rhn_config_macro
PG monitoring stuff
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 ddc4b23..6a6c40f 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java @@ -287,18 +287,6 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand ConfigMacro cmdom = MonitoringConfigFactory. lookupConfigMacroByName("MDOM"); setConfigMacroDefault(cmdom, ConfigDefaults.get().getHostname()); - ConfigMacro dbname = MonitoringConfigFactory. - lookupConfigMacroByName("RHN_DB_NAME"); - setConfigMacroDefault(dbname, MonitoringConfigFactory.getDatabaseName()); - ConfigMacro dbuname = MonitoringConfigFactory. - lookupConfigMacroByName("RHN_DB_USERNAME"); - setConfigMacroDefault(dbuname, MonitoringConfigFactory.getDatabaseUsername()); - ConfigMacro dbpass = MonitoringConfigFactory. - lookupConfigMacroByName("RHN_DB_PASSWD"); - setConfigMacroDefault(dbpass, MonitoringConfigFactory.getDatabasePassword()); - ConfigMacro dbowner = MonitoringConfigFactory. - lookupConfigMacroByName("RHN_DB_TABLE_OWNER"); - setConfigMacroDefault(dbowner, MonitoringConfigFactory.getDatabaseUsername()); ConfigMacro sathostname = MonitoringConfigFactory. lookupConfigMacroByName("RHN_SAT_HOSTNAME"); setConfigMacroDefault(sathostname, ConfigDefaults.get().getHostname());
spacewalk-commits@lists.fedorahosted.org