backend/server
by Milan Zazrivec
backend/server/rhnSQL/driver_postgresql.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 0243928ac2eedd5bb7eb84097231834388a4abd9
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 25 13:15:03 2013 +0200
support numerals only for db-name, db-user and db-password
Numeric only DB credentials are parsed from rhn.conf as integers.
diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py
index 525fd88..8d3fdf7 100644
--- a/backend/server/rhnSQL/driver_postgresql.py
+++ b/backend/server/rhnSQL/driver_postgresql.py
@@ -159,11 +159,11 @@ class Database(sql_base.Database):
def connect(self, reconnect=1):
try:
if self.host is None:
- self.dbh = psycopg2.connect(database=self.database, user=self.username,
- password=self.password)
+ self.dbh = psycopg2.connect(database=str(self.database), user=str(self.username),
+ password=str(self.password))
else:
- self.dbh = psycopg2.connect(database=self.database, user=self.username,
- password=self.password, host=self.host, port=self.port)
+ self.dbh = psycopg2.connect(database=str(self.database), user=str(self.username),
+ password=str(self.password), host=self.host, port=self.port)
# convert all DECIMAL types to float (let Python to choose one)
DEC2INTFLOAT = psycopg2.extensions.new_type(psycopg2._psycopg.DECIMAL.values,
'DEC2INTFLOAT', decimal2intfloat)
10 years, 10 months
java/code
by Tomáš Kašpárek
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf | 9 +++++++++
java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 760cd992eb77abfb7f8ffbd4a72c30581c42e177
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 12:56:26 2013 +0200
973310 - adding last checkin field to Inactive systems
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
index e39f9ba..0fad026 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
@@ -141,6 +141,15 @@
headerkey="systemlist.jsp.last_checked_in"/>
</c:if>
+
+ <c:if test = "${not empty showLastCheckinSort}">
+ <rl:column sortable="true"
+ attr="lastCheckin"
+ bound="true"
+ headerkey="systemlist.jsp.last_checked_in"/>
+
+ </c:if>
+
<!-- Base Channel Column -->
<rl:column sortable="false"
bound="false"
diff --git a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
index 2a2371b..33774c9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
@@ -14,7 +14,7 @@
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact">
<bean:message key="inactivelist.jsp.header"/>
</rhn:toolbar>
-
+<c:set var="showLastCheckinSort" value="true"/>
<rl:listset name="systemListSet" legend="system">
<rhn:csrf />
10 years, 10 months
spacewalk/spacewalk-setup-postgresql
by Milan Zazrivec
spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql | 104 +++++-----
1 file changed, 54 insertions(+), 50 deletions(-)
New commits:
commit 91b78d5fd89cf756755ef32a20955ea084cafcf1
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 25 12:47:08 2013 +0200
spacewalk-setup-postgresql: --help option
diff --git a/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql b/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
index 05a2b78..33f5ff2 100755
--- a/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
+++ b/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
@@ -2,56 +2,6 @@
set -e
-OPTS=$(getopt --longoptions=db:,user:,password:,standalone,address:,remote: -n ${0##*/} -- d:u:p:sa:r: "$@")
-
-if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
-
-eval set -- "$OPTS"
-
-PGNAME=""
-PGUSER=""
-PGPASSWORD=""
-STANDALONE=false
-ADDRESS=""
-REMOTE=""
-
-while true ; do
- case "$1" in
- -d|--db)
- PGNAME=$2
- shift
- ;;
- -u|--user)
- PGUSER=$2
- shift
- ;;
- -p|--password)
- PGPASSWORD=$2
- shift
- ;;
- -s|--standalone)
- STANDALONE=true
- ;;
- -a|--address)
- ADDRESS=$2
- shift
- ;;
- -r|--remote)
- REMOTE=$2
- shift
- ;;
- --)
- shift
- break
- ;;
- *)
- echo "Internal error [$1]!" >&2
- exit 1
- ;;
- esac
- shift
-done
-
help() {
echo "Usage: $(basename $0) create [options]" >&2
echo " $(basename $0) remove [options]" >&2
@@ -297,6 +247,60 @@ postgresql_service() {
fi
}
+OPTS=$(getopt --longoptions=db:,user:,password:,standalone,help,address:,remote: -n ${0##*/} -- d:u:p:sha:r: "$@")
+
+if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+eval set -- "$OPTS"
+
+PGNAME=""
+PGUSER=""
+PGPASSWORD=""
+STANDALONE=false
+ADDRESS=""
+REMOTE=""
+
+while true ; do
+ case "$1" in
+ -d|--db)
+ PGNAME=$2
+ shift
+ ;;
+ -u|--user)
+ PGUSER=$2
+ shift
+ ;;
+ -p|--password)
+ PGPASSWORD=$2
+ shift
+ ;;
+ -s|--standalone)
+ STANDALONE=true
+ ;;
+ -a|--address)
+ ADDRESS=$2
+ shift
+ ;;
+ -r|--remote)
+ REMOTE=$2
+ shift
+ ;;
+ -h|--help)
+ help;
+ exit 0;
+ ;;
+ --)
+ shift
+ break
+ ;;
+ *)
+ echo "Internal error [$1]!" >&2
+ exit 1
+ ;;
+ esac
+ shift
+done
+
case $1 in
create) create
;;
10 years, 10 months
Changes to 'refs/tags/spacewalk-proxy-1.10.7-1'
by Tomáš Kašpárek
Tag 'spacewalk-proxy-1.10.7-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-25 09:44 +0000
Tagging package [spacewalk-proxy] version [1.10.7-1] in directory [proxy/proxy/].
Changes since spacewalk-certs-tools-1.10.5-1:
Tomas Kasparek (1):
Automatic commit of package [spacewalk-proxy] release [1.10.7-1].
---
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 10 months
proxy/proxy rel-eng/packages
by Tomáš Kašpárek
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 0fcab7fce90e4e4f02b1fe67c7c73736c35510c3
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 11:44:28 2013 +0200
Automatic commit of package [spacewalk-proxy] release [1.10.7-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 91bc9d7..0a68049 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.10.6
+Version: 1.10.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -330,6 +330,9 @@ fi
%changelog
+* Tue Jun 25 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.7-1
+- minor branding cleanup
+
* Mon Jun 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.6-1
- removed old CVS/SVN version ids
- branding fixes in man pages
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 7de4f5b..ade3719 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.10.6-1 proxy/proxy/
+1.10.7-1 proxy/proxy/
10 years, 10 months
Changes to 'refs/tags/spacewalk-certs-tools-1.10.5-1'
by Tomáš Kašpárek
Tag 'spacewalk-certs-tools-1.10.5-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-25 09:42 +0000
Tagging package [spacewalk-certs-tools] version [1.10.5-1] in directory [spacewalk/certs-tools/].
Changes since spacewalk-branding-1.10.20-1:
Jan Dobes (1):
977301 - removing incorrect tag
Tomas Kasparek (2):
minor branding cleanup
Automatic commit of package [spacewalk-certs-tools] release [1.10.5-1].
---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp | 2 -
proxy/proxy/redirect/Makefile | 2 -
rel-eng/packages/spacewalk-certs-tools | 2 -
spacewalk/certs-tools/rhn_bootstrap.py | 14 +++++++---
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++-
6 files changed, 19 insertions(+), 8 deletions(-)
---
10 years, 10 months
2 commits - java/code proxy/proxy rel-eng/packages spacewalk/certs-tools
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 2 -
proxy/proxy/redirect/Makefile | 2 -
rel-eng/packages/spacewalk-certs-tools | 2 -
spacewalk/certs-tools/rhn_bootstrap.py | 14 +++++++---
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++-
5 files changed, 18 insertions(+), 7 deletions(-)
New commits:
commit b62f1de9861359f29a766efba288aa6d4ab065ed
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 11:42:49 2013 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.10.5-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 34199bf..8dd4ff0 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.10.4-1 spacewalk/certs-tools/
+1.10.5-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index fa8d7ea..3b7777b 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2
-Version: 1.10.4
+Version: 1.10.5
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Tue Jun 25 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.5-1
+- minor branding cleanup
+
* Mon Jun 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.4-1
- branding fixes in man pages
- more branding cleanup
commit 0b2d8cda61c89eaf85b4ffcd331d7bfdb232ff12
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 11:40:28 2013 +0200
minor branding cleanup
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index c863a36..0ca9933 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -10386,7 +10386,7 @@ administrator privileges.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/config/CertificateConfig.do</context>
</context-group>
- <target>Вы должны предоставить сертификат @@PRODUCT_NAME@@. Этот сертификат дает возможность доступа к службам RHN Satellite.</target>
+ <target>Вы должны предоставить сертификат @@PRODUCT_NAME@@. Этот сертификат дает возможность доступа к службам @@PRODUCT_NAME@@.</target>
</trans-unit>
<trans-unit id="certificate.jsp.header2">
<source>@@PRODUCT_NAME@@ Certificate</source>
diff --git a/proxy/proxy/redirect/Makefile b/proxy/proxy/redirect/Makefile
index c05ae5c..9472dc4 100644
--- a/proxy/proxy/redirect/Makefile
+++ b/proxy/proxy/redirect/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the apacheServer.py for RHN Proxy SSL Redirect Server.
+# Makefile for the apacheServer.py for Spacewalk Proxy SSL Redirect Server.
#
TOP = ..
diff --git a/spacewalk/certs-tools/rhn_bootstrap.py b/spacewalk/certs-tools/rhn_bootstrap.py
index 223cd62..d518afe 100644
--- a/spacewalk/certs-tools/rhn_bootstrap.py
+++ b/spacewalk/certs-tools/rhn_bootstrap.py
@@ -43,15 +43,23 @@ from rhn_bootstrap_strings import \
from sslToolConfig import CA_CRT_NAME, CA_CRT_RPM_NAME
from spacewalk.common.fileutils import rotateFile, cleanupAbsPath
from spacewalk.common.checksum import getFileChecksum
+from spacewalk.common.rhnConfig import CFG, initCFG
## GLOBALS
-PRODUCT_NAME = 'RHN Server'
+initCFG('web')
+PRODUCT_NAME = CFG.PRODUCT_NAME
if os.path.exists('/usr/share/rhn/proxy') \
or os.path.exists('/var/www/rhns/proxy'):
- PRODUCT_NAME = 'Red Hat Proxy Server'
+ if PRODUCT_NAME == 'Spacewalk':
+ PRODUCT_NAME = 'Spacewalk Proxy Server'
+ else:
+ PRODUCT_NAME = 'Red Hat Proxy Server'
elif os.path.exists('/usr/share/rhn/server') \
or os.path.exists('/var/www/rhns/server'):
- PRODUCT_NAME = 'RHN Satellite Server'
+ if PRODUCT_NAME == 'Spacewalk':
+ PRODUCT_NAME = 'Spacewalk Server'
+ else:
+ PRODUCT_NAME = 'Red Hat Satellite Server'
DEFAULT_CA_CERT_PATH = '/usr/share/rhn/'+CA_CRT_NAME
10 years, 10 months
java/code
by Jan Dobes
java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 80f24c2e97504665a5ee039e8864cceffc297b26
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jun 25 11:29:24 2013 +0200
977301 - removing incorrect tag
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp
index a280d0f..d226c0d 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp
@@ -28,7 +28,7 @@
<bean:message key="channel.jsp.package.menu.add"/>
</a>
</li>
-<rhn-require acl_mixins="RHN::Access::Channel" acl="not channel_packaging_type(sysv-solaris)">
+
<li>
<a href="/network/software/channels/manage/packages/compare/index.pxt?cid=${channel.id}">
<bean:message key="channel.jsp.package.menu.compare"/>
10 years, 10 months
Changes to 'refs/tags/spacewalk-branding-1.10.20-1'
by Tomáš Kašpárek
Tag 'spacewalk-branding-1.10.20-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-25 09:01 +0000
Tagging package [spacewalk-branding] version [1.10.20-1] in directory [branding/].
Changes since spacewalk-java-1.10.103-1:
Jan Dobes (1):
976371 - don't offer channels which system can't subscribe to
Tomas Kasparek (3):
687903 - fix of api doc
fix of some css errors
Automatic commit of package [spacewalk-branding] release [1.10.20-1].
---
branding/css/rhn-docs.css | 13 ++++------
branding/spacewalk-branding.spec | 5 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 6 +++-
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 3 ++
rel-eng/packages/spacewalk-branding | 2 -
5 files changed, 18 insertions(+), 11 deletions(-)
---
10 years, 10 months
branding/spacewalk-branding.spec rel-eng/packages
by Tomáš Kašpárek
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7cd2ecaa6ac4ba7b36d878e18975ac3c7a9b4a36
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 11:01:42 2013 +0200
Automatic commit of package [spacewalk-branding] release [1.10.20-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 681b003..12a107e 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -9,7 +9,7 @@
%endif
Name: spacewalk-branding
-Version: 1.10.19
+Version: 1.10.20
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Tue Jun 25 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.20-1
+- fix of some css errors
+
* Mon Jun 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.19-1
- rebranding few more strings
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index db35d86..0434baf 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-1.10.19-1 branding/
+1.10.20-1 branding/
10 years, 10 months