Hello community,
here is the log from the commit of package hawk for openSUSE:Factory checked in
at 2015-03-18 13:07:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09
10:09:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2015-03-18
13:07:50.000000000 +0100
@@ -1,0 +2,25 @@
+Tue Mar 17 13:05:14 UTC 2015 - tboer...@suse.com
+
+- Extended _service file to get changes generated as well
+- Update to version 0.7.0+git.1426595507.808c2cc:
+ + Removed active record related files
+ + Fixed paths in systemd service template
+ + We don't want to load all rails components
+ + Fixed error messages within forms
+ + Removed redundant repo addition
+ + Updated submodule references
+
+-------------------------------------------------------------------
+Mon Mar 16 11:35:04 UTC 2015 - tboer...@suse.com
+
+- Removed filter-requires.sh as it's not used anymore
+- Create the sysconfig directory for the SSL certs
+- Get rid of hawk_ruby_abi in favor of default ruby abi
+
+-------------------------------------------------------------------
+Wed Mar 11 14:44:27 UTC 2015 - kgronl...@suse.com
+
+- Update to git#25ecd9f
+ - Misc: Run ExecStartPre= as root to generate certificate
+
+-------------------------------------------------------------------
Old:
----
filter-requires.sh
hawk-0.7.0+git.1425634715.4717cb9.tar.bz2
New:
----
hawk-0.7.0+git.1426595507.808c2cc.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk.spec ++++++
--- /var/tmp/diff_new_pack.KXKqmW/_old 2015-03-18 13:07:51.000000000 +0100
+++ /var/tmp/diff_new_pack.KXKqmW/_new 2015-03-18 13:07:51.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package hawk
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -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.1425634715.4717cb9
+Version: 0.7.0+git.1426595507.808c2cc
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,29 @@
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) >= 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) >= 1.4
%endif
BuildRequires: glib2-devel
@@ -178,6 +165,8 @@
%{__ln_s} -f %{_sbindir}/service %{buildroot}%{_sbindir}/rchawk
%endif
+install -p -d -m 755 %{buildroot}%{_sysconfdir}/hawk
+
%clean
rm -rf %{buildroot}
@@ -215,8 +204,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
++++++ _service ++++++
--- /var/tmp/diff_new_pack.KXKqmW/_old 2015-03-18 13:07:51.000000000 +0100
+++ /var/tmp/diff_new_pack.KXKqmW/_new 2015-03-18 13:07:51.000000000 +0100
@@ -3,8 +3,10 @@
<param name="url">git://github.com/ClusterLabs/hawk.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
+ <param name="filename">hawk</param>
<param name="versionformat">0.7.0+git.%ct.%h</param>
- <param name="revision">4717cb9</param>
+ <param name="revision">master</param>
+ <param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
@@ -12,5 +14,7 @@
<param name="compression">bz2</param>
</service>
- <service name="set_version" mode="disabled"/>
+ <service name="set_version" mode="disabled">
+ <param name="basename">hawk</param>
+ </service>
</services>
++++++ hawk-0.7.0+git.1425634715.4717cb9.tar.bz2 ->
hawk-0.7.0+git.1426595507.808c2cc.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/build/attributes/default.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/build/attributes/default.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/build/attributes/default.rb
2015-03-06 10:39:33.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/build/attributes/default.rb
2015-03-17 14:02:47.000000000 +0100
@@ -29,17 +29,6 @@
build-essential
binutils-doc
),
- "ubuntu" => %w(
- autoconf
- automake
- flex
- bison
- make
- gcc
- g++
- build-essential
- binutils-doc
- ),
"suse" => %w(
autoconf
automake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/git/recipes/default.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/git/recipes/default.rb
--- old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/git/recipes/default.rb
2015-03-06 10:39:34.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/git/recipes/default.rb
2015-03-17 14:02:47.000000000 +0100
@@ -26,7 +26,7 @@
key node["git"]["zypper"]["key"]
title node["git"]["zypper"]["title"]
- action :add
+ action [:add, :refresh]
only_if do
node["git"]["zypper"]["enabled"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/recipes/node.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/recipes/node.rb
--- old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/recipes/node.rb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/recipes/node.rb
2015-03-17 14:02:47.000000000 +0100
@@ -72,7 +72,7 @@
key node["hawk"]["zypper"]["key"]
title node["hawk"]["zypper"]["title"]
- action :add
+ action [:add, :refresh]
only_if do
node["hawk"]["zypper"]["enabled"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/recipes/webui.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/recipes/webui.rb
--- old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/recipes/webui.rb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/recipes/webui.rb
2015-03-17 14:02:47.000000000 +0100
@@ -28,7 +28,7 @@
key node["hawk"]["zypper"]["key"]
title node["hawk"]["zypper"]["title"]
- action :add
+ action [:add, :refresh]
only_if do
node["hawk"]["zypper"]["enabled"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/templates/default/systemd.service.erb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/templates/default/systemd.service.erb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/templates/default/systemd.service.erb
2015-03-06 10:39:32.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/templates/default/systemd.service.erb
2015-03-16 14:33:35.000000000 +0100
@@ -17,11 +17,12 @@
Environment="HAWK_WORKERS=3"
Environment="HAWK_LISTEN=0.0.0.0"
Environment="HAWK_PORT=3000"
-Environment="HAWK_KEY=/vagrant/hawk/tmp/ssl/hawk.pem"
-Environment="HAWK_CERT=/vagrant/hawk/tmp/ssl/hawk.key"
+Environment="HAWK_KEY=/vagrant/hawk/tmp/hawk.pem"
+Environment="HAWK_CERT=/vagrant/hawk/tmp/hawk.key"
-ExecStartPre=/vagrant/hawk/bin/generate-ssl-cert
-ExecStartPre=/vagrant/hawk/bin/bundle
+# Run ExecStartPre with root-permissions
+PermissionsStartOnly=true
+ExecStartPre=/srv/www/hawk/bin/generate-ssl-cert
ExecStart=/usr/bin/puma -C /vagrant/hawk/config/puma.rb
ExecStop=/usr/bin/pumactl -S /vagrant/hawk/tmp/pids/puma.state stop
ExecReload=/usr/bin/pumactl -S /vagrant/hawk/tmp/pids/puma.state restart
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/locales/attributes/default.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/locales/attributes/default.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/locales/attributes/default.rb
2015-03-06 10:39:36.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/locales/attributes/default.rb
2015-03-17 14:02:47.000000000 +0100
@@ -34,22 +34,6 @@
default["locales"]["lang"] = "en_US.UTF-8"
default["locales"]["generate_file"] = "/etc/locale.gen"
-when "ubuntu"
- default["locales"]["packages"] = %w(
- locales
- )
-
- default["locales"]["generate"] = [
- "en_US ISO-8859-1",
- "en_US.ISO-8859-15 ISO-8859-15",
- "en_US.UTF-8 UTF-8",
- "de_DE ISO-8859-1",
- "de_DE@euro ISO-8859-15",
- "de_DE.UTF-8 UTF-8"
- ]
-
- default["locales"]["lang"] = "en_US.UTF-8"
- default["locales"]["generate_file"] = "/etc/locale.gen"
when "suse"
default["locales"]["lang"] = "en_US.utf8"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/locales/recipes/default.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/locales/recipes/default.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/locales/recipes/default.rb
2015-03-06 10:39:36.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/locales/recipes/default.rb
2015-03-17 14:02:47.000000000 +0100
@@ -20,8 +20,6 @@
case node["platform_family"]
when "debian"
include_recipe "locales::debian"
-when "ubuntu"
- include_recipe "locales::debian"
when "suse"
include_recipe "locales::suse"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/locales/templates/debian/locale.gen.erb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/locales/templates/debian/locale.gen.erb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/locales/templates/debian/locale.gen.erb
1970-01-01 01:00:00.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/locales/templates/debian/locale.gen.erb
2015-03-17 14:02:47.000000000 +0100
@@ -0,0 +1,4 @@
+# Generated by Chef for <%= node["fqdn"] %>
+<% @generate.each do |locale| -%>
+<%= locale %>
+<% end -%>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/locales/templates/default/locale.gen.erb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/locales/templates/default/locale.gen.erb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/locales/templates/default/locale.gen.erb
2015-03-06 10:39:36.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/locales/templates/default/locale.gen.erb
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-# Generated by Chef for <%= node["fqdn"] %>
-<% @generate.each do |locale| -%>
-<%= locale %>
-<% end -%>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/ntp/attributes/default.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/ntp/attributes/default.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/ntp/attributes/default.rb
2015-03-06 10:39:36.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/ntp/attributes/default.rb
2015-03-17 14:02:47.000000000 +0100
@@ -30,22 +30,20 @@
default["ntp"]["service_name"] = value_for_platform_family(
"debian" => "ntp",
- "ubuntu" => "ntp",
"suse" => value_for_platform(
"opensuse" => {
- ">= 13.2" => "ntpd",
- "default" => "ntp"
+ "< 13.2" => "ntp",
+ "default" => "ntpd"
},
"suse" => {
- ">= 12" => "ntpd",
- "default" => "ntp"
+ "< 12" => "ntp",
+ "default" => "ntpd"
}
)
)
default["ntp"]["sysconfig_file"] = value_for_platform_family(
"debian" => "/etc/default/ntp",
- "ubuntu" => "/etc/default/ntp",
"suse" => "/etc/sysconfig/ntp"
)
@@ -54,9 +52,8 @@
default["ntp"]["log_file"] = "/var/log/ntp"
default["ntp"]["drift_file"] = value_for_platform_family(
- "debian" => "/var/lib/ntp/ntp.drift",
- "ubuntu" => "/var/lib/ntp/ntp.drift",
- "suse" => "/var/lib/ntp/drift/ntp.drift"
+ "debian" => { "default" => "/var/lib/ntp/ntp.drift" },
+ "suse" => { "default" => "/var/lib/ntp/drift/ntp.drift" }
)
default["ntp"]["stats_dir"] = "/var/log/ntpstats"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/openssh/attributes/default.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/openssh/attributes/default.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/openssh/attributes/default.rb
2015-03-06 10:39:37.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/openssh/attributes/default.rb
2015-03-17 14:02:47.000000000 +0100
@@ -22,10 +22,6 @@
openssh-client
openssh-server
),
- "ubuntu" => %w(
- openssh-client
- openssh-server
- ),
"suse" => %w(
openssh
)
@@ -33,14 +29,12 @@
default["openssh"]["service_name"] = value_for_platform_family(
"debian" => "ssh",
- "ubuntu" => "ssh",
"suse" => "sshd"
)
default["openssh"]["service_options"] = ""
default["openssh"]["sysconfig_file"] = value_for_platform_family(
"debian" => "/etc/default/ssh",
- "ubuntu" => "/etc/default/ssh",
"suse" => "/etc/sysconfig/ssh"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/ruby/attributes/package.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/ruby/attributes/package.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/ruby/attributes/package.rb
2015-03-06 10:39:38.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/ruby/attributes/package.rb
2015-03-17 14:02:47.000000000 +0100
@@ -25,13 +25,6 @@
ruby-dev
rubygems
),
- "ubuntu" => %w(
- libxml2-dev
- libxslt-dev
- ruby
- ruby-dev
- rubygems
- ),
"suse" => %w(
libxml2-devel
libxslt-devel
@@ -44,9 +37,6 @@
"debian" => %w(
),
- "ubuntu" => %w(
-
- ),
"suse" => %w(
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/ruby/attributes/source.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/ruby/attributes/source.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/ruby/attributes/source.rb
2015-03-06 10:39:38.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/ruby/attributes/source.rb
2015-03-17 14:02:47.000000000 +0100
@@ -22,10 +22,6 @@
libxml2-dev
libxslt-dev
),
- "ubuntu" => %w(
- libxml2-dev
- libxslt-dev
- ),
"suse" => %w(
libxml2-devel
libxslt-devel
@@ -36,17 +32,14 @@
"debian" => %w(
),
- "ubuntu" => %w(
-
- ),
"suse" => %w(
)
)
-default["ruby"]["source"]["file_name"] = "ruby-install-0.4.3.tar.gz"
-default["ruby"]["source"]["file_download"] =
"https://github.com/postmodern/ruby-install/archive/v0.4.3.tar.gz";
-default["ruby"]["source"]["directory"] = "ruby-install-0.4.3"
+default["ruby"]["source"]["file_name"] = "ruby-install-0.5.0.tar.gz"
+default["ruby"]["source"]["file_download"] =
"https://github.com/postmodern/ruby-install/archive/v0.5.0.tar.gz";
+default["ruby"]["source"]["directory"] = "ruby-install-0.5.0"
default["ruby"]["source"]["prefix"] = "/usr/local"
default["ruby"]["source"]["type"] = "ruby"
default["ruby"]["source"]["version"] = "stable"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/ruby/recipes/package.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/ruby/recipes/package.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/ruby/recipes/package.rb
2015-03-06 10:39:38.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/ruby/recipes/package.rb
2015-03-17 14:02:47.000000000 +0100
@@ -26,7 +26,7 @@
key node["ruby"]["zypper"]["key"]
title node["ruby"]["zypper"]["title"]
- action :add
+ action [:add, :refresh]
only_if do
node["ruby"]["zypper"]["enabled"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/sudo/attributes/default.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/sudo/attributes/default.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/sudo/attributes/default.rb
2015-03-06 10:39:39.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/sudo/attributes/default.rb
2015-03-17 14:02:47.000000000 +0100
@@ -53,4 +53,3 @@
default["sudo"]["users"] = []
default["sudo"]["data_bag"] = "sudo"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/zypper/providers/repository.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/zypper/providers/repository.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/zypper/providers/repository.rb
2015-03-06 10:39:41.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/zypper/providers/repository.rb
2015-03-17 14:02:47.000000000 +0100
@@ -64,15 +64,11 @@
end
action :refresh do
- if ::File.exists? "/etc/zypp/repos.d/repo-#{new_resource.alias}.repo"
- Chef::Log.info "Refreshing #{new_resource.alias} repository"
+ Chef::Log.info "Refreshing #{new_resource.alias} repository"
- execute "zypper_refresh_#{new_resource.alias}" do
- command "zypper refresh repo-#{new_resource.alias}"
- end
-
- new_resource.updated_by_last_action(true)
- else
- Chef::Log.error "Refresh failed for #{new_resource.alias}"
+ execute "zypper_refresh_#{new_resource.alias}" do
+ command "zypper refresh repo-#{new_resource.alias}"
end
+
+ new_resource.updated_by_last_action(true)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/zypper/recipes/default.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/zypper/recipes/default.rb
---
old/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/zypper/recipes/default.rb
2015-03-06 10:39:41.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/zypper/recipes/default.rb
2015-03-17 14:02:47.000000000 +0100
@@ -17,7 +17,7 @@
# limitations under the License.
#
-if node["platform_family"] == "debian"
+if node["platform_family"] == "suse"
node["zypper"]["repos"].each do |repo|
zypper_repository repo["alias"] do
uri repo["uri"]
@@ -31,7 +31,7 @@
keyserver repo["keyserver"]
end
- notifies :run, "execute[zypper_refresh]", :immediately
+ notifies :run, "execute[zypper_refresh]"
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1425634715.4717cb9/chef/roles/base.rb
new/hawk-0.7.0+git.1426595507.808c2cc/chef/roles/base.rb
--- old/hawk-0.7.0+git.1425634715.4717cb9/chef/roles/base.rb 2015-03-06
10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/chef/roles/base.rb 2015-03-17
14:02:47.000000000 +0100
@@ -14,16 +14,6 @@
)
default_attributes({
- "zypper" => {
- "repos" => [
- {
- "title" => "Network HA Clustering",
- "alias" => "network-ha-clustering",
- "uri" =>
"http://download.opensuse.org/repositories/network:/ha-clustering:/Factory/openSUSE_13.2/";,
- "key" =>
"http://download.opensuse.org/repositories/network:/ha-clustering:/Factory/openSUSE_13.2/repodata/repomd.xml.key";
- }
- ]
- },
"sudo" => {
"users" => [
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/models/cib_object.rb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/models/cib_object.rb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/models/cib_object.rb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/models/cib_object.rb
2015-03-17 14:02:47.000000000 +0100
@@ -59,7 +59,7 @@
end
def errors
- @errors ||= []
+ @errors ||= {}
end
def save
@@ -168,8 +168,8 @@
protected
def error(msg)
- @errors ||= []
- @errors << msg
+ @errors[:base] ||= []
+ @errors[:base] << msg
end
def initialize(attributes = nil)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/clones/_form.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/clones/_form.html.erb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/clones/_form.html.erb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/clones/_form.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -62,7 +62,7 @@
<% flash.each do |flash_type, message| %>
<div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %>
ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message
%></div>
<% end %>
-<% @res.errors.each do |message| %>
+<% @res.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
<% end %>
<table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/colocations/_form.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/colocations/_form.html.erb
---
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/colocations/_form.html.erb
2015-03-06 10:39:32.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/colocations/_form.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -81,7 +81,7 @@
<% flash.each do |flash_type, message| %>
<div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %>
ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message
%></div>
<% end %>
-<% @col.errors.each do |message| %>
+<% @col.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
<% end %>
<table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/explorer/_pe_list.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/explorer/_pe_list.html.erb
---
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/explorer/_pe_list.html.erb
2015-03-06 10:39:32.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/explorer/_pe_list.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -1,5 +1,5 @@
<% if @errors.any? %>
-<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><% @errors.each {|e| %><%=h e %><br /><% } %></div>
+<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>
<% end %>
<% if @peinputs %>
<% if @peinputs.empty? %>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/groups/_form.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/groups/_form.html.erb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/groups/_form.html.erb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/groups/_form.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -97,7 +97,7 @@
<% flash.each do |flash_type, message| %>
<div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %>
ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message
%></div>
<% end %>
-<% @res.errors.each do |message| %>
+<% @res.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
<% end %>
<table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/locations/_form.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/locations/_form.html.erb
---
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/locations/_form.html.erb
2015-03-06 10:39:32.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/locations/_form.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -67,7 +67,7 @@
<% flash.each do |flash_type, message| %>
<div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %>
ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message
%></div>
<% end %>
-<% @loc.errors.each do |message| %>
+<% @loc.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
<% end %>
<table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/masters/_form.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/masters/_form.html.erb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/masters/_form.html.erb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/masters/_form.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -62,7 +62,7 @@
<% flash.each do |flash_type, message| %>
<div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %>
ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message
%></div>
<% end %>
-<% @res.errors.each do |message| %>
+<% @res.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
<% end %>
<table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/orders/_form.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/orders/_form.html.erb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/orders/_form.html.erb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/orders/_form.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -81,7 +81,7 @@
<% flash.each do |flash_type, message| %>
<div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %>
ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message
%></div>
<% end %>
-<% @ord.errors.each do |message| %>
+<% @ord.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
<% end %>
<table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/primitives/_form.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/primitives/_form.html.erb
---
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/primitives/_form.html.erb
2015-03-06 10:39:32.000000000 +0100
+++
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/primitives/_form.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -321,7 +321,7 @@
<% flash.each do |flash_type, message| %>
<div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %>
ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message
%></div>
<% end %>
-<% @res.errors.each do |message| %>
+<% @res.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
<% end %>
<table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/roles/_form.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/roles/_form.html.erb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/roles/_form.html.erb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/roles/_form.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -59,7 +59,7 @@
<% flash.each do |flash_type, message| %>
<div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %>
ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message
%></div>
<% end %>
-<% @role.errors.each do |message| %>
+<% @role.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
<% end %>
<table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/tickets/_form.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/tickets/_form.html.erb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/tickets/_form.html.erb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/tickets/_form.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -69,7 +69,7 @@
<% flash.each do |flash_type, message| %>
<div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %>
ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message
%></div>
<% end %>
-<% @t.errors.each do |message| %>
+<% @t.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
<% end %>
<table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/users/_form.html.erb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/users/_form.html.erb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/views/users/_form.html.erb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/users/_form.html.erb
2015-03-17 14:02:47.000000000 +0100
@@ -47,7 +47,7 @@
<% flash.each do |flash_type, message| %>
<div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %>
ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message
%></div>
<% end %>
-<% @user.errors.each do |message| %>
+<% @user.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em;
margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
<% end %>
<table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/bin/generate-ssl-cert
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/bin/generate-ssl-cert
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/bin/generate-ssl-cert
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/bin/generate-ssl-cert
2015-03-16 14:33:35.000000000 +0100
@@ -60,7 +60,7 @@
mkdir -p $(dirname $cert_file)
old_mask=$(umask)
-umask 177
+umask 137
CN=$(hostname -f)
@@ -87,5 +87,7 @@
echo "Could not generate certificate. Please see $log_file for details"
fi
+chown root:haclient $cert_key_file $cert_file
+
umask $old_mask
exit $rc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/application.rb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/application.rb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/application.rb
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/application.rb
2015-03-16 14:33:35.000000000 +0100
@@ -42,6 +42,9 @@
config.active_support.escape_html_entities_in_json = true
+ config.app_middleware.delete
'ActiveRecord::ConnectionAdapters::ConnectionManagement'
+ config.app_middleware.delete 'ActiveRecord::QueryCache'
+
config.middleware.use 'PerRequestCache'
config.generators do |g|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/boot.rb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/boot.rb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/boot.rb 2015-03-06
10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/boot.rb 2015-03-16
15:05:29.000000000 +0100
@@ -39,7 +39,6 @@
if File.exists? ENV['BUNDLE_GEMFILE']
require 'bundler/setup'
require 'active_model/railtie'
- require 'active_job/railtie'
require 'action_controller/railtie'
require 'action_view/railtie'
require 'sprockets/railtie'
@@ -48,7 +47,11 @@
Bundler.require(*Rails.groups)
else
gem 'rails', version: '~> 4.2.0'
- require 'rails/all'
+ require 'active_model/railtie'
+ require 'action_controller/railtie'
+ require 'action_view/railtie'
+ require 'sprockets/railtie'
+ require 'rails/test_unit/railtie'
gem 'puma', version: '~> 2.11.1'
require 'puma'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/database.yml
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/database.yml
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/database.yml
2015-03-06 10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/database.yml
1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-#======================================================================
-# HA Web Konsole (Hawk)
-# --------------------------------------------------------------------
-# A web-based GUI for managing and monitoring the
-# Pacemaker High-Availability cluster resource manager
-#
-# Copyright (c) 2009-2013 SUSE LLC, All Rights Reserved.
-#
-# Author: Tim Serong <tser...@suse.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like. Any license provided herein, whether implied or
-# otherwise, applies only to this software file. Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#
-#======================================================================
-
-default: &default
- adapter: sqlite3
- pool: 5
- timeout: 5000
-
-development:
- <<: *default
- database: db/development.sqlite3
-
-test:
- <<: *default
- database: db/test.sqlite3
-
-production:
- <<: *default
- database: db/production.sqlite3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/puma.rb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/puma.rb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/puma.rb 2015-03-06
10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/puma.rb 2015-03-16
14:33:35.000000000 +0100
@@ -38,8 +38,8 @@
LISTEN = ENV["HAWK_LISTEN"] || "0.0.0.0"
PORT = ENV["HAWK_PORT"] || "7630"
-KEY = ENV["HAWK_KEY"] || "/etc/ssl/certs/hawk.key"
-CERT = ENV["HAWK_CERT"] || "/etc/ssl/certs/hawk.pem"
+KEY = ENV["HAWK_KEY"] || "/etc/hawk/hawk.key"
+CERT = ENV["HAWK_CERT"] || "/etc/hawk/hawk.pem"
directory ROOT
environment ENVIRONMENT
@@ -59,10 +59,11 @@
pidfile File.join(ROOT, "tmp", "pids", "puma.pid")
state_path File.join(ROOT, "tmp", "pids", "puma.state")
-ssl_bind LISTEN, PORT, {
- cert: CERT,
- key: KEY
-}
+if ENVIRONMENT == "development"
+ bind "tcp://#{LISTEN}:#{PORT}"
+else
+ ssl_bind LISTEN, PORT, { cert: CERT, key: KEY }
+end
[
"tmp/pids",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1425634715.4717cb9/hawk/db/seeds.rb
new/hawk-0.7.0+git.1426595507.808c2cc/hawk/db/seeds.rb
--- old/hawk-0.7.0+git.1425634715.4717cb9/hawk/db/seeds.rb 2015-03-06
10:39:32.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/hawk/db/seeds.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-#======================================================================
-# HA Web Konsole (Hawk)
-# --------------------------------------------------------------------
-# A web-based GUI for managing and monitoring the
-# Pacemaker High-Availability cluster resource manager
-#
-# Copyright (c) 2009-2013 SUSE LLC, All Rights Reserved.
-#
-# Author: Tim Serong <tser...@suse.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like. Any license provided herein, whether implied or
-# otherwise, applies only to this software file. Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#
-#======================================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1425634715.4717cb9/rpm/sysconfig.hawk
new/hawk-0.7.0+git.1426595507.808c2cc/rpm/sysconfig.hawk
--- old/hawk-0.7.0+git.1425634715.4717cb9/rpm/sysconfig.hawk 2015-03-06
10:39:33.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/rpm/sysconfig.hawk 2015-03-16
14:33:35.000000000 +0100
@@ -44,15 +44,15 @@
## Path: Cluster/Hawk
## Description: SSL key used by the web server
## Type: string
-## Default: /etc/ssl/certs/hawk.key
+## Default: /etc/hawk/hawk.key
## ServiceRestart: hawk
# Configures an SSL key that the Hawk web server presents.
-HAWK_KEY="/etc/ssl/certs/hawk.key"
+HAWK_KEY="/etc/hawk/hawk.key"
## Path: Cluster/Hawk
## Description: SSL certificate used by the web server
-## Type: integer
-## Default: /etc/ssl/certs/hawk.pem
+## Type: string
+## Default: /etc/hawk/hawk.pem
## ServiceRestart: hawk
# Configures an SSL certificate that the Hawk web server presents.
-HAWK_CERT="/etc/ssl/certs/hawk.pem"
+HAWK_CERT="/etc/hawk/hawk.pem"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1425634715.4717cb9/scripts/hawk.service.in
new/hawk-0.7.0+git.1426595507.808c2cc/scripts/hawk.service.in
--- old/hawk-0.7.0+git.1425634715.4717cb9/scripts/hawk.service.in
2015-03-06 10:39:33.000000000 +0100
+++ new/hawk-0.7.0+git.1426595507.808c2cc/scripts/hawk.service.in
2015-03-16 14:33:35.000000000 +0100
@@ -17,10 +17,12 @@
Environment="HAWK_WORKERS=3"
Environment="HAWK_LISTEN=0.0.0.0"
Environment="HAWK_PORT=7630"
-Environment="HAWK_KEY=/etc/ssl/certs/hawk.pem"
-Environment="HAWK_CERT=/etc/ssl/certs/hawk.key"
+Environment="HAWK_KEY=/etc/hawk/hawk.pem"
+Environment="HAWK_CERT=/etc/hawk/hawk.key"
EnvironmentFile=-/etc/sysconfig/hawk
+# Run ExecStartPre with root-permissions
+PermissionsStartOnly=true
ExecStartPre=@WWW_BASE@/hawk/bin/generate-ssl-cert
ExecStart=/usr/bin/puma -C @WWW_BASE@/hawk/config/puma.rb
ExecStop=/usr/bin/pumactl -S @WWW_BASE@/hawk/tmp/pids/puma.state stop
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
