July 2009 - spacewalk-commits - Fedora Mailing-Lists

by John Matthews

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 0656787dcbc66cd594716073e0e5c81ff4011c38 Author: John Matthews <jmatthew(a)redhat.com> Date: Wed Jul 29 10:50:38 2009 -0400 Automatic commit of package [spacewalk-schema] release [0.6.18-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 796a807..06b8b40 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -0.6.17-1 schema/spacewalk/ +0.6.18-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 5e54462..f6fb56c 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 0.6.17 +Version: 0.6.18 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade* %changelog +* Wed Jul 29 2009 John Matthews <jmatthew(a)redhat.com> 0.6.18-1 +- Add upgrade scripts for PostgreSQL compat procedures. (dgoodwin(a)redhat.com) + * Tue Jul 28 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.17-1 - Fix rhnVersionInfo information (jortel(a)redhat.com) - Restore some Oracle/PostgreSQL compatability functions.

14 years, 9 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-web-0.6.16-1'

by John Matthews

Tag 'spacewalk-web-0.6.16-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-07-29 14:40 +0000 Tagging package [spacewalk-web] version [0.6.16-1] in directory [web/]. Changes since spacewalk-setup-0.6.14-1: Jan Pazdziora (3): 512440 - Revert "512440 - Fixed the proxies to turn SSLProxyEngine to deal with Cobbler KS files" 512440 - Revert parts of "512440 - Fixed the proxies to turn SSLProxyEngine to deal with Cobbler KS files" 512440 - SetHandler to none to allow ProxyPass on /cobbler* and /cblr to work. John Matthews (1): Automatic commit of package [spacewalk-web] release [0.6.16-1]. --- rel-eng/packages/spacewalk-web | 2 - web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf | 5 ++++ web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf | 3 -- web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf | 5 ++++ web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf | 3 -- web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf | 5 ++++ web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf | 4 --- web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf | 5 ++++ web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf | 3 -- web/spacewalk-web.spec | 12 ++++++++++- 10 files changed, 32 insertions(+), 15 deletions(-) ---

14 years, 9 months

1
0
0 / 0

rel-eng/packages web/spacewalk-web.spec

by John Matthews

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit da2f5c5e0d92802141c3d5da86deef25d860073a Author: John Matthews <jmatthew(a)redhat.com> Date: Wed Jul 29 10:40:10 2009 -0400 Automatic commit of package [spacewalk-web] release [0.6.16-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 13fc4e5..3326a8b 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -0.6.15-1 web/ +0.6.16-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index a4dfa94..e6f4911 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.15 +Version: 0.6.16 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -317,6 +317,16 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Wed Jul 29 2009 John Matthews <jmatthew(a)redhat.com> 0.6.16-1 +- 512440 - SetHandler to none to allow ProxyPass on /cobbler* and /cblr to + work. (jpazdziora(a)redhat.com) +- 512440 - Revert parts of "512440 - Fixed the proxies to turn SSLProxyEngine + to deal with Cobbler KS files" (jpazdziora(a)redhat.com) +- 512440 - Revert "512440 - Fixed the proxies to turn SSLProxyEngine to deal + with Cobbler KS files" (jpazdziora(a)redhat.com) +- Adding a new create channel api using checksumtype as a params. + (pkilambi(a)redhat.com) + * Mon Jul 27 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.15-1 - Prep perl stack for PostgreSQL connections. (dgoodwin(a)redhat.com) - Remove use of RHN_DEFAULT_DB environment variable for db connections.

14 years, 9 months

1
0
0 / 0

web/html

by Jan Pazdziora

web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf | 5 +++++ web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf | 5 +++++ web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf | 5 +++++ web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf | 5 +++++ 4 files changed, 20 insertions(+) New commits: commit 22fdcf91c2264228bb7d2ca0e8e7bdbb349ba9fa Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jul 29 11:34:44 2009 +0200 512440 - SetHandler to none to allow ProxyPass on /cobbler* and /cblr to work. diff --git a/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf index 79fb06d..e2fdce4 100644 --- a/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf +++ b/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf @@ -1,3 +1,8 @@ + +<LocationMatch "^/(cblr|cobbler)"> + SetHandler none +</LocationMatch> + ProxyPass /cobbler_api https://${session.rhn_parent}/cobbler_api ProxyPassReverse /cobbler_api https://${session.rhn_parent}/cobbler_api diff --git a/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf index 79fb06d..e2fdce4 100644 --- a/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf +++ b/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf @@ -1,3 +1,8 @@ + +<LocationMatch "^/(cblr|cobbler)"> + SetHandler none +</LocationMatch> + ProxyPass /cobbler_api https://${session.rhn_parent}/cobbler_api ProxyPassReverse /cobbler_api https://${session.rhn_parent}/cobbler_api diff --git a/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf index 79fb06d..e2fdce4 100644 --- a/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf +++ b/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf @@ -1,3 +1,8 @@ + +<LocationMatch "^/(cblr|cobbler)"> + SetHandler none +</LocationMatch> + ProxyPass /cobbler_api https://${session.rhn_parent}/cobbler_api ProxyPassReverse /cobbler_api https://${session.rhn_parent}/cobbler_api diff --git a/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf index 79fb06d..e2fdce4 100644 --- a/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf +++ b/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf @@ -1,3 +1,8 @@ + +<LocationMatch "^/(cblr|cobbler)"> + SetHandler none +</LocationMatch> + ProxyPass /cobbler_api https://${session.rhn_parent}/cobbler_api ProxyPassReverse /cobbler_api https://${session.rhn_parent}/cobbler_api

14 years, 9 months

1
0
0 / 0

Branch 'VADER' - 3 commits - web/html

by Jan Pazdziora

web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf | 5 +++++ web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf | 3 --- web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf | 5 +++++ web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf | 3 --- web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf | 5 +++++ web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf | 4 ---- web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf | 5 +++++ web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf | 3 --- 8 files changed, 20 insertions(+), 13 deletions(-) New commits: commit e21424906aee14b45f033a946eacbb3867f29909 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jul 29 11:34:44 2009 +0200 512440 - SetHandler to none to allow ProxyPass on /cobbler* and /cblr to work. (cherry picked from commit 22fdcf91c2264228bb7d2ca0e8e7bdbb349ba9fa) diff --git a/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf index 79fb06d..e2fdce4 100644 --- a/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf +++ b/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf @@ -1,3 +1,8 @@ + +<LocationMatch "^/(cblr|cobbler)"> + SetHandler none +</LocationMatch> + ProxyPass /cobbler_api https://${session.rhn_parent}/cobbler_api ProxyPassReverse /cobbler_api https://${session.rhn_parent}/cobbler_api diff --git a/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf index 79fb06d..e2fdce4 100644 --- a/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf +++ b/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf @@ -1,3 +1,8 @@ + +<LocationMatch "^/(cblr|cobbler)"> + SetHandler none +</LocationMatch> + ProxyPass /cobbler_api https://${session.rhn_parent}/cobbler_api ProxyPassReverse /cobbler_api https://${session.rhn_parent}/cobbler_api diff --git a/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf index 79fb06d..e2fdce4 100644 --- a/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf +++ b/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf @@ -1,3 +1,8 @@ + +<LocationMatch "^/(cblr|cobbler)"> + SetHandler none +</LocationMatch> + ProxyPass /cobbler_api https://${session.rhn_parent}/cobbler_api ProxyPassReverse /cobbler_api https://${session.rhn_parent}/cobbler_api diff --git a/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf index 79fb06d..e2fdce4 100644 --- a/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf +++ b/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf @@ -1,3 +1,8 @@ + +<LocationMatch "^/(cblr|cobbler)"> + SetHandler none +</LocationMatch> + ProxyPass /cobbler_api https://${session.rhn_parent}/cobbler_api ProxyPassReverse /cobbler_api https://${session.rhn_parent}/cobbler_api commit 13054a3e4e3a730e5f82d8413bccc951e274e096 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jul 29 09:33:36 2009 +0200 512440 - Revert parts of "512440 - Fixed the proxies to turn SSLProxyEngine to deal with Cobbler KS files" This reverts commit cd92c65cf39ec26dabf3889ad4a6d17c713e1abb for RHN Proxies 4.0 -- 4.2. The SSLProxyEngine is not supported on Apache 1.3. (cherry picked from commit 2f2257a22e98f3c720c44b789e6456713f52d048) diff --git a/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf index 4832797..fba9c9e 100644 --- a/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf @@ -44,6 +44,3 @@ DefaultType text/plain </LocationMatch> -#Disable SSL2, left only higher -SSLProtocol all -SSLv2 -SSLProxyEngine on diff --git a/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf index 4832797..fba9c9e 100644 --- a/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf @@ -44,6 +44,3 @@ DefaultType text/plain </LocationMatch> -#Disable SSL2, left only higher -SSLProtocol all -SSLv2 -SSLProxyEngine on diff --git a/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf index 741e2e5..fba9c9e 100644 --- a/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf @@ -44,7 +44,3 @@ DefaultType text/plain </LocationMatch> -#Disable SSL2, left only higher -SSLProtocol all -SSLv2 -SSLProxyEngine on - commit 2f74d3fe8248d5753e100056813b9c72ece022c3 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jul 29 09:32:40 2009 +0200 512440 - Revert "512440 - Fixed the proxies to turn SSLProxyEngine to deal with Cobbler KS files" This reverts commit 0082f6412e4a55b8de665278056645e99764f3d0. The SSLProxyEngine is not supported on Apache 1.3. (cherry picked from commit 1846fe95f504f57bcf220e0eb58504c2c067792a) diff --git a/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf index 9729ab7..7699ae6 100644 --- a/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf @@ -52,6 +52,3 @@ RewriteRule ^/rhn/?$ https://%{SERVER_NAME}/rhn/ [R,L] </IfModule> -#Disable SSL2, left only higher -SSLProtocol all -SSLv2 -SSLProxyEngine on

14 years, 9 months

1
0
0 / 0

2 commits - web/html

by Jan Pazdziora

web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf | 3 --- web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf | 3 --- web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf | 4 ---- web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf | 3 --- 4 files changed, 13 deletions(-) New commits: commit 2f2257a22e98f3c720c44b789e6456713f52d048 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jul 29 09:33:36 2009 +0200 512440 - Revert parts of "512440 - Fixed the proxies to turn SSLProxyEngine to deal with Cobbler KS files" This reverts commit cd92c65cf39ec26dabf3889ad4a6d17c713e1abb for RHN Proxies 4.0 -- 4.2. The SSLProxyEngine is not supported on Apache 1.3. diff --git a/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf index 4832797..fba9c9e 100644 --- a/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf @@ -44,6 +44,3 @@ DefaultType text/plain </LocationMatch> -#Disable SSL2, left only higher -SSLProtocol all -SSLv2 -SSLProxyEngine on diff --git a/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf index 4832797..fba9c9e 100644 --- a/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf @@ -44,6 +44,3 @@ DefaultType text/plain </LocationMatch> -#Disable SSL2, left only higher -SSLProtocol all -SSLv2 -SSLProxyEngine on diff --git a/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf index 741e2e5..fba9c9e 100644 --- a/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf @@ -44,7 +44,3 @@ DefaultType text/plain </LocationMatch> -#Disable SSL2, left only higher -SSLProtocol all -SSLv2 -SSLProxyEngine on - commit 1846fe95f504f57bcf220e0eb58504c2c067792a Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jul 29 09:32:40 2009 +0200 512440 - Revert "512440 - Fixed the proxies to turn SSLProxyEngine to deal with Cobbler KS files" This reverts commit 0082f6412e4a55b8de665278056645e99764f3d0. The SSLProxyEngine is not supported on Apache 1.3. diff --git a/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf index 9729ab7..7699ae6 100644 --- a/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf @@ -52,6 +52,3 @@ RewriteRule ^/rhn/?$ https://%{SERVER_NAME}/rhn/ [R,L] </IfModule> -#Disable SSL2, left only higher -SSLProtocol all -SSLv2 -SSLProxyEngine on

14 years, 9 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-setup-0.6.14-1'

by Devan Goodwin

Tag 'spacewalk-setup-0.6.14-1' created by Devan Goodwin <dgoodwin(a)redhat.com> at 2009-07-29 00:02 +0000 Tagging package [spacewalk-setup] version [0.6.14-1] in directory [spacewalk/setup/]. Changes since spacewalk-config-0.6.12-1: Devan Goodwin (1): Automatic commit of package [spacewalk-setup] release [0.6.14-1]. --- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---

14 years, 9 months

1
0
0 / 0

rel-eng/packages spacewalk/setup

by Devan Goodwin

rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 74cf3a029bdcb2a86a8a37370b7affc008608111 Author: Devan Goodwin <dgoodwin(a)redhat.com> Date: Tue Jul 28 21:02:42 2009 -0300 Automatic commit of package [spacewalk-setup] release [0.6.14-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index b78573d..654669c 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -0.6.13-1 spacewalk/setup/ +0.6.14-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 7e2b34f..3c27edb 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 0.6.13 +Version: 0.6.14 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk @@ -101,7 +101,7 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/pki/spacewalk/jabberd %changelog -* Tue Jul 28 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.13-1 +* Tue Jul 28 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.14-1 - Fix rhn.conf population of Hibernate dialect/driver/url settings. (dgoodwin(a)redhat.com) - Fix spacewalk-setup pgsql changes lost during merges. (dgoodwin(a)redhat.com)

14 years, 9 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-config-0.6.12-1'

by Devan Goodwin

Tag 'spacewalk-config-0.6.12-1' created by Devan Goodwin <dgoodwin(a)redhat.com> at 2009-07-29 00:02 +0000 Tagging package [spacewalk-config] version [0.6.12-1] in directory [spacewalk/config/]. Changes since spacewalk-java-0.6.38-1: Devan Goodwin (2): Better jabberd password replacement for upgrades. Automatic commit of package [spacewalk-config] release [0.6.12-1]. --- rel-eng/packages/spacewalk-config | 2 spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml | 8 +-- spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml | 2 spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml | 8 +-- spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 4 - spacewalk/config/spacewalk-config.spec | 21 +--------- spacewalk/setup/bin/spacewalk-setup | 10 +++- 7 files changed, 23 insertions(+), 32 deletions(-) ---

14 years, 9 months

1
0
0 / 0

2 commits - rel-eng/packages spacewalk/config spacewalk/setup

by Devan Goodwin

rel-eng/packages/spacewalk-config | 2 spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml | 8 +-- spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml | 2 spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml | 8 +-- spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 4 - spacewalk/config/spacewalk-config.spec | 21 +--------- spacewalk/setup/bin/spacewalk-setup | 10 +++- 7 files changed, 23 insertions(+), 32 deletions(-) New commits: commit a764585d33392841f6fbb4e3782ccf408bee09de Author: Devan Goodwin <dgoodwin(a)redhat.com> Date: Tue Jul 28 21:02:25 2009 -0300 Automatic commit of package [spacewalk-config] release [0.6.12-1]. diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config index ecde219..c464613 100644 --- a/rel-eng/packages/spacewalk-config +++ b/rel-eng/packages/spacewalk-config @@ -1 +1 @@ -0.6.11-1 spacewalk/config/ +0.6.12-1 spacewalk/config/ diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec index a9edc7e..e9640f5 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -2,7 +2,7 @@ Name: spacewalk-config Summary: Spacewalk Configuration -Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} URL: http://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -98,6 +98,9 @@ EOF %changelog +* Tue Jul 28 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.12-1 +- Better jabberd password replacement for upgrades. (dgoodwin(a)redhat.com) + * Mon Jul 27 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.11-1 - Populate Hibernate settings in rhn.conf for both Oracle and PostgreSQL. (dgoodwin(a)redhat.com) commit b2a1b020f50c6f6dc8eeaebce9779a26bc0eafb9 Author: Devan Goodwin <dgoodwin(a)redhat.com> Date: Tue Jul 28 20:48:21 2009 -0300 Better jabberd password replacement for upgrades. Use spacewalk-setup macro replacement to replace jabberd default passwords. Will fare better for upgrades than an rpm post script. diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml index 8b76c1a..b069296 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml @@ -15,7 +15,7 @@  <user>jabberd</user>  - <pass>@@pass@@</pass>  + <pass>@@jabberDOTdbpass@@</pass>   <user>jabberd2</user> - <pass>45296ce7aeb79751a83413fca6af2612e95a2fb6</pass> + <pass>@@jabberDOTdbpass@@</pass>   <user>jabberd2</user> - <pass>45296ce7aeb79751a83413fca6af2612e95a2fb6</pass> + <pass>@@jabberDOTdbpass@@</pass> </pgsql>  @@ -428,7 +428,7 @@  <user>jabberd2</user> - <pass>45296ce7aeb79751a83413fca6af2612e95a2fb6</pass> + <pass>@@jabberDOTdbpass@@</pass> </oracle>  diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml index 1a05ae3..4f10c11 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml @@ -16,7 +16,7 @@  <user>jabberd</user>  - <pass>@@pass@@</pass>  + <pass>@@jabberDOTdbpass@@</pass>   <user>jabberd</user>  - <pass>@@pass@@</pass>  + <pass>@@jabberDOTdbpass@@</pass>   <user>jabberd2</user> - <pass>@@pass@@</pass> + <pass>@@jabberDOTdbpass@@</pass>  <user>jabberd2</user> - <pass>@@pass@@</pass> + <pass>@@jabberDOTdbpass@@</pass>  <user>jabberd2</user> - <pass>@@pass@@</pass> + <pass>@@jabberDOTdbpass@@</pass> </oracle>  diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf index e76b32d..b82fb00 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf @@ -86,8 +86,8 @@ osa-dispatcher.osa_ssl_cert = @@osadispatcherDOTosa_ssl_cert@@ # set up a username and password for the dispatcher to connect to the # jabber network -osa-dispatcher.jabber_username = @@jabberDOTusername@@ -osa-dispatcher.jabber_password = @@jabberDOTpassword@@ +osa-dispatcher.jabber_username = @@osadispatcherDOTusername@@ +osa-dispatcher.jabber_password = @@osadispatcherDOTpassword@@ # Enable Solaris support diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec index 1645a3b..a9edc7e 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -96,22 +96,6 @@ export ORACLE_HOME=/opt/oracle export NLS_LANG=english.AL32UTF8 EOF -if [ "$1" -eq "1" ]; then - #replace default passwords, yes its kinda hackish - export NEWPASS=$( dd if=/dev/urandom bs=20 count=1 2>/dev/null \ - | sha1sum | awk '{print $1}' ) - %{__sed} -i -f- %{_sysconfdir}/jabberd/*.xml <<END -s,<secret>.*</secret>,<secret>$NEWPASS</secret>,g -END - %{__sed} -i -f- %{_sysconfdir}/jabberd/*.xml <<END -s,<pass>.*</pass>,<pass>$NEWPASS</pass>,g -END - %{__sed} -i -f- %{_sysconfdir}/sysconfig/rhn-satellite-prep/etc/jabberd/*.xml <<END -s,<pass>@@pass@@</pass>,<pass>$NEWPASS</pass>,g -END - -fi - %changelog * Mon Jul 27 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.11-1 diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index e221126..9fc9ce3 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -965,6 +965,9 @@ sub populate_initial_configs { $jabberdLibDir = "/usr/lib64/jabberd"; } + # Generate a random password for jabberd: + my $jabberdRouterPassword = `dd if=/dev/urandom bs=20 count=1 2>/dev/null | sha1sum | awk '{print \$1}'`; + my %config_opts = ( mount_point => $answers->{'mount-point'} || '/var/satellite', @@ -975,7 +978,6 @@ sub populate_initial_configs { webDOTis_monitoring_backend => 0, webDOTis_monitoring_scout => 0, webDOTenable_solaris_support => 0, - jabberDOThostname => $answers->{hostname}, osadispatcherDOTosa_ssl_cert => '/var/www/html/pub/RHN-ORG-TRUSTED-SSL-CERT', encrypted_passwords => 1, default_db => sprintf('%s/%s@%s', @{$answers}{qw/db-user db-password db-sid/}), @@ -989,9 +991,11 @@ sub populate_initial_configs { hibernate_driver => $hibernate_driver, hibernate_url => $hibernate_url, traceback_mail => $answers->{'admin-email'}, - jabberDOTusername => 'rhn-dispatcher-sat', + jabberDOThostname => $answers->{hostname}, jabberDOTlibdir => $jabberdLibDir, - jabberDOTpassword => 'rhn-dispatcher-' . random_password(6), + jabberDOTdbpass => $jabberdRouterPassword, + osadispatcherDOTusername => 'rhn-dispatcher-sat', + osadispatcherDOTpassword => 'rhn-dispatcher-' . random_password(6), serverDOTsatelliteDOTca_chain => '/usr/share/rhn/RHNS-CA-CERT', serverDOTnls_lang => 'english.' . $charset, server_secret_key => generate_secret(),

14 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits July 2009