Changes to 'refs/tags/spacewalk-java-1.10.90-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.10.90-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-10 08:14 +0000
Tagging package [spacewalk-java] version [1.10.90-1] in directory [java/].
Changes since spacewalk-setup-postgresql-1.10.4-1:
Tomas Kasparek (3):
871276 - page for physical systems
software crashes menu should be visible only for management entitled orgs
Automatic commit of package [spacewalk-java] release [1.10.90-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 21 ++++++
java/code/src/com/redhat/rhn/frontend/action/systems/PhysicalSystemSetupAction.java | 35 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 +
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 +
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 15 ++++
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 3
java/code/webapp/WEB-INF/pages/systems/physicallist.jsp | 29 ++++++++
java/code/webapp/WEB-INF/struts-config.xml | 10 ++
java/spacewalk-java.spec | 6 +
rel-eng/packages/spacewalk-java | 2
10 files changed, 130 insertions(+), 3 deletions(-)
---
10 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 17752314bde467eabf37e2ea31a7f5fb70769edf
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jun 10 10:14:29 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.90-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ac6d3ba..ca2b02b 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.89
+Version: 1.10.90
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jun 10 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.90-1
+- software crashes menu should be visible only for management entitled orgs
+- 871276 - page for physical systems
+
* Mon Jun 03 2013 Jan Dobes 1.10.89-1
- checkstyle fix
- junit fixes
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f1829ac..81a8342 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.89-1 java/
+1.10.90-1 java/
10 years, 10 months
java/code
by Tomáš Kašpárek
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0a35f33af9536fdd055f1632bd0574ab21f18f84
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jun 10 10:13:04 2013 +0200
software crashes menu should be visible only for management entitled orgs
like we do on all the other pages - unifing with rest
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 222dc74..64cf570 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -116,7 +116,7 @@
<rhn-tab-url>/rhn/kickstart/cobbler/DefaultSnippetView.do</rhn-tab-url>
</rhn-tab>
</rhn-tab>
- <rhn-tab name="software.crashes" url="/rhn/systems/SoftwareCrashesOverview.do">
+ <rhn-tab name="software.crashes" acl="org_entitlement(sw_mgr_enterprise)" url="/rhn/systems/SoftwareCrashesOverview.do">
<rhn-tab-url>/rhn/systems/SoftwareCrashesOverview.do</rhn-tab-url>
<rhn-tab-url>/rhn/systems/SoftwareCrashUuidDetails.do</rhn-tab-url>
</rhn-tab>
10 years, 10 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 21 ++++++
java/code/src/com/redhat/rhn/frontend/action/systems/PhysicalSystemSetupAction.java | 35 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 +
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 +
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 15 ++++
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1
java/code/webapp/WEB-INF/pages/systems/physicallist.jsp | 29 ++++++++
java/code/webapp/WEB-INF/struts-config.xml | 10 ++
8 files changed, 123 insertions(+)
New commits:
commit 6b7c8d0ed76747ff83a069f3f7c08c61df764d3c
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jun 10 07:51:25 2013 +0200
871276 - page for physical systems
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 00ffb0e..99adb45 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -481,6 +481,16 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<elaborator name="is_virtual_host" />
</mode>
+<mode name="visible_to_user_physical_list" class="com.redhat.rhn.frontend.dto.SystemOverview">
+ <query name="available_to_user_physical_list" />
+ <elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
+ <elaborator name="system_monitoring" />
+ <elaborator name="entitlements"/>
+ <elaborator name="is_virtual_guest" />
+ <elaborator name="is_virtual_host" />
+</mode>
+
<mode name="system_currency" class="com.redhat.rhn.frontend.dto.SystemCurrency">
<query params="uid">
SELECT s1.id,
@@ -1193,6 +1203,17 @@ SELECT DISTINCT ST.element AS ID
WHERE USP.user_id = :user_id
</query>
+<query name="available_to_user_physical_list" params="user_id">
+ SELECT DISTINCT S.id,
+ S.name,
+ (SELECT 1
+ FROM rhnServerFeaturesView SFV
+ WHERE SFV.server_id = S.id
+ AND SFV.label = 'ftr_system_grouping') AS selectable
+ FROM rhnServer S inner join rhnUserServerPerms USP on S.id = USP.server_id
+ WHERE USP.user_id = :user_id
+ AND NOT EXISTS (SELECT DISTINCT virtual_system_id as vid FROM rhnVirtualInstance where S.id=virtual_system_id)
+</query>
<query name="available_to_user_with_errata" params="user_id">
SELECT DISTINCT S.id,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/PhysicalSystemSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/PhysicalSystemSetupAction.java
new file mode 100644
index 0000000..f83c605
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/PhysicalSystemSetupAction.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2009--2010 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.action.systems;
+
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.listview.PageControl;
+import com.redhat.rhn.manager.system.SystemManager;
+
+import org.apache.struts.action.ActionForm;
+
+/**
+ * PhysicalSystemSetupAction
+ * @version $Rev$
+ */
+public class PhysicalSystemSetupAction extends BaseSystemsAction {
+
+ protected DataResult getDataResult(User user, PageControl pc, ActionForm formIn) {
+
+ return SystemManager.physicalList(user, pc);
+ }
+
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index f726f3a..a459254 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -4576,6 +4576,12 @@ value for this entitlement, excluding the default organization's consumption.</s
<context context-type="sourcefile">/rhn/systems/SystemList</context>
</context-group>
</trans-unit>
+ <trans-unit id="systemlist.jsp.physicalheader">
+ <source>Physical Systems</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/SystemList</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="systemlist.jsp.status">
<source>Updates</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
index 83ce8fe..53d965e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
@@ -87,6 +87,12 @@
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
</trans-unit>
+ <trans-unit id="Physical Systems">
+ <source>Physical Systems</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">Systems Navigation Menu</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="Duplicate Systems">
<source>Duplicate Systems</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 99d59bf..3df7720 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -427,6 +427,21 @@ public class SystemManager extends BaseManager {
}
/**
+ * Returns list of all physical systems visible to user.
+ * @param user Currently logged in user.
+ * @param pc PageControl
+ * @return list of SystemOverviews.
+ */
+ public static DataResult physicalList(User user, PageControl pc) {
+ SelectMode m = ModeFactory.getMode("System_queries",
+ "visible_to_user_physical_list");
+ Map params = new HashMap();
+ params.put("user_id", user.getId());
+ Map elabParams = new HashMap();
+ return makeDataResult(params, elabParams, pc, m);
+ }
+
+ /**
* Returns list of all systems and their errata type counts
* @param user Currently logged in user.
* @param pc PageControl
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 09e5c34..222dc74 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -39,6 +39,7 @@
<rhn-tab-directory>/rhn/systems/details</rhn-tab-directory>
<rhn-tab-directory>/network/systems/details</rhn-tab-directory>
<rhn-tab name="All" url="/rhn/systems/SystemList.do"/>
+ <rhn-tab name="Physical Systems" url="/rhn/systems/PhysicalList.do"/>
<rhn-tab name="Virtual Systems" url="/rhn/systems/VirtualSystemsList.do"/>
<rhn-tab name="Out of Date" url="/rhn/systems/OutOfDate.do"/>
<rhn-tab name="Requiring Reboot" url="/rhn/systems/RequiringReboot.do"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
new file mode 100644
index 0000000..ebf76a3
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
@@ -0,0 +1,29 @@
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+
+<html:xhtml/>
+<html>
+<head>
+ <meta name="page-decorator" content="none" />
+</head>
+<body>
+<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"
+ helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp">
+ <bean:message key="systemlist.jsp.physicalheader"/>
+</rhn:toolbar>
+
+
+
+
+<rl:listset name="systemListSet" legend="system">
+ <rhn:csrf />
+ <rhn:submitted />
+ <%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>
+</rl:listset>
+
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 61a305c..788c643 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -2678,6 +2678,16 @@
path="/WEB-INF/pages/systems/systemlist.jsp"/>
</action>
+ <action path="/systems/PhysicalList"
+ scope="request"
+ input="/WEB-INF/pages/systems/physicallist.jsp"
+ type="com.redhat.rhn.frontend.action.systems.PhysicalSystemSetupAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="postRequiredIfSubmitted" value="true" />
+ <forward name="default"
+ path="/WEB-INF/pages/systems/physicallist.jsp"/>
+ </action>
+
<action path="/systems/DuplicateIPList"
scope="request"
input="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"
10 years, 10 months
Changes to 'refs/tags/spacewalk-setup-postgresql-1.10.4-1'
by Milan Zazrivec
Tag 'spacewalk-setup-postgresql-1.10.4-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-06-07 14:31 +0000
Tagging package [spacewalk-setup-postgresql] version [1.10.4-1] in directory [spacewalk/spacewalk-setup-postgresql/].
Changes since spacewalk-setup-1.10.11-1:
Milan Zazrivec (2):
Fixes for managed-db configuration
Automatic commit of package [spacewalk-setup-postgresql] release [1.10.4-1].
---
rel-eng/packages/spacewalk-setup-postgresql | 2
spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql | 26 ++++++++--
spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec | 5 +
3 files changed, 28 insertions(+), 5 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 | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e88f3dd7f56f7e0fa07f9886152ba421c0b6c2ba
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 7 16:31:13 2013 +0200
Automatic commit of package [spacewalk-setup-postgresql] release [1.10.4-1].
diff --git a/rel-eng/packages/spacewalk-setup-postgresql b/rel-eng/packages/spacewalk-setup-postgresql
index 1624c59..49bd572 100644
--- a/rel-eng/packages/spacewalk-setup-postgresql
+++ b/rel-eng/packages/spacewalk-setup-postgresql
@@ -1 +1 @@
-1.10.3-1 spacewalk/spacewalk-setup-postgresql/
+1.10.4-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 6d29475..3f86bc0 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.3
+Version: 1.10.4
Release: 1%{?dist}
Summary: Tools to setup embedded PostgreSQL database for Spacewalk
Group: Applications/System
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
%{_datadir}/spacewalk/setup/defaults.d/*
%changelog
+* Fri Jun 07 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.4-1
+- Fixes for managed-db configuration
+
* Fri Jun 07 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.3-1
- Fix requires for RHEL-5
10 years, 10 months
spacewalk/spacewalk-setup-postgresql
by Milan Zazrivec
spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql | 26 ++++++++--
1 file changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 856aeef91d69e0389e936057b46f7bcd28851bb2
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 7 16:29:39 2013 +0200
Fixes for managed-db configuration
1. Create /etc/rhn/rhn.conf for a stand-alone setup
2. Correctly configure addresses for PostgreSQL server to listen on
diff --git a/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql b/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
index 920ec8c..df11bdb 100755
--- a/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
+++ b/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
@@ -100,6 +100,7 @@ PG_PIDFILE="/var/run/postmaster.$PORT.pid"
PG_SOCKET="/tmp/.s.PGSQL.$PORT"
SPACEWALK_TARGET="/usr/lib/systemd/system/spacewalk.target"
SERVICE_LIST="/etc/rhn/service-list"
+RHN_CONF="/etc/rhn/rhn.conf"
create() {
[ -z "$PGNAME" ] && ask true "Database name: " PGNAME
@@ -108,7 +109,7 @@ create() {
if $STANDALONE; then
[ -z "$ADDRESS" ] && ask true "Local addresses to listen on (comma-separated, RETURN for all): " ADDRESS
- [ -z "$ADDRESS" ] && ADDRESS="'*'"
+ [ -z "$ADDRESS" ] && ADDRESS="*"
[ -z "$REMOTE" ] && ask true "Remote addresses to allow connection from (CIDR format, comma-separated): " REMOTE
fi
@@ -135,13 +136,13 @@ max_connections = 600
shared_buffers = 384MB
wal_buffers = 4MB
work_mem = 2560kB
-$STANDALONE_SETUP
EOF
if $STANDALONE; then
+ echo "$ADDRESS"|grep -q '127.0.0.1\|*' || ADDRESS="$ADDRESS, 127.0.0.1"
cat >> $POSTGRESQL <<EOF
### spacewalk-setup-postgresql modified values for a standalone PostgreSQL database
-listen_addresses=$ADDRESS
+listen_addresses='$ADDRESS'
port=$PORT
EOF
fi
@@ -165,6 +166,25 @@ EOF
host $PGNAME $PGUSER $ADDR md5
EOF
done
+
+ # Create & configure /etc/rhn/rhn.conf
+ RHN_CONF_DIR=$(dirname $RHN_CONF)
+ if [ -d $RHN_CONF_DIR ]; then
+ chmod 0710 $RHN_CONF_DIR
+ else
+ mkdir -m 0710 $RHN_CONF_DIR
+ fi
+
+ cat > $RHN_CONF <<EOF
+db_backend = postgresql
+db_user = $PGUSER
+db_password = $PGPASSWORD
+db_name = $PGNAME
+db_host = localhost
+db_port = $PORT
+EOF
+ chmod 640 $RHN_CONF
+
fi
fi
10 years, 10 months
Changes to 'refs/tags/spacewalk-setup-1.10.11-1'
by Milan Zazrivec
Tag 'spacewalk-setup-1.10.11-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-06-07 12:42 +0000
Tagging package [spacewalk-setup] version [1.10.11-1] in directory [spacewalk/setup/].
Changes since spacewalk-setup-postgresql-1.10.3-1:
Milan Zazrivec (2):
is_embedded_db: support for manage-db switch
Automatic commit of package [spacewalk-setup] release [1.10.11-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 10 months
rel-eng/packages spacewalk/setup
by Milan Zazrivec
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e5f7c62f00cd2786fa2d4ffa7b6ec48140acd972
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 7 14:42:53 2013 +0200
Automatic commit of package [spacewalk-setup] release [1.10.11-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 918ab7a..67aa014 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.10.10-1 spacewalk/setup/
+1.10.11-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 3f914b0..7d3cd64 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 1.10.10
+Version: 1.10.11
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Fri Jun 07 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.11-1
+- is_embedded_db: support for manage-db switch
+
* Wed Jun 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.10-1
- spacewalk-setup: correctly recognize --managed-db switch
- modify spacewalk-setup to use spacewalk-setup-postgresql
10 years, 10 months
spacewalk/setup
by Milan Zazrivec
spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fe119306f91bafe8a5001c58ba6d2ab7f3e3b7bd
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 7 14:40:59 2013 +0200
is_embedded_db: support for manage-db switch
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 127c620..4b2946d 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -216,7 +216,7 @@ sub load_answer_file {
# Check if we're installing with an embedded database.
sub is_embedded_db {
my $opts = shift;
- return not defined($opts->{'external-db'});
+ return not (defined($opts->{'external-db'}) or defined($opts->{'managed-db'}));
}
# Return 1 in case setup should also migrate from embedded oracle -> embedded postgresql
10 years, 10 months