branding/css
by Tomáš Kašpárek
branding/css/rhn-docs.css | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
New commits:
commit e3a708cf927b790dbdaf5e1abb3f25874ad5cd1c
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 10:45:59 2013 +0200
fix of some css errors
diff --git a/branding/css/rhn-docs.css b/branding/css/rhn-docs.css
index fcc06a1..45d4ffc 100644
--- a/branding/css/rhn-docs.css
+++ b/branding/css/rhn-docs.css
@@ -51,11 +51,11 @@ pre code em, pre code span, pre code code { display: inline; }
.tip .guibutton, .tip .keycap, .tip .guilabel,
.important .guibutton, .important .keycap,
.caution .guibutton, .caution .keycap, .caution .guilabel,
-.warning .guibutton, .warning .keycap,{
+.warning .guibutton, .warning .keycap {
color: white;
}
-div.note .guilabel, div.important .guilabel, div.warning .guilabel {
+div.note .guilabel, div.important .guilabel, div.warning, .guilabel {
color:#e3dcc0;
}
@@ -125,7 +125,6 @@ dt a{font-weight: normal;}
.screen{background-color:#ede7c8;color:#333;padding:.5em 1em;margin:0em;border-radius: 8px;}
pre,code,.guibutton,.keycap,.guilabel{font-size:0.9em;font-family:"liberation mono", "Bitstream vera mono",monospace;}
.guibutton,.keycap,.guilabel{font-weight:bold;/*white-space:nowrap;*/color:#444;font-family:"liberation sans", "Bitstream vera sans", "dejavu sans", sans-serif;}
-.guibutton,.guilabel{}
.keycap{padding: .1em .4em;}
.example {background-color:#c8c5ac; padding:5px; margin-bottom:10px;}
@@ -303,11 +302,11 @@ span.book{margin-top:4em;display:block;}
span.chapter{display:block;margin-top:0.5em;}
/*Breadcrumbs*/
-#breadcrumbs ul li.first:before{content:" ";}
+#breadcrumbs ul li.first:before {content: " ";}
#breadcrumbs{color:#900;padding:3px;margin-bottom:25px;}
#breadcrumbs ul{margin-left:0;padding-left:0;display:inline;border:none;}
#breadcrumbs ul li{margin-left:0;padding-left:2px;border:none;list-style:none;display:inline;}
-#breadcrumbs ul li:before{content:"\0020 \0020 \0020 \00BB \0020";color:#333;}
+#breadcrumbs ul li:before{content: "\0020 \0020 \0020 \00BB \0020";color:#333;}
/*status*/
.alpha1{background: white url(../images/watermark-alpha1.png) top left repeat;}
@@ -324,7 +323,7 @@ span.chapter{display:block;margin-top:0.5em;}
.glossary dt,.index dt{font-size:.9em;color:#444;padding-top:.5em;}
.glossary dl dl dt,
.index dl dl dt{font-size:.85em;color:#777;line-height:1.2em;font-weight:normal;padding-top:0em;}
-.index dl dl dt:before{content:"- ";color:#ccc;}
+.index dl dl dt:before{content: "- ";color:#ccc;}
/*changes*/
.footnotes{}
@@ -361,7 +360,7 @@ div.note .keycap,
div.tip .keycap,
div.important .keycap,
div.caution .keycap,
-div.warning .keycap,
+div.warning .keycap
{color:white;}
div.abstract{font-size:larger;}
10 years, 10 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 63a8f286ff671908440b21473a3112fdd534474f
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 09:54:49 2013 +0200
687903 - fix of api doc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 58a4cb7..13d0414 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1028,7 +1028,8 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #param_desc("string", "name", "Package name.")
* @xmlrpc.param #param_desc("string", "version","Package version.")
* @xmlrpc.param #param_desc("string", "release", "Package release.")
- * @xmlrpc.returntype #return_int_success()
+ * @xmlrpc.returntype 1 if package exists, 0 if not, exception is thrown
+ * if an error occurs
*/
public int isNvreInstalled(String sessionKey, Integer sid, String name,
String version, String release) throws FaultException {
@@ -1055,7 +1056,8 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #param_desc("string", "version", "Package version.")
* @xmlrpc.param #param_desc("string", "release", "Package release.")
* @xmlrpc.param #param_desc("string", "epoch", "Package epoch.")
- * @xmlrpc.returntype #return_int_success()
+ * @xmlrpc.returntype 1 if package exists, 0 if not, exception is thrown
+ * if an error occurs
*/
public int isNvreInstalled(String sessionKey, Integer sid, String name,
String version, String release, String epoch) throws FaultException {
10 years, 10 months
java/code
by Jan Dobes
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 23583fe5c7b5b59285f2f6f4f98f2b9159b5ab93
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jun 25 08:57:23 2013 +0200
976371 - don't offer channels which system can't subscribe to
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index f6249e6..325eaf0 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -1995,7 +1995,10 @@ public class ChannelManager extends BaseManager {
channelDtos.addAll(listCustomBaseChannelsForServer(s));
for (DistChannelMap dcm : ChannelFactory.listCompatibleDcmByServerInNullOrg(s)) {
+ if (SystemManager.canServerSubscribeToChannel(
+ usr.getOrg(), s, dcm.getChannel())) {
channelDtos.add(new EssentialChannelDto(dcm.getChannel()));
+ }
}
return channelDtos;
10 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.10.103-1'
by Jan Dobes
Tag 'spacewalk-java-1.10.103-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-06-24 19:39 +0000
Tagging package [spacewalk-java] version [1.10.103-1] in directory [java/].
Changes since spacewalk-setup-postgresql-1.10.5-1:
Jan Dobes (5):
976722 - adding eng resources
976722 - creating exception for script name
976722 - kickstart script name is required
correcting ProfileHandlerTest to changed API
Automatic commit of package [spacewalk-java] release [1.10.103-1].
---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3
java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidScriptNameException.java | 45 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 23 ++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 8 -
java/spacewalk-java.spec | 8 +
rel-eng/packages/spacewalk-java | 2
6 files changed, 78 insertions(+), 11 deletions(-)
---
10 years, 10 months
5 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Dobes
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3
java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidScriptNameException.java | 45 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 23 ++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 8 -
java/spacewalk-java.spec | 8 +
rel-eng/packages/spacewalk-java | 2
6 files changed, 78 insertions(+), 11 deletions(-)
New commits:
commit 337123745a4241b5aa4ec0fbfbe97b936652892f
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Jun 24 21:39:03 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.103-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6129b52..773e878 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.102
+Version: 1.10.103
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jun 24 2013 Jan Dobes 1.10.103-1
+- correcting ProfileHandlerTest to changed API
+- 976722 - kickstart script name is required
+- 976722 - creating exception for script name
+- 976722 - adding eng resources
+
* Mon Jun 24 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.102-1
- 855845 - escaping system name for message.syncpackages message
- 855845 - escaping system name for
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e59b546..499fcf3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.102-1 java/
+1.10.103-1 java/
commit cd1257e92e8e329e7dd78d28c8a747cc04a3da4a
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Jun 24 21:25:42 2013 +0200
correcting ProfileHandlerTest to changed API
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
index df53dd2..bda9ff8 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
@@ -155,8 +155,8 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
public void testListScript() throws Exception {
KickstartData ks = KickstartDataTest.createKickstartWithChannel(admin.getOrg());
- int id = handler.addScript(adminKey, ks.getLabel(), "This is a script", "",
- "post", true);
+ int id = handler.addScript(adminKey, ks.getLabel(), "sample",
+ "This is a script", "", "post", true);
ks = (KickstartData) HibernateFactory.reload(ks);
boolean found = false;
@@ -171,8 +171,8 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
public void testAddScript() throws Exception {
KickstartData ks = KickstartDataTest.createKickstartWithChannel(admin.getOrg());
- int id = handler.addScript(adminKey, ks.getLabel(), "This is a script", "",
- "post", true);
+ int id = handler.addScript(adminKey, ks.getLabel(), "sample",
+ "This is a script", "", "post", true);
ks = (KickstartData) HibernateFactory.reload(ks);
boolean found = false;
for (KickstartScript script : ks.getScripts()) {
commit e02e31a0588b144a752f468494bd120fef841318
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Jun 24 20:42:58 2013 +0200
976722 - kickstart script name is required
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 7ea035f..c45e547 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -40,6 +40,7 @@ import com.redhat.rhn.frontend.dto.kickstart.KickstartOptionValue;
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelLabelException;
import com.redhat.rhn.frontend.xmlrpc.InvalidKickstartScriptException;
+import com.redhat.rhn.frontend.xmlrpc.InvalidScriptNameException;
import com.redhat.rhn.frontend.xmlrpc.InvalidScriptTypeException;
import com.redhat.rhn.frontend.xmlrpc.IpRangeConflictException;
import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
@@ -58,6 +59,7 @@ import com.redhat.rhn.manager.kickstart.KickstartManager;
import com.redhat.rhn.manager.kickstart.KickstartOptionsCommand;
import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.StringUtils;
import org.cobbler.Profile;
import java.util.ArrayList;
@@ -412,6 +414,7 @@ public class ProfileHandler extends BaseHandler {
* Add a script to a kickstart profile
* @param sessionKey key
* @param ksLabel the kickstart label
+ * @param name name of the script
* @param contents the contents
* @param interpreter the script interpreter to use
* @param type "pre" or "post"
@@ -422,6 +425,7 @@ public class ProfileHandler extends BaseHandler {
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "ksLabel", "The kickstart label to
* add the script to.")
+ * @xmlrpc.param #param_desc("string", "name", "The kickstart script name.")
* @xmlrpc.param #param_desc("string", "contents", "The full script to
* add.")
* @xmlrpc.param #param_desc("string", "interpreter", "The path to the
@@ -434,9 +438,9 @@ public class ProfileHandler extends BaseHandler {
* @xmlrpc.returntype int id - the id of the added script
*
*/
- public int addScript(String sessionKey, String ksLabel, String contents,
+ public int addScript(String sessionKey, String ksLabel, String name, String contents,
String interpreter, String type, boolean chroot) {
- return addScript(sessionKey, ksLabel, contents, interpreter, type,
+ return addScript(sessionKey, ksLabel, name, contents, interpreter, type,
chroot, false);
}
@@ -444,6 +448,7 @@ public class ProfileHandler extends BaseHandler {
* Add a script to a kickstart profile
* @param sessionKey key
* @param ksLabel the kickstart label
+ * @param name name of the script
* @param contents the contents
* @param interpreter the script interpreter to use
* @param type "pre" or "post"
@@ -455,6 +460,7 @@ public class ProfileHandler extends BaseHandler {
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "ksLabel", "The kickstart label to
* add the script to.")
+ * @xmlrpc.param #param_desc("string", "name", "The kickstart script name.")
* @xmlrpc.param #param_desc("string", "contents", "The full script to
* add.")
* @xmlrpc.param #param_desc("string", "interpreter", "The path to the
@@ -468,9 +474,9 @@ public class ProfileHandler extends BaseHandler {
* @xmlrpc.returntype int id - the id of the added script
*
*/
- public int addScript(String sessionKey, String ksLabel, String contents,
+ public int addScript(String sessionKey, String ksLabel, String name, String contents,
String interpreter, String type, boolean chroot, boolean template) {
- return addScript(sessionKey, ksLabel, contents, interpreter, type, chroot,
+ return addScript(sessionKey, ksLabel, name, contents, interpreter, type, chroot,
template, false);
}
@@ -478,6 +484,7 @@ public class ProfileHandler extends BaseHandler {
* Add a script to a kickstart profile
* @param sessionKey key
* @param ksLabel the kickstart label
+ * @param name name of the script
* @param contents the contents
* @param interpreter the script interpreter to use
* @param type "pre" or "post"
@@ -490,6 +497,7 @@ public class ProfileHandler extends BaseHandler {
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "ksLabel", "The kickstart label to
* add the script to.")
+ * @xmlrpc.param #param_desc("string", "name", "The kickstart script name.")
* @xmlrpc.param #param_desc("string", "contents", "The full script to
* add.")
* @xmlrpc.param #param_desc("string", "interpreter", "The path to the
@@ -505,7 +513,7 @@ public class ProfileHandler extends BaseHandler {
* @xmlrpc.returntype int id - the id of the added script
*
*/
- public int addScript(String sessionKey, String ksLabel, String contents,
+ public int addScript(String sessionKey, String ksLabel, String name, String contents,
String interpreter, String type, boolean chroot, boolean template,
boolean erroronfail) {
User loggedInUser = getLoggedInUser(sessionKey);
@@ -516,7 +524,12 @@ public class ProfileHandler extends BaseHandler {
throw new InvalidScriptTypeException();
}
+ if (StringUtils.isBlank(name)) {
+ throw new InvalidScriptNameException();
+ }
+
KickstartScript script = new KickstartScript();
+ script.setScriptName(name);
script.setData(contents.getBytes());
script.setInterpreter(interpreter.equals("") ? null : interpreter);
script.setScriptType(type);
commit c3cb9fc1cbbec652f326ad2e5842c65f48eb25f2
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Jun 24 21:00:47 2013 +0200
976722 - creating exception for script name
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidScriptNameException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidScriptNameException.java
new file mode 100755
index 0000000..099cf88
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidScriptNameException.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2009--2013 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.xmlrpc;
+
+import com.redhat.rhn.FaultException;
+import com.redhat.rhn.common.localization.LocalizationService;
+
+
+/**
+ * InvalidScriptNameException
+ * @version $Rev$
+ */
+public class InvalidScriptNameException extends FaultException {
+
+ /**
+ * Constructor
+ */
+ public InvalidScriptNameException() {
+ super(2762, "invalidScriptName", LocalizationService.getInstance().
+ getMessage("api.kickstart.invalidscriptname"));
+ }
+
+ /**
+ * Constructor
+ * @param cause the cause (which is saved for later retrieval by the
+ * Throwable.getCause() method). (A null value is permitted, and indicates
+ * that the cause is nonexistent or unknown.)
+ */
+ public InvalidScriptNameException(Throwable cause) {
+ super(2762, "invalidScriptName", LocalizationService.getInstance().
+ getMessage("api.kickstart.invalidscriptname"), cause);
+ }
+}
commit 5fe492d4dbf23b366665035f8b139f25dee66615
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Jun 24 21:05:17 2013 +0200
976722 - adding eng resources
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 508f225..e7b4566 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7344,6 +7344,9 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="api.kickstart.invalidscripttype">
<source>Only script types of "pre" and "post" are allowed for kickstarts.</source>
</trans-unit>
+ <trans-unit id="api.kickstart.invalidscriptname">
+ <source>Script Name is required.</source>
+ </trans-unit>
<trans-unit id="api.kickstart.invalidscript">
<source>You have specified an invalid kickstart script.</source>
</trans-unit>
10 years, 10 months
Changes to 'refs/tags/spacewalk-setup-postgresql-1.10.5-1'
by Milan Zazrivec
Tag 'spacewalk-setup-postgresql-1.10.5-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-06-24 15:02 +0000
Tagging package [spacewalk-setup-postgresql] version [1.10.5-1] in directory [spacewalk/spacewalk-setup-postgresql/].
Changes since spacewalk-reports-1.10.11-1:
Milan Zazrivec (2):
spacewalk-setup-postgresql: don't try to configure PG port
Automatic commit of package [spacewalk-setup-postgresql] release [1.10.5-1].
---
rel-eng/packages/spacewalk-setup-postgresql | 2 -
spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql | 18 ++--------
spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec | 7 +++
3 files changed, 11 insertions(+), 16 deletions(-)
---
10 years, 10 months
rel-eng/packages spacewalk/spacewalk-setup-postgresql
by Milan Zazrivec
rel-eng/packages/spacewalk-setup-postgresql | 2 +-
spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit b3597bd855260ee8949a8908ebe4d385c4c64d0e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 24 17:02:00 2013 +0200
Automatic commit of package [spacewalk-setup-postgresql] release [1.10.5-1].
diff --git a/rel-eng/packages/spacewalk-setup-postgresql b/rel-eng/packages/spacewalk-setup-postgresql
index 49bd572..08977ff 100644
--- a/rel-eng/packages/spacewalk-setup-postgresql
+++ b/rel-eng/packages/spacewalk-setup-postgresql
@@ -1 +1 @@
-1.10.4-1 spacewalk/spacewalk-setup-postgresql/
+1.10.5-1 spacewalk/spacewalk-setup-postgresql/
diff --git a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
index 3f86bc0..08b0302 100644
--- a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
+++ b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-postgresql
-Version: 1.10.4
+Version: 1.10.5
Release: 1%{?dist}
Summary: Tools to setup embedded PostgreSQL database for Spacewalk
Group: Applications/System
@@ -48,6 +48,11 @@ rm -rf %{buildroot}
%{_datadir}/spacewalk/setup/defaults.d/*
%changelog
+* Mon Jun 24 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.5-1
+- spacewalk-setup-postgresql: don't try to configure PG port
+- re-configure postgresql when re-running the setup utility
+- discard error output from createuser
+
* Fri Jun 07 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.4-1
- Fixes for managed-db configuration
10 years, 10 months
spacewalk/spacewalk-setup-postgresql
by Milan Zazrivec
spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql | 18 ++--------
1 file changed, 4 insertions(+), 14 deletions(-)
New commits:
commit 9e9a53bc91697b55bf41a194c9fb485191a76cd5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 24 16:45:57 2013 +0200
spacewalk-setup-postgresql: don't try to configure PG port
Setting the port in postgresql.conf won't work. Instead, you
need to modify PGPORT in /etc/sysconfig/pgsql/postgresql and
modify SELinux (semanage) accordingly.
Setting up custom PG port with spacewalk-setup-postgresql will
not be supported, this needs to be deliberate and manual action.
diff --git a/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql b/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
index 1a99064..05a2b78 100755
--- a/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
+++ b/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
@@ -2,7 +2,7 @@
set -e
-OPTS=$(getopt --longoptions=db:,user:,password:,standalone,address:,port:,remote: -n ${0##*/} -- d:u:p:sa:t:r: "$@")
+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
@@ -13,7 +13,6 @@ PGUSER=""
PGPASSWORD=""
STANDALONE=false
ADDRESS=""
-PORT=""
REMOTE=""
while true ; do
@@ -37,10 +36,6 @@ while true ; do
ADDRESS=$2
shift
;;
- -t|--port)
- PORT=$2
- shift
- ;;
-r|--remote)
REMOTE=$2
shift
@@ -57,10 +52,6 @@ while true ; do
shift
done
-if [ -z $PORT ] || ! $STANDALONE; then
- PORT=5432
-fi
-
help() {
echo "Usage: $(basename $0) create [options]" >&2
echo " $(basename $0) remove [options]" >&2
@@ -73,7 +64,6 @@ help() {
echo " --standalone Configure the database server to be remotely accessible"
echo " --address <local-addresses> Comma-separated list of local addresses to listen on"
echo " Use '*' for all addresses"
- echo " --port <local-port> Local port to listen on."
echo " --remote <remote-addresses> Comma-separated list of remote addresses to allow connections from"
echo ""
echo "Options for the 'remove' command:"
@@ -96,6 +86,7 @@ ask() {
PG_DATA=/var/lib/pgsql/data
PG_HBA="$PG_DATA/pg_hba.conf"
POSTGRESQL="$PG_DATA/postgresql.conf"
+PORT=5432
PG_PIDFILE="/var/run/postmaster.$PORT.pid"
PG_SOCKET="/tmp/.s.PGSQL.$PORT"
SPACEWALK_TARGET="/usr/lib/systemd/system/spacewalk.target"
@@ -120,7 +111,7 @@ create() {
fi
if $STANDALONE; then
- sed -i 's/^\(\s*listen_addresses.*\|\s*port.*\)$/### next line has been commented out by spacewalk-setup-postgresql ###\n##\1/' $POSTGRESQL
+ sed -i 's/^\(\s*listen_addresses.*\)$/### next line has been commented out by spacewalk-setup-postgresql ###\n##\1/' $POSTGRESQL
fi
# see bug 821446, we enable timestamps in logs by default
@@ -144,7 +135,6 @@ EOF
cat >> $POSTGRESQL <<EOF
### spacewalk-setup-postgresql modified values for a standalone PostgreSQL database
listen_addresses='$ADDRESS'
-port=$PORT
EOF
fi
@@ -182,7 +172,7 @@ db_user = $PGUSER
db_password = $PGPASSWORD
db_name = $PGNAME
db_host = localhost
-db_port = $PORT
+db_port =
EOF
chmod 640 $RHN_CONF
10 years, 10 months
Changes to 'refs/tags/spacewalk-reports-1.10.11-1'
by Tomáš Kašpárek
Tag 'spacewalk-reports-1.10.11-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-24 14:51 +0000
Tagging package [spacewalk-reports] version [1.10.11-1] in directory [reporting/].
Changes since spacewalk-java-1.10.102-1:
Milan Zazrivec (1):
re-configure postgresql when re-running the setup utility
Tomas Kasparek (2):
972759 - add support for sql like predicates into spacewalk-report
Automatic commit of package [spacewalk-reports] release [1.10.11-1].
---
rel-eng/packages/spacewalk-reports | 2
reporting/spacewalk-report | 28 ++++-
reporting/spacewalk-report.sgml | 13 ++
reporting/spacewalk-reports.spec | 5
spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql | 55 +++++-----
5 files changed, 68 insertions(+), 35 deletions(-)
---
10 years, 10 months
rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ac656db80be0239d2bbfc1b317300564659475e7
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jun 24 16:51:32 2013 +0200
Automatic commit of package [spacewalk-reports] release [1.10.11-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index bbe0027..d7b994c 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.10.10-1 reporting/
+1.10.11-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index c224759..66e1c46 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 1.10.10
+Version: 1.10.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Mon Jun 24 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.11-1
+- 972759 - add support for sql like predicates into spacewalk-report
+
* Tue Jun 11 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.10-1
- 963754 - inventory report should now display correct number of errata
10 years, 10 months