proxy/installer/answers.txt | 4 +
proxy/installer/configure-proxy.sh | 100 +++++++++++++++++--------------
proxy/installer/configure-proxy.sh.sgml | 102 ++++++++++++++++++--------------
3 files changed, 119 insertions(+), 87 deletions(-)
New commits:
commit 82f4a714ec6fbb6923787ac3916658bb0c479268
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 4 11:35:32 2010 +0100
570431 - add option --start-services to skip starting proxy services after
configuration
diff --git a/proxy/installer/answers.txt b/proxy/installer/answers.txt
index 67c7803..aefc5fb 100644
--- a/proxy/installer/answers.txt
+++ b/proxy/installer/answers.txt
@@ -30,3 +30,7 @@ HTTP_PASSWORD=
# these during proxy activation.
POPULATE_CONFIG_CHANNEL=Y
+# if you do not want to start services after configuration
+# set this variable to 0 or N
+START_SERVICES=Y
+
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index f60ff9f..339865a 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -62,6 +62,9 @@ options:
Password to be used for SSL CA certificate.
--ssl-state=SSL_STATE
State to be used in SSL certificate.
+ --start-services=1
+ 1 or Y to start all services after configuration. This is default.
+ 0 or N to not start services after configuration.
--traceback-email=TRACEBACK_EMAIL
Email to which tracebacks should be sent.
--use-ssl=USE_SSL
@@ -105,6 +108,7 @@ while [ $# -ge 1 ]; do
--monitoring-parent=*) MONITORING_PARENT_IP=$(echo $1 | cut -d= -f2-);;
--monitoring-parent-ip=*) MONITORING_PARENT_IP=$(echo $1 | cut -d= -f2-);;
--populate-config-channel=*) POPULATE_CONFIG_CHANNEL=$(echo $1 | cut -d= -f2-);;
+ --start-services=*) START_SERVICES=$(echo $1 | cut -d= -f2-);;
*) echo Error: Invalid option $1
esac
shift
@@ -286,6 +290,10 @@ if [ $? -eq 0 ]; then
mv /etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf.rpmsave
fi
+if [ -x /usr/sbin/rhn-proxy ]; then
+ /usr/sbin/rhn-proxy stop
+fi
+
$YUM_OR_UPDATE spacewalk-proxy-management
# check if package install successfully
rpm -q spacewalk-proxy-management >/dev/null
@@ -484,5 +492,12 @@ for service in squid httpd jabberd $MonitoringScout; do
/sbin/chkconfig --add $service
/sbin/chkconfig --level 345 $service on
done
-/usr/sbin/rhn-proxy restart
+# default is 1
+START_SERVICES=$(yes_no ${START_SERVICES:-1})
+if [ "$START_SERVICES" = "1" ]; then
+ /usr/sbin/rhn-proxy restart
+else
+ echo Skipping start of services.
+ echo Use "/usr/sbin/rhn-proxy start" to manualy start proxy.
+fi
diff --git a/proxy/installer/configure-proxy.sh.sgml
b/proxy/installer/configure-proxy.sh.sgml
index af69f77..b97da31 100644
--- a/proxy/installer/configure-proxy.sh.sgml
+++ b/proxy/installer/configure-proxy.sh.sgml
@@ -185,6 +185,13 @@ provide a required response, default answer is used.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <term>--start-services=START</term>
+ <listitem>
+ <para>1 or Y to start all services after configuration. This is
default.</para>
+ <para>0 or N to not start services after configuration.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>--traceback-email=TRACEBACK_EMAIL</term>
<listitem>
<para>Email to which tracebacks should be sent.</para>
@@ -317,6 +324,13 @@ provide a required response, default answer is used.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <term>START_SERVICES</term>
+ <listitem>
+ <para>1 or Y to start all services after configuration. This is
default.</para>
+ <para>0 or N to not start services after configuration.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>INSTALL_MONITORING</term>
<listitem>
<para>Y if monitoring should be installed. Any other value means that
monitoring will not be installed.</para>
commit 8356a4e1cc695357337fbc0190e43229bbd30454
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 4 11:01:15 2010 +0100
sort configure-proxy.sh options alphabeticaly
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index b1ccf9c..f60ff9f 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -14,63 +14,62 @@ options:
Indicates the location of an answer file to be use for answering
questions asked during the installation process. See man page for
for an example and documentation.
+ --ca-chain=CA_CHAIN
+ The CA cert used to verify the ssl connection to parent.
+ --enable-scout=1
+ 1 to enable monitoring scout, 0 otherwise.
+ --force-own-ca
+ Do not use parent CA and force to create your own.
-h, --help
show this help message and exit
+ --http-password=HTTP_PASSWORD
+ The password to use for an authenticated proxy.
+ --http-proxy=HTTP_PROXY
+ HTTP proxy in host:port format, e.g. squid.redhat.com:3128
+ --http-username=HTTP_USERNAME
+ The username for an authenticated proxy.
+ --install-monitoring=Y
+ Y if monitoring should be installed. Any other value means that
+ monitoring will not be installed.
--non-interactive
For use only with --answer-file. If the --answer-file doesn't
provide a required response, default answer is used.
-
- --version=VERSION
- Version of Spacewalk Proxy Server you want to activate.
+ --monitoring-parent=MONITORING_PARENT
+ Name of the parent for your scout. Usually the same value as in
+ RHN_PARENT.
+ --monitoring-parent-ip=MONITORING_PARENT_IP
+ IP address of MONITORING_PARENT
+ --populate-config-channel=Y
+ Y if config chanel should be created and configuration files in that channel
+ updated. Configuration channel will be named rhn_proxy_config_\${SYSTEM_ID}.
--rhn-parent=RHN_PARENT
Your parent Spacewalk server.
- --traceback-email=TRACEBACK_EMAIL
- Email to which tracebacks should be sent.
- --use-ssl=USE_SSL
- 1 if Spacewalk Proxy Server should communicate with parent over SSL.
- 0 otherwise. Even if disabled, client can still use SSL to connect
- to Spacewalk Proxy Server.
- --ca-chain=CA_CHAIN
- The CA cert used to verify the ssl connection to parent.
- --force-own-ca
- Do not use parent CA and force to create your own.
- --http-proxy=HTTP_PROXY
- HTTP proxy in host:port format, e.g. squid.redhat.com:3128
- --http-username=HTTP_USERNAME
- The username for an authenticated proxy.
- --http-password=HTTP_PASSWORD
- The password to use for an authenticated proxy.
--ssl-build-dir=SSL_BUILD_DIR
The directory where we build SSL certificate. Default is /root/ssl-build
+ --ssl-city=SSL_CITY
+ City to be used in SSL certificate.
+ --ssl-common=SSL_COMMON
+ Common name to be used in SSL certificate.
+ --ssl-country=SSL_COUNTRY
+ Two letters country code to be used in SSL certificate.
+ --ssl-email=SSL_EMAIL
+ Email to be used in SSL certificate.
--ssl-org=SSL_ORG
Organization name to be used in SSL certificate.
--ssl-orgunit=SSL_ORGUNIT
Organization unit name to be used in SSL certificate.
- --ssl-common=SSL_COMMON
- Common name to be used in SSL certificate.
- --ssl-city=SSL_CITY
- City to be used in SSL certificate.
+ --ssl-password=SSL_PASSWORD
+ Password to be used for SSL CA certificate.
--ssl-state=SSL_STATE
State to be used in SSL certificate.
- --ssl-country=SSL_COUNTRY
- Two letters country code to be used in SSL certificate.
- --ssl-email=SSL_EMAIL
- Email to be used in SSL certificate.
- --ssl-password=SSL_PASSWORD
- Password to be used for SSL CA certificate.
- --install-monitoring=Y
- Y if monitoring should be installed. Any other value means that
- monitoring will not be installed.
- --enable-scout=1
- 1 to enable monitoring scout, 0 otherwise.
- --monitoring-parent=MONITORING_PARENT
- Name of the parent for your scout. Usually the same value as in
- RHN_PARENT.
- --monitoring-parent-ip=MONITORING_PARENT_IP
- IP address of MONITORING_PARENT
- --populate-config-channel=Y
- Y if config chanel should be created and configuration files in that channel
- updated. Configuration channel will be named rhn_proxy_config_\${SYSTEM_ID}.
+ --traceback-email=TRACEBACK_EMAIL
+ Email to which tracebacks should be sent.
+ --use-ssl=USE_SSL
+ 1 if Spacewalk Proxy Server should communicate with parent over SSL.
+ 0 otherwise. Even if disabled, client can still use SSL to connect
+ to Spacewalk Proxy Server.
+ --version=VERSION
+ Version of Spacewalk Proxy Server you want to activate.
HELP
exit
}
diff --git a/proxy/installer/configure-proxy.sh.sgml
b/proxy/installer/configure-proxy.sh.sgml
index 26b7b56..af69f77 100644
--- a/proxy/installer/configure-proxy.sh.sgml
+++ b/proxy/installer/configure-proxy.sh.sgml
@@ -64,40 +64,28 @@ provide a required response, default answer is used.</para>
<para>Following options can be set using answer file as well. See section ANSWER
FILE.
</para>
<variablelist>
- <varlistentry>
- <term>--version=VERSION</term>
- <listitem>
- <para>Version of Spacewalk Proxy Server you want to
activate.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>--rhn-parent=RHN_PARENT</term>
- <listitem>
- <para>Your parent Spacewalk server.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>--traceback-email=TRACEBACK_EMAIL</term>
+ <varlistentry>
+ <term>--ca-chain=CA_CHAIN</term>
<listitem>
- <para>Email to which tracebacks should be sent.</para>
+ <para>The CA cert used to verify the ssl connection to
parent.</para>
</listitem>
- </varlistentry>
- <varlistentry>
- <term>--use-ssl=USE_SSL</term>
+ </varlistentry>
+ <varlistentry>
+ <term>--enable-scout=1</term>
<listitem>
- <para>1 if Spacewalk Proxy Server should communicate with parent over
SSL. 0 otherwise. Even if disabled, client can still use SSL to connect to Spacewalk Proxy
Server.</para>
+ <para>1 to enable monitoring scout, 0 otherwise.</para>
</listitem>
- </varlistentry>
+ </varlistentry>
<varlistentry>
- <term>--ca-chain=CA_CHAIN</term>
+ <term>--force-own-ca</term>
<listitem>
- <para>The CA cert used to verify the ssl connection to
parent.</para>
+ <para>Do not use parent CA and force to create your own.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--force-own-ca</term>
+ <term>--http-password=HTTP_PASSWORD</term>
<listitem>
- <para>Do not use parent CA and force to create your own.</para>
+ <para>The password to use for an authenticated proxy.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -113,33 +101,39 @@ provide a required response, default answer is used.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--http-password=HTTP_PASSWORD</term>
+ <term>--install-monitoring=Y</term>
<listitem>
- <para>The password to use for an authenticated proxy.</para>
+ <para>Y if monitoring should be installed. Any other value means that
monitoring will not be installed.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--ssl-build-dir=SSL_BUILD_DIR</term>
+ <term>--monitoring-parent=MONITORING_PARENT</term>
<listitem>
- <para>The directory where we build SSL certificate. Default is
/root/ssl-build.</para>
+ <para>Name of the parent for your scout. Usually the same value as in
RHN_PARENT.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--ssl-org=SSL_ORG</term>
+ <term>--monitoring-parent-ip=MONITORING_PARENT_IP</term>
<listitem>
- <para>Organization name to be used in SSL certificate.</para>
+ <para>IP address of MONITORING_PARENT</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--ssl-orgunit=SSL_ORGUNIT</term>
+ <term>--populate-config-channel=Y</term>
<listitem>
- <para>Organization unit name to be used in SSL
certificate.</para>
+ <para>Y if config chanel should be created and configuration files in
that channel updated. Configuration channel will be named
rhn_proxy_config_${SYSTEM_ID}</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--ssl-common=SSL_COMMON</term>
+ <term>--rhn-parent=RHN_PARENT</term>
<listitem>
- <para>Common name to be used in SSL certificate.</para>
+ <para>Your parent Spacewalk server.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>--ssl-build-dir=SSL_BUILD_DIR</term>
+ <listitem>
+ <para>The directory where we build SSL certificate. Default is
/root/ssl-build.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -149,9 +143,9 @@ provide a required response, default answer is used.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--ssl-state=SSL_STATE</term>
+ <term>--ssl-common=SSL_COMMON</term>
<listitem>
- <para>State to be used in SSL certificate.</para>
+ <para>Common name to be used in SSL certificate.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -167,39 +161,45 @@ provide a required response, default answer is used.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--ssl-password=SSL_PASSWORD</term>
+ <term>--ssl-org=SSL_ORG</term>
<listitem>
- <para>Password to be used for SSL CA certificate.</para>
+ <para>Organization name to be used in SSL certificate.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--install-monitoring=Y</term>
+ <term>--ssl-orgunit=SSL_ORGUNIT</term>
<listitem>
- <para>Y if monitoring should be installed. Any other value means that
monitoring will not be installed.</para>
+ <para>Organization unit name to be used in SSL
certificate.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--enable-scout=1</term>
+ <term>--ssl-password=SSL_PASSWORD</term>
<listitem>
- <para>1 to enable monitoring scout, 0 otherwise.</para>
+ <para>Password to be used for SSL CA certificate.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--monitoring-parent=MONITORING_PARENT</term>
+ <term>--ssl-state=SSL_STATE</term>
<listitem>
- <para>Name of the parent for your scout. Usually the same value as in
RHN_PARENT.</para>
+ <para>State to be used in SSL certificate.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--monitoring-parent-ip=MONITORING_PARENT_IP</term>
+ <term>--traceback-email=TRACEBACK_EMAIL</term>
<listitem>
- <para>IP address of MONITORING_PARENT</para>
+ <para>Email to which tracebacks should be sent.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>--populate-config-channel=Y</term>
+ <term>--use-ssl=USE_SSL</term>
<listitem>
- <para>Y if config chanel should be created and configuration files in
that channel updated. Configuration channel will be named
rhn_proxy_config_${SYSTEM_ID}</para>
+ <para>1 if Spacewalk Proxy Server should communicate with parent over
SSL. 0 otherwise. Even if disabled, client can still use SSL to connect to Spacewalk Proxy
Server.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>--version=VERSION</term>
+ <listitem>
+ <para>Version of Spacewalk Proxy Server you want to
activate.</para>
</listitem>
</varlistentry>
</variablelist>
Show replies by date