Hello community,
here is the log from the commit of package hawk2 for openSUSE:Factory checked
in at 2015-11-26 17:01:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hawk2 (Old)
and /work/SRC/openSUSE:Factory/.hawk2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/hawk2/hawk2.changes 2015-11-10
10:03:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hawk2.new/hawk2.changes 2015-11-26
17:01:24.000000000 +0100
@@ -1,0 +2,19 @@
+Thu Nov 19 14:08:17 UTC 2015 - kgronl...@suse.com
+
+- Update to version 1.0.1+git.1447941962.3d88e5f:
+ + Enable 404 page in production (bsc#953846)
+ + Location: Fix crash on empty create (bsc#953847)
+ + Status: Rename name column to ID (bsc#953158)
+ + Location: Add support for resource-discovery (bsc#952191)
+
+-------------------------------------------------------------------
+Tue Nov 17 12:40:19 UTC 2015 - kgronl...@suse.com
+
+- Disable rubygem bundling
+
+-------------------------------------------------------------------
+Mon Nov 16 17:02:17 UTC 2015 - kgronl...@suse.com
+
+- Clean up package description (bsc#952794)
+
+-------------------------------------------------------------------
Old:
----
hawk2-1.0.1+git.1447036244.df8e574.tar.bz2
New:
----
hawk2-1.0.1+git.1447941962.3d88e5f.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk2.spec ++++++
--- /var/tmp/diff_new_pack.6dWZMm/_old 2015-11-26 17:01:25.000000000 +0100
+++ /var/tmp/diff_new_pack.6dWZMm/_new 2015-11-26 17:01:25.000000000 +0100
@@ -28,9 +28,9 @@
%define pkg_group System Environment/Daemons
%endif
-%if 0%{?suse_version} && !0%{?is_opensuse}
-%define bundle_gems 1
-%endif
+# %%if 0%%{?suse_version} && !0%%{?is_opensuse}
+# %%define bundle_gems 1
+# %%endif
%define gname haclient
%define uname hacluster
@@ -39,7 +39,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 1.0.1+git.1447036244.df8e574
+Version: 1.0.1+git.1447941962.3d88e5f
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
@@ -143,8 +143,6 @@
A web-based GUI for managing and monitoring the Pacemaker
High-Availability cluster resource manager.
-Authors: Tim Serong <tser...@suse.com>
-
%prep
%setup
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.6dWZMm/_old 2015-11-26 17:01:25.000000000 +0100
+++ /var/tmp/diff_new_pack.6dWZMm/_new 2015-11-26 17:01:25.000000000 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/hawk.git</param>
- <param
name="changesrevision">df8e574c5992bf2703567c39a636d0f4ef953cee</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">3d88e5fd858a390d89c724c0e57e914f30ad74da</param></service></servicedata>
\ No newline at end of file
++++++ hawk2-1.0.1+git.1447036244.df8e574.tar.bz2 ->
hawk2-1.0.1+git.1447941962.3d88e5f.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk2-1.0.1+git.1447036244.df8e574/Makefile
new/hawk2-1.0.1+git.1447941962.3d88e5f/Makefile
--- old/hawk2-1.0.1+git.1447036244.df8e574/Makefile 2015-11-09
03:34:49.000000000 +0100
+++ new/hawk2-1.0.1+git.1447941962.3d88e5f/Makefile 2015-11-19
15:08:09.000000000 +0100
@@ -98,11 +98,11 @@
mkdir -p $(DESTDIR)$(WWW_BASE)/hawk/tmp/sockets
mkdir -p $(DESTDIR)$(WWW_BASE)/hawk/tmp/home
# Get rid of cruft from packed gems
- -find hawk/vendor -name '*bak' -o -name '*~' -o -name '#*#' | xargs rm
+ -find hawk/vendor -name '*bak' -o -name '*~' -o -name '#*#' -delete
cp -a hawk/* $(DESTDIR)$(WWW_BASE)/hawk
-cp -a hawk/.bundle $(DESTDIR)$(WWW_BASE)/hawk
- -chown -R hacluster.haclient $(DESTDIR)$(WWW_BASE)/hawk/log
- -chown -R hacluster.haclient $(DESTDIR)$(WWW_BASE)/hawk/tmp
+ -chown -R hacluster.haclient $(DESTDIR)$(WWW_BASE)/hawk/log || true
+ -chown -R hacluster.haclient $(DESTDIR)$(WWW_BASE)/hawk/tmp || true
-chmod g+w $(DESTDIR)$(WWW_BASE)/hawk/tmp/home
-chmod g+w $(DESTDIR)$(WWW_BASE)/hawk/tmp/explorer
ifeq ($(BUNDLE_GEMS),true)
@@ -113,11 +113,11 @@
tools/install:
install -D -m 4750 tools/hawk_chkpwd $(DESTDIR)/usr/sbin/hawk_chkpwd
- -chown root.haclient $(DESTDIR)/usr/sbin/hawk_chkpwd
+ -chown root.haclient $(DESTDIR)/usr/sbin/hawk_chkpwd || true
-chmod u+s $(DESTDIR)/usr/sbin/hawk_chkpwd
install -D -m 4750 tools/hawk_invoke $(DESTDIR)/usr/sbin/hawk_invoke
- -chown root.haclient $(DESTDIR)/usr/sbin/hawk_invoke
+ -chown root.haclient $(DESTDIR)/usr/sbin/hawk_invoke || true
-chmod u+s $(DESTDIR)/usr/sbin/hawk_invoke
install -D -m 0755 tools/hawk_monitor $(DESTDIR)/usr/sbin/hawk_monitor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447036244.df8e574/hawk/app/assets/javascripts/module/resources.js
new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/assets/javascripts/module/resources.js
---
old/hawk2-1.0.1+git.1447036244.df8e574/hawk/app/assets/javascripts/module/resources.js
2015-11-09 03:34:49.000000000 +0100
+++
new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/assets/javascripts/module/resources.js
2015-11-19 15:08:09.000000000 +0100
@@ -135,7 +135,7 @@
},
{
field: 'id',
- title: __('Name'),
+ title: __('ID'),
sortable: true,
switchable: false,
clickToSelect: true,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447036244.df8e574/hawk/app/helpers/location_helper.rb
new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/helpers/location_helper.rb
--- old/hawk2-1.0.1+git.1447036244.df8e574/hawk/app/helpers/location_helper.rb
2015-11-09 03:34:49.000000000 +0100
+++ new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/helpers/location_helper.rb
2015-11-19 15:08:09.000000000 +0100
@@ -26,4 +26,11 @@
selected
)
end
+
+ def location_discovery_options(selected)
+ options_for_select(
+ ["always", "never", "exclusive"],
+ selected
+ )
+ end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447036244.df8e574/hawk/app/models/location.rb
new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/location.rb
--- old/hawk2-1.0.1+git.1447036244.df8e574/hawk/app/models/location.rb
2015-11-09 03:34:49.000000000 +0100
+++ new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/location.rb
2015-11-19 15:08:09.000000000 +0100
@@ -5,6 +5,7 @@
attribute :id, String
attribute :resource, Array[String]
attribute :rules, Array[Hash]
+ attribute :discovery, String
validates :id,
presence: { message: _("Constraint ID is required") },
@@ -17,6 +18,12 @@
presence: { message: _("No rules specified") }
validate do |record|
+ unless record.discovery.blank?
+ unless discovery_types.include? record.discovery.downcase
+ errors.add :discovery, _("Invalid resource discovery type")
+ end
+ end
+
if record.complex?
errors.add :base, _("Constraint is too complex - it contains nested
rules")
return false
@@ -37,13 +44,15 @@
end
end
- errors.add :base, _('No expressions specified') if
rule[:expressions].empty?
-
- rule[:expressions].each do |e|
- e[:attribute].strip!
- e[:value].to_s.strip!
- errors.add :base, _("Attribute contains both single and double
quotes") if unquotable? e[:attribute]
- errors.add :base, _("Value contains both single and double quotes") if
unquotable? e[:value]
+ if rule[:expressions].blank?
+ errors.add :base, _('No expressions specified')
+ else
+ rule[:expressions].each do |e|
+ e[:attribute].strip!
+ e[:value].to_s.strip!
+ errors.add :base, _("Attribute contains both single and double
quotes") if unquotable? e[:attribute]
+ errors.add :base, _("Value contains both single and double quotes")
if unquotable? e[:value]
+ end
end
end
end
@@ -59,6 +68,7 @@
def simple?
rules.none? ||
rules.length == 1 &&
+ rules[0][:expressions] &&
rules[0][:expressions].length == 1 &&
(!rules[0].has_key?(:role) || rules[0][:role].empty?) &&
rules[0][:score] &&
@@ -89,6 +99,10 @@
['mandatory', 'advisory', 'inf', '-inf', 'infinity', '-infinity']
end
+ def discovery_types
+ ['always', 'never', 'exclusive']
+ end
+
def shell_syntax
[].tap do |cmd|
cmd.push "location #{id}"
@@ -99,8 +113,11 @@
cmd.push ["{", resource.join(" "), "}"].join(" ")
end
+ cmd.push "resource-discovery=#{crm_quote(discovery)}" unless
discovery.blank?
+
if simple?
- cmd.push "#{rules.first[:score]}:
#{rules.first[:expressions].first[:value]}"
+ cmd.push "#{rules.first[:score]}:"
+ cmd.push "#{rules.first[:expressions].first[:value]}"
else
rules.each do |rule|
op = rule[:boolean_op]
@@ -138,6 +155,8 @@
end
end
+ record.discovery = xml.attributes["resource-discovery"] if
xml.attributes["resource-discovery"]
+
record.rules = [].tap do |rules|
if xml.attributes["score"]
# Simple location constraint, fold to rule notation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447036244.df8e574/hawk/app/views/locations/_form.html.haml
new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/views/locations/_form.html.haml
---
old/hawk2-1.0.1+git.1447036244.df8e574/hawk/app/views/locations/_form.html.haml
2015-11-09 03:34:49.000000000 +0100
+++
new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/views/locations/_form.html.haml
2015-11-19 15:08:09.000000000 +0100
@@ -10,6 +10,8 @@
= main_form.select :resource, :location_resource_options, {
include_hidden: false }, { multiple: true, size: 5 }
+ = main_form.select :discovery, :location_discovery_options, {
include_blank: true, include_hidden: false }, { label: _("Resource Discovery") }
+
%div{ data: { locations: location.rules.to_json, locations_prefix:
"location[rules]", locations_target: ".content" } }
.content.locations
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447036244.df8e574/hawk/config/routes.rb
new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/config/routes.rb
--- old/hawk2-1.0.1+git.1447036244.df8e574/hawk/config/routes.rb
2015-11-09 03:34:49.000000000 +0100
+++ new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/config/routes.rb
2015-11-19 15:08:09.000000000 +0100
@@ -132,5 +132,8 @@
get "login" => "sessions#new", :as => :login
match 'login' => "sessions#create", via: [ :post, :options], :as => :signin
- get '*path' => redirect('/') # if nothing else matches
+
+ if Rails.env.production?
+ get '*path' => redirect('/404.html') # if nothing else matches
+ end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447036244.df8e574/hawk/public/404.html
new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/public/404.html
--- old/hawk2-1.0.1+git.1447036244.df8e574/hawk/public/404.html 2015-11-09
03:34:49.000000000 +0100
+++ new/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/public/404.html 2015-11-19
15:08:09.000000000 +0100
@@ -10,7 +10,10 @@
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
<link rel="shortcut icon" href="/favicon.ico" />
+ <link rel="stylesheet" href="/assets/vendor.css" />
<link rel="stylesheet" href="/assets/application.css" />
+ <link rel="stylesheet" href="/assets/authentication.css" />
+ <script src="/assets/vendor.js"></script>
<script src="/assets/application.js"></script>
<!--[if lt IE 9]>
@@ -29,7 +32,7 @@
<div id="navbar" class="navbar-right">
<ul class="nav navbar-nav">
<li>
- <a href="/">Go to dashboard</a>
+ <a href="#" onclick="window.history.back()">Go back</a>
</li>
</ul>
</div>
@@ -37,7 +40,7 @@
</div>
<div class="container" id="errorpage">
- <div class="panel panel-default panel-warning">
+ <div class="panel panel-default panel-warning" style="margin-top: 80px;">
<div class="panel-heading">
<h2>
We can't find the page you're looking for
@@ -50,16 +53,16 @@
</p>
</div>
</div>
+ </div>
- <footer>
- <div class="container-fluid">
- <div class="col-lg-12 copyright">
- <p>
- Copyright © 2009-2015 SUSE, LLC
- </p>
- </div>
+ <footer>
+ <div class="container-fluid">
+ <div class="col-lg-12 copyright">
+ <p>
+ Copyright © 2009-2015 SUSE, LLC
+ </p>
</div>
- </footer>
- </div>
+ </div>
+ </footer>
</body>
</html>
