proxy/proxy
by Miroslav Suchý
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 13 +++++++++++++
1 file changed, 13 insertions(+)
New commits:
commit 439f4c00f067c2b9ce73677729ca901d851d8554
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Apr 19 14:19:12 2011 +0200
697447 - handle all other request
diff --git a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
index c84d7ef..988096d 100644
--- a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
+++ b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
@@ -12,6 +12,19 @@ WSGIPythonPath "/usr/share/rhn"
# RPC STUFF
WSGIScriptAlias /XMLRPC /usr/share/rhn/wsgi/xmlrpc.py
WSGIScriptAlias /rpc /usr/share/rhn/wsgi/xmlrpc.py
+# rhnpush
+WSGIScriptAlias /APP /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /PACKAGE-PUSH /usr/share/rhn/wsgi/xmlrpc.py
+# applet
+WSGIScriptAlias /APPLET /usr/share/rhn/wsgi/xmlrpc.py
+# rhncfg*
+WSGIScriptAlias /CONFIG-MANAGEMENT /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /CONFIG-MANAGEMENT-TOOL /usr/share/rhn/wsgi/xmlrpc.py
+# others
+WSGIScriptAlias /SAT /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /SAT-DUMP-INTERNAL /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /XP /usr/share/rhn/wsgi/xmlrpc.py
+
# WebUI of rhnParent, can be safely disabled if you do not want to browse
# Spacewalk WebUI
WSGIScriptAlias /css /usr/share/rhn/wsgi/xmlrpc.py
13 years, 1 month
Changes to 'refs/tags/spacecmd-1.5.1-1'
by aparsons
Tag 'spacecmd-1.5.1-1' created by Aron Parsons <aparsons(a)redhat.com> at 2011-04-18 18:58 +0000
Tagging package [spacecmd] version [1.5.1-1] in directory [spacecmd/].
Changes since spacewalk-proxy-1.5.1-1:
Aron Parsons (6):
spacecmd: added kickstart_clone
spacecmd: fix handling of group names with spaces when expanding with 'group:'
spacecmd: whitespace cleanup
spacecmd: 696681 - allow special characters in server names
spacecmd: 696681 - fix spaces in system names in system_updatecustomvalue and system_addcustomvalue
Automatic commit of package [spacecmd] release [1.5.1-1].
---
rel-eng/packages/spacecmd | 2 -
spacecmd/spacecmd.spec | 12 ++++++++++-
spacecmd/src/lib/kickstart.py | 44 ++++++++++++++++++++++++++++++++++++++++++
spacecmd/src/lib/misc.py | 12 +++++------
spacecmd/src/lib/system.py | 35 ++++++++++++++++++---------------
spacecmd/src/lib/utils.py | 26 ++++++++++++------------
6 files changed, 94 insertions(+), 37 deletions(-)
---
13 years, 1 month
6 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons
rel-eng/packages/spacecmd | 2 -
spacecmd/spacecmd.spec | 12 ++++++++++-
spacecmd/src/lib/kickstart.py | 44 ++++++++++++++++++++++++++++++++++++++++++
spacecmd/src/lib/misc.py | 12 +++++------
spacecmd/src/lib/system.py | 35 ++++++++++++++++++---------------
spacecmd/src/lib/utils.py | 26 ++++++++++++------------
6 files changed, 94 insertions(+), 37 deletions(-)
New commits:
commit 89a11c9053bb1aa84b0e78ca6020ba09b1a420a1
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Mon Apr 18 14:58:16 2011 -0400
Automatic commit of package [spacecmd] release [1.5.1-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 02b6e52..8a9d3b7 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-1.4.5-1 spacecmd/
+1.5.1-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 990d562..9705622 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -61,6 +61,16 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Mon Apr 18 2011 Aron Parsons <aparsons(a)redhat.com> 1.5.1-1
+- 696681 - fix spaces in system names in system_updatecustomvalue and
+ system_addcustomvalue (aparsons(a)redhat.com)
+- 696681 - allow special characters in server names
+- whitespace cleanup (aparsons(a)redhat.com)
+- fix handling of group names with spaces when expanding with
+ 'group:' (aparsons(a)redhat.com)
+- added kickstart_clone (aparsons(a)redhat.com)
+- Bumping package versions for 1.5 (msuchy(a)redhat.com)
+
* Mon Mar 28 2011 Aron Parsons <aparsons(a)redhat.com> 1.4.5-1
- added 'repo' module into shell (aparsons(a)redhat.com)
- added repo_list and repo_details (tljohnsn(a)oreillyschool.com)
commit 93aecb0998fbf18b44f63bea8a0bd5bfe9009253
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Mon Apr 18 13:50:39 2011 -0400
spacecmd: 696681 - fix spaces in system names in system_updatecustomvalue and system_addcustomvalue
diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py
index 9b2dcf2..af287ee 100644
--- a/spacecmd/src/lib/system.py
+++ b/spacecmd/src/lib/system.py
@@ -1398,32 +1398,35 @@ def do_system_listcustomvalues(self, args):
def help_system_addcustomvalue(self):
print 'system_addcustomvalue: Set a custom value for a system'
- print 'usage: system_addcustomvalue <SYSTEMS> KEY VALUE'
+ print 'usage: system_addcustomvalue KEY VALUE <SYSTEMS>'
print
print self.HELP_SYSTEM_OPTS
def complete_system_addcustomvalue(self, text, line, beg, end):
- if len(line.split(' ')) == 2:
+ parts = shlex.split(line)
+ if line[-1] == ' ': parts.append('')
+
+ if len(parts) == 2:
+ return tab_completer(self.do_custominfo_listkeys('', True), text)
+ elif len(parts) >= 4:
return self.tab_complete_systems(text)
- elif len(line.split(' ')) == 3:
- return tab_completer(self.do_custominfo_listkeys('', True),
- text)
def do_system_addcustomvalue(self, args):
- (args, options) = parse_arguments(args)
+ if not isinstance(args, list):
+ (args, options) = parse_arguments(args)
if len(args) < 3:
self.help_system_addcustomvalue()
return
+ key = args[0]
+ value = args[1]
+
# use the systems listed in the SSM
if re.match('ssm', args[0], re.I):
systems = self.ssm.keys()
else:
- systems = self.expand_systems(args)
-
- key = args[1]
- value = ' '.join(args[2:])
+ systems = self.expand_systems(args[2:])
for system in systems:
system_id = self.get_system_id(system)
@@ -1437,18 +1440,18 @@ def do_system_addcustomvalue(self, args):
def help_system_updatecustomvalue(self):
print 'system_updatecustomvalue: Update a custom value for a system'
- print 'usage: system_updatecustomvalue <SYSTEMS> KEY VALUE'
+ print 'usage: system_updatecustomvalue KEY VALUE <SYSTEMS>'
print
print self.HELP_SYSTEM_OPTS
def complete_system_updatecustomvalue(self, text, line, beg, end):
- parts = line.split(' ')
+ parts = shlex.split(line)
+ if line[-1] == ' ': parts.append('')
if len(parts) == 2:
+ return tab_completer(self.do_custominfo_listkeys('', True), text)
+ elif len(parts) >= 4:
return self.tab_complete_systems(text)
- elif len(parts) == 3:
- return tab_completer(self.do_custominfo_listkeys('', True),
- text)
def do_system_updatecustomvalue(self, args):
(args, options) = parse_arguments(args)
@@ -1457,7 +1460,7 @@ def do_system_updatecustomvalue(self, args):
self.help_system_updatecustomvalue()
return
- return self.do_system_addcustomvalue(' '.join(args))
+ return self.do_system_addcustomvalue(args)
####################
commit 6608c1bf64b8645e405bee34e6e9faf089c7d50e
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Mon Apr 18 13:37:43 2011 -0400
spacecmd: 696681 - allow special characters in server names
diff --git a/spacecmd/src/lib/misc.py b/spacecmd/src/lib/misc.py
index 897016d..8bdfad6 100644
--- a/spacecmd/src/lib/misc.py
+++ b/spacecmd/src/lib/misc.py
@@ -751,7 +751,7 @@ def expand_systems(self, args):
members = self.do_group_listsystems("'%s'" % item, True)
if len(members):
- systems.extend(members)
+ systems.extend( [re.escape(m) for m in members] )
else:
logging.warning('No systems in group %s' % item)
elif re.match('search:', item):
@@ -759,13 +759,13 @@ def expand_systems(self, args):
results = self.do_system_search(query, True)
if len(results):
- systems.extend(results)
+ systems.extend( [re.escape(r) for r in results] )
elif re.match('channel:', item):
item = re.sub('channel:', '', item)
members = self.do_softwarechannel_listsystems(item, True)
if len(members):
- systems.extend(members)
+ systems.extend( [re.escape(m) for m in members] )
else:
logging.warning('No systems subscribed to %s' % item)
else:
commit 12a438bd40fe3a8f1195bf3c2936841a7524649c
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Mon Apr 18 13:18:03 2011 -0400
spacecmd: whitespace cleanup
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index 812f4db..3768647 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -101,7 +101,7 @@ def tab_completer(options, text):
def filter_results(items, patterns, search = False):
matches = []
-
+
compiled_patterns = []
for pattern in patterns:
compiled_patterns.append(re.compile(pattern, re.I))
@@ -211,10 +211,10 @@ def parse_time_input(userinput = ''):
# handle YYYMMDDHHMM times
if not timestamp:
match = re.match('^(\d{4})(\d{2})(\d{2})(\d{2})?(\d{2})?$', userinput)
-
+
if match:
format = '%Y%m%d'
-
+
# YYYYMMDD
if not match.group(4) and not match.group(5):
timestamp = time.strptime('%s%s%s' % (match.group(1),
@@ -224,7 +224,7 @@ def parse_time_input(userinput = ''):
# YYYYMMDDHH
elif not match.group(5):
format += '%H'
-
+
timestamp = time.strptime('%s%s%s%s' % (match.group(1),
match.group(2),
match.group(3),
@@ -233,19 +233,19 @@ def parse_time_input(userinput = ''):
# YYYYMMDDHHMM
else:
format += '%H%M'
-
+
timestamp = time.strptime('%s%s%s%s%s' % (match.group(1),
match.group(2),
match.group(3),
match.group(4),
match.group(5)),
format)
-
+
if timestamp:
# 2.5 has a nice little datetime.strptime() function...
timestamp = datetime(*(timestamp)[0:7])
-
- # handle time differences (e.g., +1m, +2h)
+
+ # handle time differences (e.g., +1m, +2h)
if not timestamp:
match = re.search('^(\+|-)?(\d+)(s|m|h|d)$', userinput, re.I)
@@ -370,12 +370,12 @@ def config_channel_order(all_channels=[], new_channels=[]):
print '------------------'
for i in range(len(new_channels)):
print '%i. %s' % (i + 1, new_channels[i])
-
- print
+
+ print
action = prompt_user('a[dd], r[emove], c[lear], d[one]:')
if re.match('a', action, re.I):
- print
+ print
print 'Available Configuration Channels'
print '--------------------------------'
for c in sorted(all_channels):
@@ -383,11 +383,11 @@ def config_channel_order(all_channels=[], new_channels=[]):
print
channel = prompt_user('Channel:')
-
+
if channel not in all_channels:
logging.warning('Invalid channel')
continue
-
+
try:
rank = int(prompt_user('New Rank:'))
commit 84d158be772a60f0b59ea8a3088e79eeb3bc899a
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Mon Apr 18 13:14:19 2011 -0400
spacecmd: fix handling of group names with spaces when expanding with 'group:'
diff --git a/spacecmd/src/lib/misc.py b/spacecmd/src/lib/misc.py
index 6be4d59..897016d 100644
--- a/spacecmd/src/lib/misc.py
+++ b/spacecmd/src/lib/misc.py
@@ -20,7 +20,7 @@
# NOTE: the 'self' variable is an instance of SpacewalkShell
-import logging, readline
+import logging, readline, shlex
from getpass import getpass
from ConfigParser import NoOptionError
from spacecmd.utils import *
@@ -738,7 +738,7 @@ def expand_errata(self, args):
def expand_systems(self, args):
if not isinstance(args, list):
- args = args.split()
+ args = shlex.split(args)
systems = []
system_ids = []
@@ -748,7 +748,7 @@ def expand_systems(self, args):
systems.extend(self.ssm)
elif re.match('group:', item):
item = re.sub('group:', '', item)
- members = self.do_group_listsystems(item, True)
+ members = self.do_group_listsystems("'%s'" % item, True)
if len(members):
systems.extend(members)
commit f4120a6dd0a8bc6aa88cb7c2a3d5309752cb5314
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Mon Apr 18 09:52:11 2011 -0400
spacecmd: added kickstart_clone
diff --git a/spacecmd/src/lib/kickstart.py b/spacecmd/src/lib/kickstart.py
index dab199d..cf20c0d 100644
--- a/spacecmd/src/lib/kickstart.py
+++ b/spacecmd/src/lib/kickstart.py
@@ -1730,4 +1730,48 @@ def do_kickstart_removescript(self, args):
profile,
script_id)
+####################
+
+def help_kickstart_clone(self):
+ print 'kickstart_clone: Clone a Kickstart profile'
+ print '''usage: kickstart_clone [options]
+
+options:
+ -n NAME
+ -c CLONE_NAME'''
+
+def complete_kickstart_clone(self, text, line, beg, end):
+ return tab_completer(self.do_kickstart_list('', True), text)
+
+def do_kickstart_clone(self, args):
+ options = [ Option('-n', '--name', action='store'),
+ Option('-c', '--clonename', action='store') ]
+
+ (args, options) = parse_arguments(args, options)
+
+ if is_interactive(options):
+ profiles = self.do_kickstart_list('', True)
+ print
+ print 'Kickstart Profiles'
+ print '------------------'
+ print '\n'.join(sorted(profiles))
+ print
+
+ options.name = prompt_user('Origianl Profile:', noblank = True)
+
+ options.clonename = prompt_user('Cloned Profile:', noblank = True)
+ else:
+
+ if not options.name:
+ logging.error('The Kickstart name is required')
+ return
+
+ if not options.clonename:
+ logging.error('The Kickstart clone name is required')
+ return
+
+ self.client.kickstart.cloneProfile(self.session,
+ options.name,
+ options.clonename)
+
# vim:ts=4:expandtab:
13 years, 1 month
Changes to 'refs/tags/spacewalk-proxy-1.5.1-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-1.5.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-04-18 15:48 +0000
Tagging package [spacewalk-proxy] version [1.5.1-1] in directory [proxy/proxy/].
Changes since spacewalk-proxy-installer-1.5.1-1:
Miroslav Suchý (2):
697447 - pass /rpc/* through broker
Automatic commit of package [spacewalk-proxy] release [1.5.1-1].
---
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 11 +++++++++++
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 17 insertions(+), 2 deletions(-)
---
13 years, 1 month
proxy/proxy rel-eng/packages
by Miroslav Suchý
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 605c4e2d9924a944ce99d037075e863f7d692431
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 18 17:48:54 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.1-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index afb6c9a..0194db9 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,10 @@ fi
%changelog
+* Mon Apr 18 2011 Miroslav Suchý 1.5.1-1
+- 697447 - pass /rpc/* through broker
+- Bumping package versions for 1.5
+
* Thu Jan 20 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.11-1
- updating Copyright years for year 2011 (tlestach(a)redhat.com)
- remove redundant comment (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index ca24023..0cd73c6 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.3.11-1 proxy/proxy/
+1.5.1-1 proxy/proxy/
13 years, 1 month
proxy/proxy
by Miroslav Suchý
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 11 +++++++++++
1 file changed, 11 insertions(+)
New commits:
commit faafe8569387b70f7121c4cc950487fab61aa14c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 18 17:35:42 2011 +0200
697447 - pass /rpc/* through broker
this was missed during migration from mod_python to mod_wsgi
in mod_wsgi everything is passed to python-program handler
this is discouraged under mod_wsgi. We rather should enumerate it.
diff --git a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
index bf8cebb..c84d7ef 100644
--- a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
+++ b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
@@ -9,7 +9,18 @@ WSGIPythonPath "/usr/share/rhn"
</LocationMatch>
# Spacewalk proxy broker
+# RPC STUFF
WSGIScriptAlias /XMLRPC /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /rpc /usr/share/rhn/wsgi/xmlrpc.py
+# WebUI of rhnParent, can be safely disabled if you do not want to browse
+# Spacewalk WebUI
+WSGIScriptAlias /css /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /img /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /help /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /rhn /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /javascript /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /network /usr/share/rhn/wsgi/xmlrpc.py
+
# Spacewalk proxy redirect
WSGIScriptAlias /XMLRPC_REDIRECT /usr/share/rhn/wsgi/xmlrpc_redirect.py
13 years, 1 month
Changes to 'refs/tags/spacewalk-proxy-installer-1.5.1-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-installer-1.5.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-04-18 13:18 +0000
Tagging package [spacewalk-proxy-installer] version [1.5.1-1] in directory [proxy/installer/].
Changes since spacewalk-java-1.5.6-1:
Miroslav Suchý (2):
696918 - honor hostedWhitelist during Proxy installation
Automatic commit of package [spacewalk-proxy-installer] release [1.5.1-1].
---
proxy/installer/configure-proxy.sh | 12 ++++++++++--
proxy/installer/spacewalk-proxy-installer.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
---
13 years, 1 month
2 commits - proxy/installer rel-eng/packages
by Miroslav Suchý
proxy/installer/configure-proxy.sh | 12 ++++++++++--
proxy/installer/spacewalk-proxy-installer.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 8f9fe0ab8753780b096ab9b92391538a259a3dfa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 18 15:18:02 2011 +0200
Automatic commit of package [spacewalk-proxy-installer] release [1.5.1-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index 392399d..6b25fc5 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.0
+Version: 1.5.1
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
+* Mon Apr 18 2011 Miroslav Suchý 1.5.1-1
+- 696918 - honor hostedWhitelist during Proxy installation
+- Bumping package versions for 1.5
+
* Thu Jan 20 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.5-1
- updating Copyright years for year 2011 (tlestach(a)redhat.com)
- remove redundant comment (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer
index 6385a10..f0e11bc 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.3.5-1 proxy/installer/
+1.5.1-1 proxy/installer/
commit de98703f52a023577d85b77a8f38a336c064b668
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 18 15:02:14 2011 +0200
696918 - honor hostedWhitelist during Proxy installation
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index 8c1ed52..b78ac52 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -167,6 +167,13 @@ config_error () {
fi
}
+# Return 0 if rhnParent is Hosted. Otherwise return 1.
+is_hosted () {
+ [ "$1" = "xmlrpc.rhn.redhat.com" -o \
+ $( PYTHONPATH='/usr/share/rhn' python -c "from up2date_client import config; cfg = config.initUp2dateConfig(); print '$1' in cfg['hostedWhitelist']" ) = "True" ]
+ return $?
+}
+
#do we have yum or up2date?
YUM_OR_UPDATE="up2date -i"
UPGRADE="up2date -u"
@@ -216,7 +223,8 @@ fi
default_or_input "CA Chain" CA_CHAIN $(awk -F'[=;]' '/sslCACert=/ {a=$2} END { print a}' $SYSCONFIG_DIR/up2date)
if [ 0$FORCE_OWN_CA -eq 0 ] && \
- [ "$RHN_PARENT" != "xmlrpc.rhn.redhat.com" -a ! -f /root/ssl-build/RHN-ORG-PRIVATE-SSL-KEY ] && \
+ ! is_hosted "$RHN_PARENT" && \
+ [ ! -f /root/ssl-build/RHN-ORG-PRIVATE-SSL-KEY ] && \
! diff $CA_CHAIN /root/ssl-build/RHN-ORG-TRUSTED-SSL-KEY &>/dev/null; then
cat <<CA_KEYS
Please do copy your CA key and public certificate from $RHN_PARENT to
@@ -302,7 +310,7 @@ if [ $? -ne 0 ]; then
fi
$UPGRADE
-if [ "$RHN_PARENT" == "xmlrpc.rhn.redhat.com" ]; then
+if is_hosted "$RHN_PARENT"; then
#skip monitoring part for hosted
MONITORING=1
ENABLE_SCOUT=0
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.5.6-1'
by Michael Mraka
Tag 'spacewalk-java-1.5.6-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-04-18 13:03 +0000
Tagging package [spacewalk-java] version [1.5.6-1] in directory [java/].
Changes since spacewalk-schema-1.5.3-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-java] release [1.5.6-1].
---
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
13 years, 1 month
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 17093045c945388a36f6038e3b5d4de6b301dfa7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Apr 18 15:03:49 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.6-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c27dc62..3bd89bb 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.5
+Version: 1.5.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Apr 18 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.6-1
+- postgresql can't order by column alias (PG)
+- don't convert ids to strings
+- fixing ErrataSearchActionTest.testExecute test
+- fixing EditActionTest.testUpdateErrata test
+
* Fri Apr 15 2011 Jan Pazdziora 1.5.5-1
- generate weak-deps into primary.xml (mc(a)suse.de)
- A bunch of fixes in pt_BR translation. (mmello(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 35e2e02..9379486 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.5-1 java/
+1.5.6-1 java/
13 years, 1 month