web/html/applications/rhn-proxy/4.0/install-rhn-proxy.xml | 4 +++- web/html/applications/rhn-proxy/4.1/install-rhn-proxy.xml | 4 +++- web/html/applications/rhn-proxy/4.2/install-rhn-proxy.xml | 4 +++- web/html/applications/rhn-proxy/5.0/install-rhn-proxy.xml | 4 +++- web/html/applications/rhn-proxy/5.1/install-rhn-proxy.xml | 4 +++- web/html/applications/rhn-proxy/5.2/install-rhn-proxy.xml | 4 +++- web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml | 4 +++- web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml | 4 +++- 8 files changed, 24 insertions(+), 8 deletions(-)
New commits: commit 6c2ffd15361eaf3b3c28dfd1c87ff77017316b33 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Oct 6 09:33:08 2010 +0200
639449 - add package spacewalk-setup-jabberd to list of packages which should be removed in Proxy WebUI installer
diff --git a/web/html/applications/rhn-proxy/4.0/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/4.0/install-rhn-proxy.xml index 54a6483..f7c107e 100644 --- a/web/html/applications/rhn-proxy/4.0/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/4.0/install-rhn-proxy.xml @@ -139,6 +139,7 @@ <package>spacewalk-proxy-management</package> <package>spacewalk-base-minimal</package> <package>spacewalk-proxy-redirect</package> + <package>spacewalk-setup-jabberd</package> <package>nocpulse-common</package> <package>nocpulse-db-perl</package> <package>jabberd-selinux</package> @@ -259,6 +260,7 @@ Would you like to enable Monitoring Proxy functionality on this system? <widget type="literal" label="scdb" default="${session.have_package_scdb}" acl="session_data_true(have_package_scdb)" /> <widget type="literal" label="scdb_accessor_perl" default="${session.have_package_scdb_accessor_perl}" acl="session_data_true(have_package_scdb_accessor_perl)" /> <widget type="literal" label="SNMPAlerts" default="${session.have_package_SNMPAlerts}" acl="session_data_true(have_package_SNMPAlerts)" /> + <widget type="literal" label="spacewalk-setup-jabberd" default="${session.have_package_spacewalk_setup_jabberd}" acl="session_data_true(have_package_spacewalk_setup_jabberd)" /> <widget type="literal" label="SputLite-client" default="${session.have_package_SputLite_client}" acl="session_data_true(have_package_SputLite_client)" /> <widget type="literal" label="SputLite-server" default="${session.have_package_SputLite_server}" acl="session_data_true(have_package_SputLite_server)" /> <widget type="literal" label="ssl_bridge" default="${session.have_package_ssl_bridge}" acl="session_data_true(have_package_ssl_bridge)" /> @@ -802,7 +804,7 @@ proxy will need to be reconfigured to use a different Satellite server. <action-name>Remove proxy packages</action-name> <script> #!/bin/sh -PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd jabberd jabberd MessageQueue mm NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-apache rhn-base-minimal rhn-base-minimal rhn-base-minimal rhn-modperl rhn-modpython rhn-modssl rhn-ssl-cert-check rhns rhns rhns rhns-auth-daemon rhns-auth-daemon rhns-auth-daemon rhns-certs-tools rhns-certs-tools rhns-certs-tools rhns-proxy-broker rhns-proxy-broker rhns-proxy-broker rhns-proxy-docs rhns-proxy-docs rhns-proxy-docs rhns-proxy-management rhns-proxy-management rhns-proxy-management rhns-proxy-monitoring rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-package-manager rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-redirect rhns-proxy-redirect rhns-proxy-tools rhns-proxy-tools rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl; do +PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd jabberd jabberd MessageQueue mm NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-apache rhn-base-minimal rhn-base-minimal rhn-base-minimal rhn-modperl rhn-modpython rhn-modssl rhn-ssl-cert-check rhns rhns rhns rhns-auth-daemon rhns-auth-daemon rhns-auth-daemon rhns-certs-tools rhns-certs-tools rhns-certs-tools rhns-proxy-broker rhns-proxy-broker rhns-proxy-broker rhns-proxy-docs rhns-proxy-docs rhns-proxy-docs rhns-proxy-management rhns-proxy-management rhns-proxy-management rhns-proxy-monitoring rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-package-manager rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-redirect rhns-proxy-redirect rhns-proxy-tools rhns-proxy-tools rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl spacewalk-setup-jabberd; do rpm -q $package >/dev/null && echo $package; done` if [ -n "$PACKAGES" ]; then rpm -e $PACKAGES diff --git a/web/html/applications/rhn-proxy/4.1/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/4.1/install-rhn-proxy.xml index b951c91..022dade 100644 --- a/web/html/applications/rhn-proxy/4.1/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/4.1/install-rhn-proxy.xml @@ -139,6 +139,7 @@ <package>spacewalk-proxy-management</package> <package>spacewalk-base-minimal</package> <package>spacewalk-proxy-redirect</package> + <package>spacewalk-setup-jabberd</package> <package>nocpulse-common</package> <package>nocpulse-db-perl</package> <package>jabberd-selinux</package> @@ -259,6 +260,7 @@ Would you like to enable Monitoring Proxy functionality on this system? <widget type="literal" label="scdb" default="${session.have_package_scdb}" acl="session_data_true(have_package_scdb)" /> <widget type="literal" label="scdb_accessor_perl" default="${session.have_package_scdb_accessor_perl}" acl="session_data_true(have_package_scdb_accessor_perl)" /> <widget type="literal" label="SNMPAlerts" default="${session.have_package_SNMPAlerts}" acl="session_data_true(have_package_SNMPAlerts)" /> + <widget type="literal" label="spacewalk-setup-jabberd" default="${session.have_package_spacewalk_setup_jabberd}" acl="session_data_true(have_package_spacewalk_setup_jabberd)" /> <widget type="literal" label="SputLite-client" default="${session.have_package_SputLite_client}" acl="session_data_true(have_package_SputLite_client)" /> <widget type="literal" label="SputLite-server" default="${session.have_package_SputLite_server}" acl="session_data_true(have_package_SputLite_server)" /> <widget type="literal" label="ssl_bridge" default="${session.have_package_ssl_bridge}" acl="session_data_true(have_package_ssl_bridge)" /> @@ -802,7 +804,7 @@ proxy will need to be reconfigured to use a different Satellite server. <action-name>Remove proxy packages</action-name> <script> #!/bin/sh -PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd MessageQueue mm NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-apache rhn-base-minimal rhn-modperl rhn-modpython rhn-modssl rhn-ssl-cert-check rhns rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-docs rhns-proxy-management rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl; do +PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd MessageQueue mm NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-apache rhn-base-minimal rhn-modperl rhn-modpython rhn-modssl rhn-ssl-cert-check rhns rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-docs rhns-proxy-management rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl spacewalk-setup-jabberd; do rpm -q $package >/dev/null && echo $package; done` if [ -n "$PACKAGES" ]; then rpm -e $PACKAGES diff --git a/web/html/applications/rhn-proxy/4.2/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/4.2/install-rhn-proxy.xml index e8f9d59..da5cacc 100644 --- a/web/html/applications/rhn-proxy/4.2/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/4.2/install-rhn-proxy.xml @@ -135,6 +135,7 @@ <package>spacewalk-proxy-monitoring</package> <package>spacewalk-proxy-package-manager</package> <package>spacewalk-proxy-redirect</package> + <package>spacewalk-setup-jabberd</package> <package>spacewalk-ssl-cert-check</package> <package>SputLite-client</package> <package>SputLite-server</package> @@ -275,6 +276,7 @@ Would you like to enable Monitoring Proxy functionality on this system? <widget type="literal" label="spacewalk-proxy-monitoring" default="${session.have_package_spacewalk_proxy_monitoring}" acl="session_data_true(have_package_spacewalk_proxy_monitoring)" /> <widget type="literal" label="spacewalk-proxy-package-manager" default="${session.have_package_spacewalk_proxy_package_manager}" acl="session_data_true(have_package_spacewalk_proxy_package_manager)" /> <widget type="literal" label="spacewalk-proxy-redirect" default="${session.have_package_spacewalk_proxy_redirect}" acl="session_data_true(have_package_spacewalk_proxy_redirect)" /> + <widget type="literal" label="spacewalk-setup-jabberd" default="${session.have_package_spacewalk_setup_jabberd}" acl="session_data_true(have_package_spacewalk_setup_jabberd)" /> <widget type="literal" label="spacewalk-ssl-cert-check" default="${session.have_package_spacewalk_ssl_cert_check}" acl="session_data_true(have_package_spacewalk_ssl_cert_check)" /> <widget type="literal" label="SputLite-client" default="${session.have_package_SputLite_client}" acl="session_data_true(have_package_SputLite_client)" /> <widget type="literal" label="SputLite-server" default="${session.have_package_SputLite_server}" acl="session_data_true(have_package_SputLite_server)" /> @@ -819,7 +821,7 @@ proxy will need to be reconfigured to use a different Satellite server. <action-name>Remove proxy packages</action-name> <script> #!/bin/sh -PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd MessageQueue mm NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-apache rhn-base-minimal rhn-modperl rhn-modpython rhn-modssl rhn-ssl-cert-check rhns rhns rhns-auth-daemon rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-broker rhns-proxy-docs rhns-proxy-docs rhns-proxy-management rhns-proxy-management rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-redirect rhns-proxy-tools rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl; do +PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd MessageQueue mm NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-apache rhn-base-minimal rhn-modperl rhn-modpython rhn-modssl rhn-ssl-cert-check rhns rhns rhns-auth-daemon rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-broker rhns-proxy-docs rhns-proxy-docs rhns-proxy-management rhns-proxy-management rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-redirect rhns-proxy-tools rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl spacewalk-setup-jabberd; do rpm -q $package >/dev/null && echo $package; done` if [ -n "$PACKAGES" ]; then rpm -e $PACKAGES diff --git a/web/html/applications/rhn-proxy/5.0/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.0/install-rhn-proxy.xml index 7f5779d..1279840 100644 --- a/web/html/applications/rhn-proxy/5.0/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.0/install-rhn-proxy.xml @@ -135,6 +135,7 @@ <package>spacewalk-proxy-monitoring</package> <package>spacewalk-proxy-package-manager</package> <package>spacewalk-proxy-redirect</package> + <package>spacewalk-setup-jabberd</package> <package>spacewalk-ssl-cert-check</package> <package>SputLite-client</package> <package>SputLite-server</package> @@ -275,6 +276,7 @@ Would you like to enable Monitoring Proxy functionality on this system? <widget type="literal" label="spacewalk-proxy-monitoring" default="${session.have_package_spacewalk_proxy_monitoring}" acl="session_data_true(have_package_spacewalk_proxy_monitoring)" /> <widget type="literal" label="spacewalk-proxy-package-manager" default="${session.have_package_spacewalk_proxy_package_manager}" acl="session_data_true(have_package_spacewalk_proxy_package_manager)" /> <widget type="literal" label="spacewalk-proxy-redirect" default="${session.have_package_spacewalk_proxy_redirect}" acl="session_data_true(have_package_spacewalk_proxy_redirect)" /> + <widget type="literal" label="spacewalk-setup-jabberd" default="${session.have_package_spacewalk_setup_jabberd}" acl="session_data_true(have_package_spacewalk_setup_jabberd)" /> <widget type="literal" label="spacewalk-ssl-cert-check" default="${session.have_package_spacewalk_ssl_cert_check}" acl="session_data_true(have_package_spacewalk_ssl_cert_check)" /> <widget type="literal" label="SputLite-client" default="${session.have_package_SputLite_client}" acl="session_data_true(have_package_SputLite_client)" /> <widget type="literal" label="SputLite-server" default="${session.have_package_SputLite_server}" acl="session_data_true(have_package_SputLite_server)" /> @@ -819,7 +821,7 @@ proxy will need to be reconfigured to use a different Satellite server. <action-name>Remove proxy packages</action-name> <script> #!/bin/sh -PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd MessageQueue mm NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-apache rhn-base-minimal rhn-modperl rhn-modpython rhn-modssl rhn-ssl-cert-check rhns rhns rhns-auth-daemon rhns-auth-daemon rhns-certs-tools rhns-certs-tools rhns-proxy-broker rhns-proxy-broker rhns-proxy-docs rhns-proxy-docs rhns-proxy-management rhns-proxy-management rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-redirect rhns-proxy-tools rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl; do +PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd MessageQueue mm NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-apache rhn-base-minimal rhn-modperl rhn-modpython rhn-modssl rhn-ssl-cert-check rhns rhns rhns-auth-daemon rhns-auth-daemon rhns-certs-tools rhns-certs-tools rhns-proxy-broker rhns-proxy-broker rhns-proxy-docs rhns-proxy-docs rhns-proxy-management rhns-proxy-management rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-redirect rhns-proxy-tools rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl spacewalk-setup-jabberd; do rpm -q $package >/dev/null && echo $package; done` if [ -n "$PACKAGES" ]; then rpm -e $PACKAGES diff --git a/web/html/applications/rhn-proxy/5.1/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.1/install-rhn-proxy.xml index 5b46819..76e462d 100644 --- a/web/html/applications/rhn-proxy/5.1/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.1/install-rhn-proxy.xml @@ -135,6 +135,7 @@ <package>spacewalk-proxy-monitoring</package> <package>spacewalk-proxy-package-manager</package> <package>spacewalk-proxy-redirect</package> + <package>spacewalk-setup-jabberd</package> <package>spacewalk-ssl-cert-check</package> <package>SputLite-client</package> <package>SputLite-server</package> @@ -275,6 +276,7 @@ Would you like to enable Monitoring Proxy functionality on this system? <widget type="literal" label="spacewalk-proxy-monitoring" default="${session.have_package_spacewalk_proxy_monitoring}" acl="session_data_true(have_package_spacewalk_proxy_monitoring)" /> <widget type="literal" label="spacewalk-proxy-package-manager" default="${session.have_package_spacewalk_proxy_package_manager}" acl="session_data_true(have_package_spacewalk_proxy_package_manager)" /> <widget type="literal" label="spacewalk-proxy-redirect" default="${session.have_package_spacewalk_proxy_redirect}" acl="session_data_true(have_package_spacewalk_proxy_redirect)" /> + <widget type="literal" label="spacewalk-setup-jabberd" default="${session.have_package_spacewalk_setup_jabberd}" acl="session_data_true(have_package_spacewalk_setup_jabberd)" /> <widget type="literal" label="spacewalk-ssl-cert-check" default="${session.have_package_spacewalk_ssl_cert_check}" acl="session_data_true(have_package_spacewalk_ssl_cert_check)" /> <widget type="literal" label="SputLite-client" default="${session.have_package_SputLite_client}" acl="session_data_true(have_package_SputLite_client)" /> <widget type="literal" label="SputLite-server" default="${session.have_package_SputLite_server}" acl="session_data_true(have_package_SputLite_server)" /> @@ -813,7 +815,7 @@ proxy will need to be reconfigured to use a different Satellite server. <action-name>Remove proxy packages</action-name> <script> #!/bin/sh -PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd libapreq2 MessageQueue mm mod_perl NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-libapreq2 perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-base-minimal rhn-ssl-cert-check rhns rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-docs rhns-proxy-management rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl httpd mod_python mod_ssl httpd-suexec; do +PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd libapreq2 MessageQueue mm mod_perl NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-libapreq2 perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-base-minimal rhn-ssl-cert-check rhns rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-docs rhns-proxy-management rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl httpd mod_python mod_ssl httpd-suexec spacewalk-setup-jabberd; do rpm -q $package >/dev/null && echo $package; done` if [ -n "$PACKAGES" ]; then rpm -e $PACKAGES diff --git a/web/html/applications/rhn-proxy/5.2/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.2/install-rhn-proxy.xml index 3e3e195..2074fc0 100644 --- a/web/html/applications/rhn-proxy/5.2/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.2/install-rhn-proxy.xml @@ -135,6 +135,7 @@ <package>spacewalk-proxy-monitoring</package> <package>spacewalk-proxy-package-manager</package> <package>spacewalk-proxy-redirect</package> + <package>spacewalk-setup-jabberd</package> <package>spacewalk-ssl-cert-check</package> <package>SputLite-client</package> <package>SputLite-server</package> @@ -275,6 +276,7 @@ Would you like to enable Monitoring Proxy functionality on this system? <widget type="literal" label="spacewalk-proxy-monitoring" default="${session.have_package_spacewalk_proxy_monitoring}" acl="session_data_true(have_package_spacewalk_proxy_monitoring)" /> <widget type="literal" label="spacewalk-proxy-package-manager" default="${session.have_package_spacewalk_proxy_package_manager}" acl="session_data_true(have_package_spacewalk_proxy_package_manager)" /> <widget type="literal" label="spacewalk-proxy-redirect" default="${session.have_package_spacewalk_proxy_redirect}" acl="session_data_true(have_package_spacewalk_proxy_redirect)" /> + <widget type="literal" label="spacewalk-setup-jabberd" default="${session.have_package_spacewalk_setup_jabberd}" acl="session_data_true(have_package_spacewalk_setup_jabberd)" /> <widget type="literal" label="spacewalk-ssl-cert-check" default="${session.have_package_spacewalk_ssl_cert_check}" acl="session_data_true(have_package_spacewalk_ssl_cert_check)" /> <widget type="literal" label="SputLite-client" default="${session.have_package_SputLite_client}" acl="session_data_true(have_package_SputLite_client)" /> <widget type="literal" label="SputLite-server" default="${session.have_package_SputLite_server}" acl="session_data_true(have_package_SputLite_server)" /> @@ -819,7 +821,7 @@ proxy will need to be reconfigured to use a different Satellite server. <action-name>Remove proxy packages</action-name> <script> #!/bin/sh -PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd libapreq2 MessageQueue mm mod_perl NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-libapreq2 perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-base-minimal rhn-ssl-cert-check rhns rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-common rhns-proxy-docs rhns-proxy-management rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl httpd mod_python mod_ssl httpd-suexec; do +PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd libapreq2 MessageQueue mm mod_perl NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-libapreq2 perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-base-minimal rhn-ssl-cert-check rhns rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-common rhns-proxy-docs rhns-proxy-management rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl httpd mod_python mod_ssl httpd-suexec spacewalk-setup-jabberd; do rpm -q $package >/dev/null && echo $package; done` if [ -n "$PACKAGES" ]; then rpm -e $PACKAGES 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 0ebee6d..b22ff0c 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 @@ -139,6 +139,7 @@ <package>spacewalk-proxy-package-manager</package> <package>spacewalk-proxy-redirect</package> <package>spacewalk-proxy-selinux</package> + <package>spacewalk-setup-jabberd</package> <package>spacewalk-ssl-cert-check</package> <package>SputLite-client</package> <package>SputLite-server</package> @@ -283,6 +284,7 @@ Would you like to enable Monitoring Proxy functionality on this system? <widget type="literal" label="spacewalk-proxy-package-manager" default="${session.have_package_spacewalk_proxy_package_manager}" acl="session_data_true(have_package_spacewalk_proxy_package_manager)" /> <widget type="literal" label="spacewalk-proxy-redirect" default="${session.have_package_spacewalk_proxy_redirect}" acl="session_data_true(have_package_spacewalk_proxy_redirect)" /> <widget type="literal" label="spacewalk-proxy-selinux" default="${session.have_package_spacewalk_proxy_selinux}" acl="session_data_true(have_package_spacewalk_proxy_selinux)" /> + <widget type="literal" label="spacewalk-setup-jabberd" default="${session.have_package_spacewalk_setup_jabberd}" acl="session_data_true(have_package_spacewalk_setup_jabberd)" /> <widget type="literal" label="spacewalk-ssl-cert-check" default="${session.have_package_spacewalk_ssl_cert_check}" acl="session_data_true(have_package_spacewalk_ssl_cert_check)" /> <widget type="literal" label="SputLite-client" default="${session.have_package_SputLite_client}" acl="session_data_true(have_package_SputLite_client)" /> <widget type="literal" label="SputLite-server" default="${session.have_package_SputLite_server}" acl="session_data_true(have_package_SputLite_server)" /> @@ -854,7 +856,7 @@ proxy will need to be reconfigured to use a different Satellite server. <action-name>Remove proxy packages</action-name> <script> #!/bin/sh -PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd libapreq2 MessageQueue mm mod_perl NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle-instantclient-selinux oracle-nofcontext-selinux oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-libapreq2 perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-base-minimal rhn-ssl-cert-check rhns rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-common rhns-proxy-docs rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl httpd mod_python mod_ssl httpd httpd-suexec spacewalk-proxy-html spacewalk-ssl-cert-check spacewalk-monitoring-selinux spacewalk-proxy-common spacewalk-proxy-installer spacewalk-proxy-docs spacewalk-proxy-monitoring spacewalk-backend spacewalk-proxy-package-manager spacewalk-certs-tools spacewalk-proxy-broker spacewalk-proxy-management spacewalk-base-minimal spacewalk-proxy-redirect spacewalk-proxy-selinux nocpulse-common nocpulse-db-perl jabberd-selinux rhn-proxy-branding; do +PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd libapreq2 MessageQueue mm mod_perl NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle-instantclient-selinux oracle-nofcontext-selinux oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-libapreq2 perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-base-minimal rhn-ssl-cert-check rhns rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-common rhns-proxy-docs rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl httpd mod_python mod_ssl httpd httpd-suexec spacewalk-proxy-html spacewalk-ssl-cert-check spacewalk-monitoring-selinux spacewalk-proxy-common spacewalk-proxy-installer spacewalk-proxy-docs spacewalk-proxy-monitoring spacewalk-backend spacewalk-proxy-package-manager spacewalk-certs-tools spacewalk-proxy-broker spacewalk-proxy-management spacewalk-base-minimal spacewalk-proxy-redirect spacewalk-proxy-selinux nocpulse-common nocpulse-db-perl jabberd-selinux rhn-proxy-branding spacewalk-setup-jabberd; do rpm -q $package >/dev/null && echo $package; done` if [ -n "$PACKAGES" ]; then rpm -e $PACKAGES diff --git a/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml index c470776..bd97f42 100644 --- a/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml @@ -139,6 +139,7 @@ <package>spacewalk-proxy-package-manager</package> <package>spacewalk-proxy-redirect</package> <package>spacewalk-proxy-selinux</package> + <package>spacewalk-setup-jabberd</package> <package>spacewalk-ssl-cert-check</package> <package>SputLite-client</package> <package>SputLite-server</package> @@ -283,6 +284,7 @@ Would you like to enable Monitoring Proxy functionality on this system? <widget type="literal" label="spacewalk-proxy-package-manager" default="${session.have_package_spacewalk_proxy_package_manager}" acl="session_data_true(have_package_spacewalk_proxy_package_manager)" /> <widget type="literal" label="spacewalk-proxy-redirect" default="${session.have_package_spacewalk_proxy_redirect}" acl="session_data_true(have_package_spacewalk_proxy_redirect)" /> <widget type="literal" label="spacewalk-proxy-selinux" default="${session.have_package_spacewalk_proxy_selinux}" acl="session_data_true(have_package_spacewalk_proxy_selinux)" /> + <widget type="literal" label="spacewalk-setup-jabberd" default="${session.have_package_spacewalk_setup_jabberd}" acl="session_data_true(have_package_spacewalk_setup_jabberd)" /> <widget type="literal" label="spacewalk-ssl-cert-check" default="${session.have_package_spacewalk_ssl_cert_check}" acl="session_data_true(have_package_spacewalk_ssl_cert_check)" /> <widget type="literal" label="SputLite-client" default="${session.have_package_SputLite_client}" acl="session_data_true(have_package_SputLite_client)" /> <widget type="literal" label="SputLite-server" default="${session.have_package_SputLite_server}" acl="session_data_true(have_package_SputLite_server)" /> @@ -854,7 +856,7 @@ proxy will need to be reconfigured to use a different Satellite server. <action-name>Remove proxy packages</action-name> <script> #!/bin/sh -PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd libapreq2 MessageQueue mm mod_perl NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle-instantclient-selinux oracle-nofcontext-selinux oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-libapreq2 perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-base-minimal rhn-ssl-cert-check rhns rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-common rhns-proxy-docs rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl httpd mod_python mod_ssl httpd httpd-suexec spacewalk-proxy-html spacewalk-ssl-cert-check spacewalk-monitoring-selinux spacewalk-proxy-common spacewalk-proxy-installer spacewalk-proxy-docs spacewalk-proxy-monitoring spacewalk-backend spacewalk-proxy-package-manager spacewalk-certs-tools spacewalk-proxy-broker spacewalk-proxy-management spacewalk-base-minimal spacewalk-proxy-redirect spacewalk-proxy-selinux nocpulse-common nocpulse-db-perl jabberd-selinux rhn-proxy-branding; do +PACKAGES=`for package in bdb_perl ConfigPusher-general eventReceivers FcntlLock jabberd libapreq2 MessageQueue mm mod_perl NOCpulsePlugins np-config NPalert NPusers nslogs oracle-devel oracle-instantclient-selinux oracle-nofcontext-selinux oracle_perl perl-Apache-Admin-Config perl-Apache-DBI perl-BerkeleyDB perl-BSD-Resource perl-Class-MethodMaker perl-Class-Singleton perl-Config-IniFiles perl-Crypt-DES perl-Crypt-GeneratePassword perl-Crypt-SSLeay perl-DateTime perl-DateTime-Locale perl-DateTime-TimeZone perl-DBD-Oracle perl-Devel-Symdump perl-Error perl-FreezeThaw perl-HTML-TableExtract perl-IO-Capture perl-IO-Socket-SSL perl-IO-stringy perl-libapreq2 perl-Mail-Alias perl-MailTools perl-MIME-tools perl-Net-SNMP perl-Network-IPv4Addr perl-Net_SSLeay perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-OracleDB perl-NOCpulse-PersistentConnection perl-NOCpulse-Probe perl-NOCpulse-ProcessPool perl-NOCpulse-Scheduler perl-NOCpulse-SetID perl-NOCpulse-Utils perl-Params-Validate perl-TimeDate perl-XML-Generator ProgAGoGo python-sgmlop rhn-base-minimal rhn-ssl-cert-check rhns rhns-auth-daemon rhns-certs-tools rhns-proxy-broker rhns-proxy-common rhns-proxy-docs rhns-proxy-monitoring rhns-proxy-package-manager rhns-proxy-redirect rhns-proxy-tools SatConfig-ApacheDepot SatConfig-bootstrap SatConfig-bootstrap-server SatConfig-cluster SatConfig-dbsynch SatConfig-general SatConfig-generator SatConfig-installer SatConfig-spread scdb scdb_accessor_perl SNMPAlerts SputLite-client SputLite-server ssl_bridge status_log_acceptor Time-System tsdb tsdb_accessor_perl httpd mod_python mod_ssl httpd httpd-suexec spacewalk-proxy-html spacewalk-ssl-cert-check spacewalk-monitoring-selinux spacewalk-proxy-common spacewalk-proxy-installer spacewalk-proxy-docs spacewalk-proxy-monitoring spacewalk-backend spacewalk-proxy-package-manager spacewalk-certs-tools spacewalk-proxy-broker spacewalk-proxy-management spacewalk-base-minimal spacewalk-proxy-redirect spacewalk-proxy-selinux nocpulse-common nocpulse-db-perl jabberd-selinux rhn-proxy-branding spacewalk-setup-jabberd; do rpm -q $package >/dev/null && echo $package; done` if [ -n "$PACKAGES" ]; then rpm -e $PACKAGES