proxy/installer/configure-proxy.sh | 5 ++++-
proxy/installer/spacewalk-proxy-installer.spec | 7 ++++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 36bc05232d46b5a0524d71371e4047f17a96bb2e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Aug 29 11:49:37 2011 +0200
Automatic commit of package [spacewalk-proxy-installer] release [1.6.3-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec
b/proxy/installer/spacewalk-proxy-installer.spec
index 1c08fc5..57c32a7 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 1.6.2
+Version: 1.6.3
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -83,6 +83,11 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE answers.txt
%changelog
+* Mon Aug 29 2011 Miroslav Suchý 1.6.3-1
+- check if "copy_extension=copy" is in correct section
+- do not ask for SSL_CNAME if it set in answer file to empty array
+- fail if CA configuration file do not copy extension
+
* Mon Aug 22 2011 Miroslav Suchý 1.6.2-1
- allow proxy installer to set cname alias
diff --git a/rel-eng/packages/spacewalk-proxy-installer
b/rel-eng/packages/spacewalk-proxy-installer
index 1a06f3e..487369a 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.6.2-1 proxy/installer/
+1.6.3-1 proxy/installer/
commit 9b848d7e253b8c152492e39331a338ae85fb2a9f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Aug 29 11:44:46 2011 +0200
check if "copy_extension=copy" is in correct section
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index 2116f04..b686cdf 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -188,7 +188,10 @@ is_hosted () {
}
check_ca_conf () {
- if ! grep '^[[:space:]]*copy_extensions[[:space:]]*=[[:space:]]*copy'
/root/ssl-build/rhn-ca-openssl.cnf >/dev/null \
+ if awk '/^[[:space:]]*\[[[:space:]]*[_[:alnum:]]*[[:space:]]*]/
{CORRECT_SECTION=0} \
+ /^[[:space:]]*\[[[:space:]]*CA_default[[:space:]]*]/ {CORRECT_SECTION=1} \
+ /^[[:space:]]*copy_extensions[[:space:]]*=[[:space:]]*copy/ &&
CORRECT_SECTION==1 {exit 1}' \
+ /root/ssl-build/rhn-ca-openssl.cnf \
&& [ ${#SSL_CNAME_PARSED[@]} -gt 0 ]; then
cat <<WARNING
It seems you tried to use the --set-cname option. On inspection we noticed that the
openssl configuration file we use is missing a critically important option. Without this
option, not only will multi host SSL certificates not work, but the planet Earth will
implode in a massive rip in the time/space continuum. To avoid this failure, we choose to
gracefully exit here and request for you to edit the openssl configuration file