Hello community,
here is the log from the commit of package hawk for openSUSE:Factory checked in
at 2015-04-03 14:34:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hawk (Old)
and /work/SRC/openSUSE:Factory/.hawk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2015-03-18
13:07:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2015-04-03
14:34:47.000000000 +0200
@@ -1,0 +2,54 @@
+Thu Apr 02 06:05:17 UTC 2015 - kgronl...@suse.com
+
+- Update to version 0.7.0+git.1427954675.b847dc9:
+ + GUI: Fix error display css
+ + GUI: Redirect to new after creating, add link to edit created resource
(bsc#921762)
+ + Wizard: Add sbd_device as explicit parameter (bsc#924407)
+ + Wizard: Remove cmirrord from cLVM wizard (bsc#924414)
+ + Wizard: Fix check for CIB write access (bsc#924429)
+
+-------------------------------------------------------------------
+Wed Mar 25 13:51:08 UTC 2015 - kgronl...@suse.com
+
+- Depend strictly on supported versions of rubygems
+
+-------------------------------------------------------------------
+Wed Mar 25 10:19:31 UTC 2015 - kgronl...@suse.com
+
+- Depend on exact tilt version required (1.4)
+
+-------------------------------------------------------------------
+Thu Mar 19 13:12:14 UTC 2015 - kgronl...@suse.com
+
+- Add build dependency on git
+
+-------------------------------------------------------------------
+Thu Mar 19 09:02:38 UTC 2015 - kgronl...@suse.com
+
+- Update to version 0.7.0+git.1426755371.189d4a2:
+ + Rely on hawk to pull in production dependencies
+ + Reorder dependency install to avoid tilt trap
+ + Rails 4: Fix use of @errors hash vs. array
+
+-------------------------------------------------------------------
+Wed Mar 18 12:58:59 UTC 2015 - kgronl...@suse.com
+
+- Update to version 0.7.0+git.1426677126.2ef8f08:
+ + Vagrant: Increase development worker:thread count to 2:2
+ + Build: Update rpm/hawk.spec
+
+-------------------------------------------------------------------
+Wed Mar 18 11:10:54 UTC 2015 - kgronl...@suse.com
+
+- Make dependency on tilt >= 1.4, < 2.0
+
+-------------------------------------------------------------------
+Tue Mar 17 15:26:48 UTC 2015 - kgronl...@suse.com
+
+- Update to version 0.7.0+git.1426603924.3cb835b:
+ + Vagrant: Reduce number of workers in dev mode
+ + Misc: Reduce number of server workers/threads
+ + Chef: Fix spelling
+ + Vagrant: retain insecure key
+
+-------------------------------------------------------------------
Old:
----
hawk-0.7.0+git.1426595507.808c2cc.tar.bz2
New:
----
_servicedata
hawk-0.7.0+git.1427954675.b847dc9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk.spec ++++++
--- /var/tmp/diff_new_pack.lMAHda/_old 2015-04-03 14:34:48.000000000 +0200
+++ /var/tmp/diff_new_pack.lMAHda/_new 2015-04-03 14:34:48.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package hawk
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -39,7 +39,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 0.7.0+git.1426595507.808c2cc
+Version: 0.7.0+git.1427954675.b847dc9
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
@@ -71,30 +71,31 @@
%endif
BuildRequires: rubygem(%{rb_default_ruby_abi}:byebug) >= 3.5
-BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9
-BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext) >= 3.1
-BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails) >= 1.2
-BuildRequires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11
+BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext:0.9)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext:3.1)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1.2)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:puma:2.11)
BuildRequires: rubygem(%{rb_default_ruby_abi}:quiet_assets)
-BuildRequires: rubygem(%{rb_default_ruby_abi}:rails) >= 4.2
-BuildRequires: rubygem(%{rb_default_ruby_abi}:rake) >= 10.4
-BuildRequires: rubygem(%{rb_default_ruby_abi}:spring) >= 1.3
-BuildRequires: rubygem(%{rb_default_ruby_abi}:sprockets) >= 2.12
-BuildRequires: rubygem(%{rb_default_ruby_abi}:tilt) >= 1.4
-BuildRequires: rubygem(%{rb_default_ruby_abi}:web-console) >= 2.0
+BuildRequires: rubygem(%{rb_default_ruby_abi}:rails:4.2)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:rake:10.4)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:spring:1.3)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:sprockets:2.12)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:tilt:1.4)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:web-console:2.1)
%if 0%{?bundle_gems}
%else
# SLES bundles all this stuff at build time, other distros just
# use runtime dependencies.
-Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9
-Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails) >= 1.2
-Requires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11
-Requires: rubygem(%{rb_default_ruby_abi}:rails) >= 4.2
-Requires: rubygem(%{rb_default_ruby_abi}:rake) >= 10.4
-Requires: rubygem(%{rb_default_ruby_abi}:sprockets) >= 2.12
-Requires: rubygem(%{rb_default_ruby_abi}:tilt) >= 1.4
+Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext:0.9)
+Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1.2)
+Requires: rubygem(%{rb_default_ruby_abi}:puma:2.11)
+Requires: rubygem(%{rb_default_ruby_abi}:rails:4.2)
+Requires: rubygem(%{rb_default_ruby_abi}:rake:10.4)
+Requires: rubygem(%{rb_default_ruby_abi}:sprockets:2.12)
+Requires: rubygem(%{rb_default_ruby_abi}:tilt:1.4)
%endif
+BuildRequires: git
BuildRequires: glib2-devel
BuildRequires: libxml2-devel
BuildRequires: pam-devel
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/hawk.git</param>
<param
name="changesrevision">b847dc9ce2dc2cefda9d9def081d3670ac67c3fd</param></service></servicedata>++++++
hawk-0.7.0+git.1426595507.808c2cc.tar.bz2 ->
hawk-0.7.0+git.1427954675.b847dc9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/Vagrantfile
new/hawk-0.7.0+git.1427954675.b847dc9/Vagrantfile
--- old/hawk-0.7.0+git.1426595507.808c2cc/Vagrantfile 2015-03-16
14:31:04.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/Vagrantfile 2015-04-02
08:05:08.000000000 +0200
@@ -4,6 +4,7 @@
Vagrant.configure("2") do |config|
config.vm.box = "webhippie/opensuse-13.2"
config.vm.box_check_update = true
+ config.ssh.insert_key = false
config.vm.define "webui", default: true do |machine|
machine.vm.hostname = "webui"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/attributes/webui.rb
new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/attributes/webui.rb
---
old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/attributes/webui.rb
2015-03-16 14:31:04.000000000 +0100
+++
new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/attributes/webui.rb
2015-04-02 08:05:08.000000000 +0200
@@ -19,29 +19,31 @@
default["hawk"]["webui"]["packages"] = [
# Production dependencies
- "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-rails-4_2",
- "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-puma",
- "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-fast_gettext",
-
"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-gettext_i18n_rails",
- "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-sprockets",
- "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-tilt-1_4",
-
- # Development dependencies
- "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-gettext",
- "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-byebug",
- "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-web-console",
- "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-spring",
- "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-quiet_assets",
+ #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-rails-4_2",
+ #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-puma",
+ #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-fast_gettext",
+
#"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-gettext_i18n_rails",
+ #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-sprockets",
+ #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-tilt-1_4",
"hawk",
"hawk-templates",
"ha-cluster-bootstrap",
"w3m",
+ # Development dependencies
+
"glib2-devel",
"libxml2-devel",
"pam-devel",
- "libpacemaker-devel"
+ "libpacemaker-devel",
+
+ "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-gettext",
+ "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-byebug",
+ "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-web-console",
+ "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-spring",
+ "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-quiet_assets",
+
]
default["hawk"]["webui"]["targets"] = %w(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/recipes/node.rb
new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/recipes/node.rb
--- old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/recipes/node.rb
2015-03-17 14:02:47.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/recipes/node.rb
2015-04-02 08:05:08.000000000 +0200
@@ -42,7 +42,7 @@
end
end
rescue Errno::EHOSTUNREACH => e
- Chef::Log.info "Waiting to become available webui..."
+ Chef::Log.info "Waiting for webui to become available..."
end
case
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/templates/default/systemd.service.erb
new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/templates/default/systemd.service.erb
---
old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/templates/default/systemd.service.erb
2015-03-16 14:33:35.000000000 +0100
+++
new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/templates/default/systemd.service.erb
2015-04-02 08:05:08.000000000 +0200
@@ -13,8 +13,8 @@
WorkingDirectory=/vagrant/hawk
Environment="HAWK_ENV=development"
-Environment="HAWK_THREADS=16"
-Environment="HAWK_WORKERS=3"
+Environment="HAWK_THREADS=2"
+Environment="HAWK_WORKERS=2"
Environment="HAWK_LISTEN=0.0.0.0"
Environment="HAWK_PORT=3000"
Environment="HAWK_KEY=/vagrant/hawk/tmp/hawk.pem"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/assets/javascripts/status.js
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/assets/javascripts/status.js
--- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/assets/javascripts/status.js
2015-03-16 14:31:04.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/assets/javascripts/status.js
2015-04-02 08:05:08.000000000 +0200
@@ -51,29 +51,32 @@
function update_errors(errors)
{
- $("#errorbar").html("");
if (errors.length) {
- $("#errorbar").show();
+ var html;
+ html = '<ul>';
for (var i = 0; i < errors.length; i++) {
// have to use for loop instead of $.each, as the latter turns "this"
// into an object even if it's a string :-/
- var html;
if (typeof errors[i] == "object") {
- html = '<div><span style="float: left;" class="ui-icon
ui-icon-alert"></span>';
+ html += '<li class="error-entry">';
if (errors[i].link) {
html += '<a href="' + errors[i].link + '">';
}
+ html += '<span class="ui-icon ui-icon-alert"></span> ';
html += errors[i].msg;
if (errors[i].link) {
html += '</a>';
}
- html += '</div>';
+ html += '</li>';
} else {
- html = '<div>' + escape_html(errors[i]) + '</div>';
+ html += '<li>' + escape_html(errors[i]) + '</li>';
}
- $("#errorbar").append($(html));
}
+ html += '</ul>';
+ $("#errorbar").html(html);
+ $("#errorbar").show();
} else {
+ $("#errorbar").html("");
$("#errorbar").hide();
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/assets/stylesheets/base.css
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/assets/stylesheets/base.css
--- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/assets/stylesheets/base.css
2015-03-16 14:31:04.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/assets/stylesheets/base.css
2015-04-02 08:05:08.000000000 +0200
@@ -97,6 +97,22 @@
margin-bottom: 1em;
}
+#errorbar ul
+{
+ padding-left: 1em;
+}
+
+#errorbar li
+{
+ list-style: none;
+}
+
+#errorbar .ui-icon
+{
+ display: inline-block;
+ vertical-align: middle;
+}
+
#content p
{
margin-top: 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/controllers/primitives_controller.rb
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/primitives_controller.rb
---
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/controllers/primitives_controller.rb
2015-03-16 14:31:04.000000000 +0100
+++
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/primitives_controller.rb
2015-04-02 08:05:08.000000000 +0200
@@ -60,8 +60,10 @@
end
@res = Primitive.new params[:primitive] # RORSCAN_ITL (mass ass. OK)
if @res.save
- flash[:highlight] = _('Resource created successfully')
- redirect_to :action => 'edit', :id => @res.id
+ edit_url = url_for(:action => 'edit', :id => @res.id)
+ edit_link = "<a href=\"#{edit_url}\">#{@res.id}</a>"
+ flash[:highlight] = (_('Resource created successfully') + ': ' +
edit_link).html_safe
+ redirect_to :action => 'new'
else
render :action => 'new'
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/controllers/wizard_controller.rb
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/wizard_controller.rb
---
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/controllers/wizard_controller.rb
2015-03-16 14:31:04.000000000 +0100
+++
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/wizard_controller.rb
2015-04-02 08:05:08.000000000 +0200
@@ -310,7 +310,7 @@
# as it will in fact change the CIB if successful.
def cib_writable
begin
- Invoker.instance.cibadmin("--modify", "--allow-create", "--scope",
"--crm_config", "--xml-text",
+ Invoker.instance.cibadmin("--modify", "--allow-create", "--scope",
"crm_config", "--xml-text",
'<cluster_property_set id="hawk-rw-test"/>')
Invoker.instance.cibadmin("--delete", "--xml-text",
'<cluster_property_set id="hawk-rw-test"/>')
rescue NotFoundError
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/models/cib.rb
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/models/cib.rb
--- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/models/cib.rb
2015-03-16 14:31:04.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/models/cib.rb
2015-04-02 08:05:08.000000000 +0200
@@ -228,7 +228,7 @@
attr_reader :booth
def initialize(id, user, use_file = false)
- @errors = []
+ @errors = {}
if use_file
cib_path = id
@@ -481,7 +481,8 @@
end
failed_ops << { :node => node[:uname], :call_id =>
op.attributes['call-id'], :op => operation, :rc_code => rc_code, :exit_reason
=> exit_reason }
- @errors << {
+ @errors[:base] ||= []
+ @errors[:base] << {
:msg => _('Failed op: node=%{node}, resource=%{resource},
call-id=%{call_id}, operation=%{op}, rc-code=%{rc_code},
exit-reason=%{exit_reason}') % {
:node => node[:uname], :resource => id, :call_id =>
op.attributes['call-id'],
:op => operation, :rc_code => rc_code, :exit_reason =>
exit_reason },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/explorer/_pe_list.html.erb
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/views/explorer/_pe_list.html.erb
---
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/explorer/_pe_list.html.erb
2015-03-17 14:02:47.000000000 +0100
+++
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/views/explorer/_pe_list.html.erb
2015-04-02 08:05:08.000000000 +0200
@@ -1,5 +1,5 @@
<% if @errors.any? %>
-<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><% @errors.values.flatten.each {|e| %><%=h e %><br /><%
} %></div>
+<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><% @errors.each {|e| %><%=h e %><br /><% } %></div>
<% end %>
<% if @peinputs %>
<% if @peinputs.empty? %>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/puma.rb
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/puma.rb
--- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/puma.rb 2015-03-16
14:33:35.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/puma.rb 2015-04-02
08:05:08.000000000 +0200
@@ -32,8 +32,8 @@
ROOT = File.expand_path("../../", __FILE__)
ENVIRONMENT = ENV["HAWK_ENV"] || "production"
-THREADS = ENV["HAWK_THREADS"] || 16
-WORKERS = ENV["HAWK_WORKERS"] || 3
+THREADS = ENV["HAWK_THREADS"] || 5
+WORKERS = ENV["HAWK_WORKERS"] || 2
LISTEN = ENV["HAWK_LISTEN"] || "0.0.0.0"
PORT = ENV["HAWK_PORT"] || "7630"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/wizard/templates/sbd.xml
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/templates/sbd.xml
--- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/wizard/templates/sbd.xml
2015-03-16 14:31:04.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/templates/sbd.xml
2015-04-02 08:05:08.000000000 +0200
@@ -20,12 +20,25 @@
<content type="string" default="sbd-stonith"/>
</parameter>
+<parameter name="sbd_device">
+<shortdesc lang="en">SBD Device(s)</shortdesc>
+<longdesc lang="en">
+The block device used for the SBD partition. Up to three
+can be specified if separated by a semicolon. (Please check
+the documentation if specifying two.)
+
+If not specified, will default to the value from /etc/sysconfig/sbd.
+</longdesc>
+<content type="string" default=""/>
+</parameter>
+
</parameters>
<crm_script>
primitive <insert param="id"/> stonith:external/sbd
- op start timeout="60"
- op monitor interval="15" timeout="15"
+ <if set="sbd_device">params sbd_device="<insert param="sbd_device"/>"</if>
+ op start timeout="60"
+ op monitor interval="15" timeout="15"
</crm_script>
</template>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/wizard/workflows/clvm.xml
new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/clvm.xml
--- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/wizard/workflows/clvm.xml
2015-03-16 14:31:04.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/clvm.xml
2015-04-02 08:05:08.000000000 +0200
@@ -54,12 +54,7 @@
op start timeout=90s
op stop timeout=100s
-primitive cmirror ocf:lvm2:cmirrord
- params daemon_timeout="30"
- op start timeout=90s
- op stop timeout=100s
-
-group g-<insert param="id"/> dlm clvm cmirror <insert param="id"/>
+group g-<insert param="id"/> dlm clvm <insert param="id"/>
clone c-<insert param="id"/> g-<insert param="id"/>
meta interleave="true" ordered="true"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/rpm/hawk.spec
new/hawk-0.7.0+git.1427954675.b847dc9/rpm/hawk.spec
--- old/hawk-0.7.0+git.1426595507.808c2cc/rpm/hawk.spec 2015-03-16
14:31:04.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/rpm/hawk.spec 2015-04-02
08:05:08.000000000 +0200
@@ -16,14 +16,6 @@
#
-%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1310 ||
0%{?suse_version} == 1315
-%define hawk_ruby_bin ruby.ruby2.1
-%define hawk_ruby_abi ruby:2.1.0
-%else
-%define hawk_ruby_bin ruby
-%define hawk_ruby_abi %{rb_default_ruby_abi}
-%endif
-
%if 0%{?suse_version}
%define www_base /srv/www
%define vendor_ruby vendor_ruby
@@ -47,15 +39,10 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 0.7.0+git.1424349779.eb17098
+Version: 0.7.0+git.1426603924.3cb835b
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
-%if 0%{?suse_version}
-Source1: filter-requires.sh
-%define _use_internal_dependency_generator 0
-%define __find_requires /bin/sh %{SOURCE1}
-%endif
Source100: hawk-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: crmsh
@@ -67,7 +54,7 @@
Requires: rubypick
BuildRequires: rubypick
%endif
-Requires: rubygem(%{hawk_ruby_abi}:bundler)
+Requires: rubygem(%{rb_default_ruby_abi}:bundler)
%if 0%{?suse_version}
Recommends: graphviz-gnome
Requires: iproute2
@@ -83,29 +70,31 @@
BuildRequires: pacemaker-libs-devel
%endif
-BuildRequires: rubygem(%{hawk_ruby_abi}:byebug) >= 3.5
-BuildRequires: rubygem(%{hawk_ruby_abi}:fast_gettext) >= 0.9
-BuildRequires: rubygem(%{hawk_ruby_abi}:gettext) >= 3.1
-BuildRequires: rubygem(%{hawk_ruby_abi}:gettext_i18n_rails) >= 1.2
-BuildRequires: rubygem(%{hawk_ruby_abi}:puma) >= 2.11
-BuildRequires: rubygem(%{hawk_ruby_abi}:quiet_assets)
-BuildRequires: rubygem(%{hawk_ruby_abi}:rails) >= 4.2
-BuildRequires: rubygem(%{hawk_ruby_abi}:rake) >= 10.4
-BuildRequires: rubygem(%{hawk_ruby_abi}:spring) >= 1.3
-BuildRequires: rubygem(%{hawk_ruby_abi}:sprockets) >= 2.12
-BuildRequires: rubygem(%{hawk_ruby_abi}:tilt) >= 1.4
-BuildRequires: rubygem(%{hawk_ruby_abi}:web-console) >= 2.0
+BuildRequires: rubygem(%{rb_default_ruby_abi}:byebug) >= 3.5
+BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9
+BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext) >= 3.1
+BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails) >= 1.2
+BuildRequires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11
+BuildRequires: rubygem(%{rb_default_ruby_abi}:quiet_assets)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:rails) >= 4.2
+BuildRequires: rubygem(%{rb_default_ruby_abi}:rake) >= 10.4
+BuildRequires: rubygem(%{rb_default_ruby_abi}:spring) >= 1.3
+BuildRequires: rubygem(%{rb_default_ruby_abi}:sprockets) >= 2.12
+BuildRequires: rubygem(%{rb_default_ruby_abi}:tilt) < 2.0
+BuildRequires: rubygem(%{rb_default_ruby_abi}:tilt) >= 1.4
+BuildRequires: rubygem(%{rb_default_ruby_abi}:web-console) >= 2.0
%if 0%{?bundle_gems}
%else
# SLES bundles all this stuff at build time, other distros just
# use runtime dependencies.
-Requires: rubygem(%{hawk_ruby_abi}:fast_gettext) >= 0.9
-Requires: rubygem(%{hawk_ruby_abi}:gettext_i18n_rails) >= 1.2
-Requires: rubygem(%{hawk_ruby_abi}:puma) >= 2.11
-Requires: rubygem(%{hawk_ruby_abi}:rails) >= 4.2
-Requires: rubygem(%{hawk_ruby_abi}:rake) >= 10.4
-Requires: rubygem(%{hawk_ruby_abi}:sprockets) >= 2.12
-Requires: rubygem(%{hawk_ruby_abi}:tilt) >= 1.4
+Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9
+Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails) >= 1.2
+Requires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11
+Requires: rubygem(%{rb_default_ruby_abi}:rails) >= 4.2
+Requires: rubygem(%{rb_default_ruby_abi}:rake) >= 10.4
+Requires: rubygem(%{rb_default_ruby_abi}:sprockets) >= 2.12
+Requires: rubygem(%{rb_default_ruby_abi}:tilt) < 2.0
+Requires: rubygem(%{rb_default_ruby_abi}:tilt) >= 1.4
%endif
BuildRequires: glib2-devel
@@ -178,6 +167,8 @@
%{__ln_s} -f %{_sbindir}/service %{buildroot}%{_sbindir}/rchawk
%endif
+install -p -d -m 755 %{buildroot}%{_sysconfdir}/hawk
+
%clean
rm -rf %{buildroot}
@@ -215,8 +206,8 @@
%{www_base}/hawk/config
# Packaged in hawk-templates
%exclude %{www_base}/hawk/config/wizard
-%{www_base}/hawk/db
%{www_base}/hawk/lib
+%attr(0750, %{uname},%{gname})%{_sysconfdir}/hawk
%attr(0750, %{uname},%{gname})%{www_base}/hawk/log
%dir %attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp
%attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp/cache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/rpm/sysconfig.hawk
new/hawk-0.7.0+git.1427954675.b847dc9/rpm/sysconfig.hawk
--- old/hawk-0.7.0+git.1426595507.808c2cc/rpm/sysconfig.hawk 2015-03-16
14:33:35.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/rpm/sysconfig.hawk 2015-04-02
08:05:08.000000000 +0200
@@ -11,19 +11,19 @@
## Path: Cluster/Hawk
## Description: Maximum number of threads
## Type: integer
-## Default: 16
+## Default: 5
## ServiceRestart: hawk
# Sets the maximum number of threads used by the web server.
-HAWK_THREADS="16"
+HAWK_THREADS="5"
## Path: Cluster/Hawk
## Description: Maximum number of worker processes
## Type: integer
-## Default: 3
+## Default: 2
## ServiceRestart: hawk
# Sets the maximum number of separate worker processes spawned by the
# web server.
-HAWK_WORKERS="3"
+HAWK_WORKERS="2"
## Path: Cluster/Hawk
## Description: Listen address
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1426595507.808c2cc/scripts/hawk.service.in
new/hawk-0.7.0+git.1427954675.b847dc9/scripts/hawk.service.in
--- old/hawk-0.7.0+git.1426595507.808c2cc/scripts/hawk.service.in
2015-03-16 14:33:35.000000000 +0100
+++ new/hawk-0.7.0+git.1427954675.b847dc9/scripts/hawk.service.in
2015-04-02 08:05:08.000000000 +0200
@@ -13,8 +13,8 @@
WorkingDirectory=@WWW_BASE@/hawk
Environment="HAWK_ENV=production"
-Environment="HAWK_THREADS=16"
-Environment="HAWK_WORKERS=3"
+Environment="HAWK_THREADS=5"
+Environment="HAWK_WORKERS=2"
Environment="HAWK_LISTEN=0.0.0.0"
Environment="HAWK_PORT=7630"
Environment="HAWK_KEY=/etc/hawk/hawk.pem"
