proxy/installer/configure-proxy.sh | 2 --
proxy/installer/spacewalk-proxy-installer.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 6e39710634780dbd5ea01d9744e3d65d695506a0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 28 11:17:30 2011 +0200
Automatic commit of package [spacewalk-proxy-installer] release [1.5.2-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec
b/proxy/installer/spacewalk-proxy-installer.spec
index 6b25fc5..ec19e94 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.5.1
+Version: 1.5.2
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE answers.txt
%changelog
+* Thu Apr 28 2011 Miroslav Suchý 1.5.2-1
+- 648868 - do not put proxy_broker.conf and proxy_redirect.conf to
+ configuration channel (mmello(a)redhat.com)
+
* Mon Apr 18 2011 Miroslav Suchý 1.5.1-1
- 696918 - honor hostedWhitelist during Proxy installation
- Bumping package versions for 1.5
diff --git a/rel-eng/packages/spacewalk-proxy-installer
b/rel-eng/packages/spacewalk-proxy-installer
index f0e11bc..6a107e3 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.5.1-1 proxy/installer/
+1.5.2-1 proxy/installer/
commit be411a6ed081207f8fa4009dc949f9158455816e
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Wed Apr 27 09:55:53 2011 -0300
648868 - do not put proxy_broker.conf and proxy_redirect.conf to configuration
channel
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index b78ac52..75d857c 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -489,8 +489,6 @@ if [ "$POPULATE_CONFIG_CHANNEL" = "1" ]; then
$SQUID_DIR/squid.conf \
$HTTPDCONFD_DIR/cobbler-proxy.conf \
$HTTPDCONF_DIR/httpd.conf \
- $HTTPDCONFD_DIR/proxy_broker.conf \
- $HTTPDCONFD_DIR/proxy_redirect.conf \
$JABBERD_DIR/c2s.xml \
$JABBERD_DIR/sm.xml
fi