Hello community,
here is the log from the commit of package hawk for openSUSE:Factory checked in
at 2015-03-09 10:09:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05
18:17:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2015-03-09
10:09:42.000000000 +0100
@@ -1,0 +2,22 @@
+Fri Mar 6 09:39:57 UTC 2015 - kgronl...@suse.com
+
+- Update to git#4717cb9
+ - Misc: Correct path to SSL certificate
+
+-------------------------------------------------------------------
+Thu Mar 5 14:11:29 UTC 2015 - kgronl...@suse.com
+
+- Update to git#ecf0fd4
+ - Build: Allow bundling web-console 2.1.0
+
+-------------------------------------------------------------------
+Thu Mar 5 07:29:49 UTC 2015 - kgronl...@suse.com
+
+- Update to git#062915d
+ - Fixed path for pregenerating ssl certs
+ - Build: Add a fillup template for hawk
+ - Integrated puma as a lighttpd replacement
+ - Moved monitor functionality into a controller
+ - Build: Update spec file
+
+-------------------------------------------------------------------
Old:
----
hawk-0.7.0+git.1424349779.eb17098.tar.bz2
New:
----
hawk-0.7.0+git.1425634715.4717cb9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk.spec ++++++
--- /var/tmp/diff_new_pack.WdBlxo/_old 2015-03-09 10:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.WdBlxo/_new 2015-03-09 10:09:43.000000000 +0100
@@ -47,7 +47,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 0.7.0+git.1424349779.eb17098
+Version: 0.7.0+git.1425634715.4717cb9
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
@@ -62,7 +62,6 @@
Requires: graphviz
Requires: graphviz-gd
Requires: hawk-templates >= %{version}-%{release}
-Requires: lighttpd >= 1.4.20
Requires: pacemaker >= 1.1.8
%if 0%{?fedora_version} >= 19
Requires: rubypick
@@ -81,7 +80,6 @@
%endif
%else
Requires: iproute
-Requires: lighttpd-fastcgi
BuildRequires: pacemaker-libs-devel
%endif
@@ -98,9 +96,6 @@
BuildRequires: rubygem(%{hawk_ruby_abi}:tilt) >= 1.4
BuildRequires: rubygem(%{hawk_ruby_abi}:web-console) >= 2.0
%if 0%{?bundle_gems}
-%if 0%{?suse_version} == 1110
-BuildRequires: ruby-fcgi
-%endif
%else
# SLES bundles all this stuff at build time, other distros just
# use runtime dependencies.
@@ -111,10 +106,6 @@
Requires: rubygem(%{hawk_ruby_abi}:rake) >= 10.4
Requires: rubygem(%{hawk_ruby_abi}:sprockets) >= 2.12
Requires: rubygem(%{hawk_ruby_abi}:tilt) >= 1.4
-# Not using this right now (seems to be unavailable due to ruby 2.0 --> 2.1
migration on Factory)
-#%%if 0%{?suse_version}
-#Requires: rubygem-ruby-fcgi
-#%%endif
%endif
BuildRequires: glib2-devel
@@ -151,15 +142,6 @@
# copy of GPL
cp COPYING %{buildroot}%{www_base}/hawk/
%if 0%{?bundle_gems}
-# evil magic to get ruby-fcgi into the vendor directory
-for f in $(rpm -ql ruby-fcgi|grep %{vendor_ruby}); do
- # gives something simliar to:
- # /usr/lib64/ruby/vendor_ruby/1.8/fcgi.rb
- # /usr/lib64/ruby/vendor_ruby/1.8/x86_64-linux/fcgi.so
- r=$(echo $f | sed 's/.*%{vendor_ruby}\/[^\/]*\///')
- mkdir -p %{buildroot}%{www_base}/hawk/vendor/$(dirname $r)
- cp $f %{buildroot}%{www_base}/hawk/vendor/$r
-done
# get rid of gem sample and test cruft
rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/doc
rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/examples
@@ -221,8 +203,6 @@
%postun
%service_del_postun hawk.service
-%triggerin -- lighttpd
-%restart_on_update hawk
%endif
%files -f %{name}.lang
++++++ _service ++++++
--- /var/tmp/diff_new_pack.WdBlxo/_old 2015-03-09 10:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.WdBlxo/_new 2015-03-09 10:09:43.000000000 +0100
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">0.7.0+git.%ct.%h</param>
- <param name="revision">eb17098</param>
+ <param name="revision">4717cb9</param>
</service>
<service name="recompress" mode="disabled">
++++++ hawk-0.7.0+git.1424349779.eb17098.tar.bz2 ->
hawk-0.7.0+git.1425634715.4717cb9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1424349779.eb17098/Makefile
new/hawk-0.7.0+git.1425634715.4717cb9/Makefile
--- old/hawk-0.7.0+git.1424349779.eb17098/Makefile 2015-02-19
16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/Makefile 2015-03-06
10:39:32.000000000 +0100
@@ -30,13 +30,16 @@
#======================================================================
GIT = $(shell which git 2>/dev/null)
+
# This gives current changeset hash (7 digits). This is the reliable
# indicator of which version you've got.
BUILD_VERSION = $(shell git log --pretty="format:%h" -n 1)
+
# This gets the version from the most recent tag in the form "hawk-x.y.z"
# as a best-effort human-readable version number (e.g. 0.1.1 or 0.1.2-rc1).
# But to really know what you're running, you need the changeset hash above.
BUILD_TAG = $(shell git describe --tags --abbrev=0 | sed -e 's/^hawk-//')
+
ifeq "$(BUILD_TAG)" ""
BUILD_TAG = 0.0.0
endif
@@ -66,7 +69,7 @@
BINDIR = /usr/bin
SBINDIR = /usr/sbin
-all: scripts/hawk.$(INIT_STYLE) scripts/hawk.service hawk/config/lighttpd.conf
tools/hawk_chkpwd tools/hawk_monitor tools/hawk_invoke
+all: scripts/hawk.$(INIT_STYLE) scripts/hawk.service tools/hawk_chkpwd
tools/hawk_monitor tools/hawk_invoke
(cd hawk; \
TEXTDOMAIN=hawk rake gettext:pack && \
if $(BUNDLE_GEMS) ; then \
@@ -122,7 +125,6 @@
-find hawk/vendor -name '*bak' -o -name '*~' -o -name '#*#' | xargs rm
cp -a hawk/* $(DESTDIR)$(WWW_BASE)/hawk
-cp -a hawk/.bundle $(DESTDIR)$(WWW_BASE)/hawk
- rm $(DESTDIR)$(WWW_BASE)/hawk/config/lighttpd.conf.in
-chown -R hacluster.haclient $(DESTDIR)$(WWW_BASE)/hawk/log
-chown -R hacluster.haclient $(DESTDIR)$(WWW_BASE)/hawk/tmp
-chmod g+w $(DESTDIR)$(WWW_BASE)/hawk/tmp/home
@@ -139,15 +141,13 @@
-chmod u+s $(DESTDIR)/usr/sbin/hawk_invoke
install -D -m 0755 tools/hawk_monitor $(DESTDIR)/usr/sbin/hawk_monitor
- ln -sf /usr/sbin/hawk_monitor $(DESTDIR)$(WWW_BASE)/hawk/public/monitor
# TODO(should): Verify this is really clean (it won't get rid of .mo files,
# for example
clean:
rm -rf hawk/vendor
- rm -rf hawk/tmp
- rm -rf hawk/log
- rm -f hawk/config/lighttpd.conf
+ rm -rf hawk/tmp/*
+ rm -rf hawk/log/*
rm -f scripts/hawk.{suse,redhat,service}
rm -f tools/hawk_chkpwd
rm -f tools/hawk_monitor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/attributes/default.rb
new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/attributes/default.rb
---
old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/attributes/default.rb
1970-01-01 01:00:00.000000000 +0100
+++
new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/attributes/default.rb
2015-03-06 10:39:32.000000000 +0100
@@ -0,0 +1,24 @@
+#
+# Cookbook Name:: hawk
+# Attributes:: default
+#
+# Copyright 2014, SUSE LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+default["hawk"]["zypper"]["enabled"] = true
+default["hawk"]["zypper"]["alias"] = "network-ha-clustering"
+default["hawk"]["zypper"]["title"] = "Network HA Clustering"
+default["hawk"]["zypper"]["repo"] =
"http://download.opensuse.org/repositories/network:/ha-clustering:/Factory/openSUSE_#{node["platform_version"]}/";
+default["hawk"]["zypper"]["key"] =
"#{node["hawk"]["zypper"]["repo"]}repodata/repomd.xml.key"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/attributes/webui.rb
new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/attributes/webui.rb
---
old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/attributes/webui.rb
2015-02-19 16:07:38.000000000 +0100
+++
new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/attributes/webui.rb
2015-03-06 10:39:32.000000000 +0100
@@ -20,6 +20,7 @@
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",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/metadata.rb
new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/metadata.rb
--- old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/metadata.rb
2015-02-19 16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/metadata.rb
2015-03-06 10:39:32.000000000 +0100
@@ -6,6 +6,7 @@
long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))
version "0.0.1"
depends "ruby"
+depends "zypper"
recipe "hawk", "Installs/Configures hawk"
supports "suse", ">= 11.3"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/recipes/node.rb
new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/recipes/node.rb
--- old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/recipes/node.rb
2015-02-19 16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/recipes/node.rb
2015-03-06 10:39:32.000000000 +0100
@@ -63,6 +63,23 @@
action :run
end
+case node["platform_family"]
+when "suse"
+ include_recipe "zypper"
+
+ zypper_repository node["hawk"]["zypper"]["alias"] do
+ uri node["hawk"]["zypper"]["repo"]
+ key node["hawk"]["zypper"]["key"]
+ title node["hawk"]["zypper"]["title"]
+
+ action :add
+
+ only_if do
+ node["hawk"]["zypper"]["enabled"]
+ end
+ end
+end
+
node["hawk"]["node"]["packages"].each do |name|
package name do
action :install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/recipes/webui.rb
new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/recipes/webui.rb
--- old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/recipes/webui.rb
2015-02-19 16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/recipes/webui.rb
2015-03-06 10:39:32.000000000 +0100
@@ -19,6 +19,23 @@
include_recipe "ruby"
+case node["platform_family"]
+when "suse"
+ include_recipe "zypper"
+
+ zypper_repository node["hawk"]["zypper"]["alias"] do
+ uri node["hawk"]["zypper"]["repo"]
+ key node["hawk"]["zypper"]["key"]
+ title node["hawk"]["zypper"]["title"]
+
+ action :add
+
+ only_if do
+ node["hawk"]["zypper"]["enabled"]
+ end
+ end
+end
+
node["hawk"]["webui"]["packages"].each do |name|
package name do
action :install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/templates/default/systemd.service.erb
new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/templates/default/systemd.service.erb
---
old/hawk-0.7.0+git.1424349779.eb17098/chef/cookbooks/hawk/templates/default/systemd.service.erb
2015-02-19 16:07:38.000000000 +0100
+++
new/hawk-0.7.0+git.1425634715.4717cb9/chef/cookbooks/hawk/templates/default/systemd.service.erb
2015-03-06 10:39:32.000000000 +0100
@@ -1,5 +1,6 @@
[Unit]
-Description=Hawk Development
+Description=HA Web Konsole Development
+After=network.target
[Service]
Type=simple
@@ -9,15 +10,21 @@
User=vagrant
Group=users
-PIDFile=/vagrant/hawk/tmp/pids/server.pid
WorkingDirectory=/vagrant/hawk
-Environment=RAILS_ENV=development
+Environment="HAWK_ENV=development"
+Environment="HAWK_THREADS=16"
+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"
+ExecStartPre=/vagrant/hawk/bin/generate-ssl-cert
ExecStartPre=/vagrant/hawk/bin/bundle
-ExecStart=/vagrant/hawk/bin/rails s -b 0.0.0.0 -p 3000 -e development
--debugger
-ExecStop=/usr/bin/kill -INT $MAINPID
-ExecReload=/usr/bin/kill -HUP $MAINPID
+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
[Install]
WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1424349779.eb17098/hawk/Gemfile
new/hawk-0.7.0+git.1425634715.4717cb9/hawk/Gemfile
--- old/hawk-0.7.0+git.1424349779.eb17098/hawk/Gemfile 2015-02-19
16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/hawk/Gemfile 2015-03-06
10:39:32.000000000 +0100
@@ -43,13 +43,14 @@
#
gem 'rails', '~> 4.2.0'
+gem 'puma', '~> 2.11.1'
gem 'fast_gettext', '~> 0.9.2'
gem 'gettext_i18n_rails', '~> 1.2.0'
gem 'sprockets', '~> 2.12.3'
gem 'tilt', '~> 1.4.1'
group :development do
- gem 'web-console', '~> 2.0.0'
+ gem 'web-console', '>= 2.0.0', '< 2.2.0'
gem 'spring', '~> 1.3.2'
gem 'quiet_assets', '~> 1.1.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1424349779.eb17098/hawk/Rakefile
new/hawk-0.7.0+git.1425634715.4717cb9/hawk/Rakefile
--- old/hawk-0.7.0+git.1424349779.eb17098/hawk/Rakefile 2015-02-19
16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/hawk/Rakefile 2015-03-06
10:39:32.000000000 +0100
@@ -29,5 +29,12 @@
#
#======================================================================
+FileUtils.mkdir_p [
+ 'tmp/pids',
+ 'tmp/sessions',
+ 'tmp/sockets',
+ 'tmp/cache'
+]
+
require File.expand_path('../config/application', __FILE__)
Rails.application.load_tasks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/hawk/app/controllers/main_controller.rb
new/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/controllers/main_controller.rb
---
old/hawk-0.7.0+git.1424349779.eb17098/hawk/app/controllers/main_controller.rb
2015-02-19 16:07:38.000000000 +0100
+++
new/hawk-0.7.0+git.1425634715.4717cb9/hawk/app/controllers/main_controller.rb
2015-03-06 10:39:32.000000000 +0100
@@ -78,6 +78,23 @@
@title = _('Cluster Status')
end
+ def monitor
+ require "open3"
+
+ result = Open3.popen3("/usr/sbin/hawk_monitor") do |i, o|
+ o.read
+ end
+
+ headers, body = result.split("\n\n", 2)
+
+ headers.split("\n").each do |header|
+ name, value = header.split(":")
+ response.headers[name] = value.strip
+ end
+
+ render json: body
+ end
+
# TODO(should): Node ops, resource ops, arguably belong in separate
# node and resource controllers/models. Note this would change the
# class hierarchy for primitve, group, etc., e.g.:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/hawk/bin/generate-ssl-cert
new/hawk-0.7.0+git.1425634715.4717cb9/hawk/bin/generate-ssl-cert
--- old/hawk-0.7.0+git.1424349779.eb17098/hawk/bin/generate-ssl-cert
2015-02-19 16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/hawk/bin/generate-ssl-cert
2015-03-06 10:39:32.000000000 +0100
@@ -30,32 +30,40 @@
#
#======================================================================
+#
# Generate a self-signed SSL certificate if necessary. Will not
# generate certificate if one already exists, so administrator can
# install a "real" certificate by simply replacing the generated
-# (combined) one at /etc/lighttpd/certs/hawk-combined.pem
+# one at /etc/ssl/certs/hawk.pem
#
# NOTE: This is essentially a heavily stripped-back shell version
# of the more generic check-create-certificate.pl script from WebYaST.
# If this latter script becomes generally available, we should prefer
# using it over this.
+#
openssl_bin=/usr/bin/openssl
c_rehash_bin=/usr/bin/c_rehash
-cert_file=/etc/lighttpd/certs/hawk.pem
-cert_key_file=/etc/lighttpd/certs/hawk.key
-combined_cert_file=/etc/lighttpd/certs/hawk-combined.pem
+
+cert_key_file=/etc/ssl/certs/hawk.key
+[ -n "$HAWK_KEY" ] && cert_key_file=$HAWK_KEY
+
+cert_file=/etc/ssl/certs/hawk.pem
+[ -n "$HAWK_CERT" ] && cert_file=$HAWK_CERT
+
log_file=$(dirname $0)/../log/certificate.log
-[ -e "$combined_cert_file" ] && exit 0
+[ -e "$cert_key_file" ] && [ -e $cert_file ] && exit 0
echo "No SSL certificate found. Creating one now."
-mkdir -p $(dirname $combined_cert_file)
+mkdir -p $(dirname $cert_key_file)
+mkdir -p $(dirname $cert_file)
old_mask=$(umask)
umask 177
CN=$(hostname -f)
+
[ -z "$CN" ] && CN=$(hostname)
[ -z "$CN" ] && CN=localhost
@@ -63,6 +71,7 @@
[req]
distinguished_name = user_dn
prompt = no
+
[user_dn]
commonName=$CN
emailAddress=root@$CN
@@ -73,10 +82,9 @@
rc=$?
if [ $rc -eq 0 ]; then
- cat $cert_key_file $cert_file > $combined_cert_file
- [ -x "$c_rehash_bin" ] && $c_rehash_bin $(dirname $combined_cert_file)
>/dev/null 2>&1
+ [ -x "$c_rehash_bin" ] && $c_rehash_bin $(dirname $cert_file) >/dev/null 2>&1
else
- echo "Could not generate certificate. Please see $log_file for details"
+ echo "Could not generate certificate. Please see $log_file for details"
fi
umask $old_mask
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/hawk/config/boot.rb
new/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/boot.rb
--- old/hawk-0.7.0+git.1424349779.eb17098/hawk/config/boot.rb 2015-02-19
16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/boot.rb 2015-03-06
10:39:32.000000000 +0100
@@ -50,6 +50,9 @@
gem 'rails', version: '~> 4.2.0'
require 'rails/all'
+ gem 'puma', version: '~> 2.11.1'
+ require 'puma'
+
gem 'fast_gettext', version: '~> 0.9.2'
require 'fast_gettext'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/hawk/config/lighttpd.conf.in
new/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/lighttpd.conf.in
--- old/hawk-0.7.0+git.1424349779.eb17098/hawk/config/lighttpd.conf.in
2015-02-19 16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/lighttpd.conf.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,475 +0,0 @@
-#######################################################################
-##
-## Some Variable definition which will make chrooting easier.
-##
-## if you add a variable here. Add the corresponding variable in the
-## chroot example aswell.
-##
-
-#var.log_root = "/var/log/lighttpd"
-#var.server_root = "@WWW_BASE@"
-var.state_dir = "/var/run"
-#var.home_dir = "/var/lib/lighttpd"
-#var.conf_dir = "/etc/lighttpd"
-
-##
-## run the server chrooted.
-##
-## This requires root permissions during startup.
-##
-## If you run Chrooted set the the variables to directories relative to
-## the chroot dir.
-##
-## example chroot configuration:
-##
-#var.log_root = "/logs"
-#var.server_root = "/"
-#var.state_dir = "/run"
-#var.home_dir = "/lib/lighttpd"
-#var.vhosts_dir = "/vhosts"
-#var.conf_dir = "/etc"
-#
-#server.chroot = "@WWW_BASE@"
-
-##
-## Some additional variables to make the configuration easier
-##
-
-##
-## Base directory for all virtual hosts
-##
-## used in:
-## conf.d/evhost.conf
-## conf.d/simple_vhost.conf
-## vhosts.d/vhosts.template
-##
-#var.vhosts_dir = server_root + "/vhosts"
-
-##
-## Cache for mod_compress
-##
-## used in:
-## conf.d/compress.conf
-##
-#var.cache_dir = "/var/cache/lighttpd"
-
-##
-## Base directory for sockets.
-##
-## used in:
-## conf.d/fastcgi.conf
-## conf.d/scgi.conf
-##
-#var.socket_dir = home_dir + "/sockets"
-
-##
-#######################################################################
-
-#######################################################################
-##
-## Load the modules.
-#include "modules.conf"
-
-##
-#######################################################################
-
-#######################################################################
-##
-## Basic Configuration
-## ---------------------
-##
-#server.port = 80
-server.port = 7630
-
-ssl.engine = "enable"
-ssl.pemfile = "/etc/lighttpd/certs/hawk-combined.pem"
-
-##
-## Use IPv6?
-##
-#server.use-ipv6 = "enable"
-
-##
-## bind to a specific IP
-##
-#server.bind = "localhost"
-
-##
-## Run as a different username/groupname.
-## This requires root permissions during startup.
-##
-server.username = "hacluster"
-server.groupname = "haclient"
-
-##
-## enable core files.
-##
-#server.core-files = "disable"
-
-##
-## Document root
-##
-#server.document-root = server_root + "/htdocs"
-
-##
-## The value for the "Server:" response field.
-##
-## It would be nice to keep it at "lighttpd".
-##
-#server.tag = "lighttpd"
-
-##
-## store a pid file
-##
-server.pid-file = state_dir + "/hawk.pid"
-
-server.modules = ( "mod_rewrite", "mod_access", "mod_accesslog",
"mod_cgi", "mod_fastcgi", "mod_compress", "mod_expire" )
-
-server.error-handler-404 = "/dispatch.fcgi"
-server.document-root = "@WWW_BASE@/hawk/public/"
-
-server.errorlog = "@WWW_BASE@/hawk/log/lighttpd.error.log"
-accesslog.filename = "@WWW_BASE@/hawk/log/lighttpd.access.log"
-
-# if this is in, it seems to break /rails/info/properties
-#url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
-# ...and this is wrong if the default action is main!
-#url.rewrite = ( "^/$" => "index.html" )
-
-compress.filetype = ( "text/plain", "text/html", "text/css",
"text/javascript" )
-compress.cache-dir = "@WWW_BASE@/hawk/tmp/cache"
-
-expire.url = ( "/favicon.ico" => "access 3 days",
- "/images/" => "access 3 days",
- "/stylesheets/" => "access 3 days",
- "/javascripts/" => "access 3 days" )
-
-# Change *-procs to 2 if you need to use Upload Progress or other tasks that
-# *need* to execute a second request while the first is still pending.
-fastcgi.server = ( ".fcgi" => ( "localhost" => (
- "min-procs" => 1,
- "max-procs" => 2,
- "socket" => "@WWW_BASE@/hawk/tmp/sockets/fcgi.socket",
- "bin-path" => "@WWW_BASE@/hawk/public/dispatch.fcgi",
- "bin-environment" => ( "RAILS_ENV" => "production" )
-) ) )
-
-cgi.assign = ( "/monitor" => "" )
-
-mimetype.assign = (
- ".css" => "text/css",
- ".gif" => "image/gif",
- ".htm" => "text/html",
- ".html" => "text/html",
- ".jpeg" => "image/jpeg",
- ".jpg" => "image/jpeg",
- ".js" => "text/javascript",
- ".png" => "image/png",
- ".swf" => "application/x-shockwave-flash",
- ".txt" => "text/plain"
-)
-
-# Making sure file uploads above 64k always work when using IE or Safari
-# For more information, see http://trac.lighttpd.net/trac/ticket/360
-$HTTP["useragent"] =~ "^(.*MSIE.*)|(.*AppleWebKit.*)$" {
- server.max-keep-alive-requests = 0
-}
-
-##
-#######################################################################
-
-#######################################################################
-##
-## Logging Options
-## ------------------
-##
-## all logging options can be overwritten per vhost.
-##
-## Path to the error log file
-##
-#server.errorlog = log_root + "/error.log"
-
-##
-## If you want to log to syslog you have to unset the
-## server.errorlog setting and uncomment the next line.
-##
-#server.errorlog-use-syslog = "enable"
-
-##
-## Access log config
-##
-#include "conf.d/access_log.conf"
-
-##
-## The debug options are moved into their own file.
-## see conf.d/debug.conf for various options for request debugging.
-##
-#include "conf.d/debug.conf"
-
-##
-#######################################################################
-
-#######################################################################
-##
-## Tuning/Performance
-## --------------------
-##
-## corresponding documentation:
-## http://www.lighttpd.net/documentation/performance.html
-##
-## set the event-handler (read the performance section in the manual)
-##
-## possible options on linux are:
-##
-## select
-## poll
-## linux-sysepoll
-##
-## linux-sysepoll is recommended on kernel 2.6.
-##
-server.event-handler = "linux-sysepoll"
-
-##
-## The basic network interface for all platforms at the syscalls read()
-## and write(). Every modern OS provides its own syscall to help network
-## servers transfer files as fast as possible
-##
-## linux-sendfile - is recommended for small files.
-## writev - is recommended for sending many large files
-##
-server.network-backend = "linux-sendfile"
-
-##
-## As lighttpd is a single-threaded server, its main resource limit is
-## the number of file descriptors, which is set to 1024 by default (on
-## most systems).
-##
-## If you are running a high-traffic site you might want to increase this
-## limit by setting server.max-fds.
-##
-## Changing this setting requires root permissions on startup. see
-## server.username/server.groupname.
-##
-## By default lighttpd would not change the operation system default.
-## But setting it to 2048 is a better default for busy servers.
-##
-server.max-fds = 2048
-
-##
-## Stat() call caching.
-##
-## lighttpd can utilize FAM/Gamin to cache stat call.
-##
-## possible values are:
-## disable, simple or fam.
-##
-server.stat-cache-engine = "simple"
-
-##
-## Fine tuning for the request handling
-##
-## max-connections == max-fds/2 (maybe /3)
-## means the other file handles are used for fastcgi/files
-##
-server.max-connections = 1024
-
-##
-## How many seconds to keep a keep-alive connection open,
-## until we consider it idle.
-##
-## Default: 5
-##
-#server.max-keep-alive-idle = 5
-
-##
-## How many keep-alive requests until closing the connection.
-##
-## Default: 16
-##
-#server.max-keep-alive-requests = 16
-
-##
-## Maximum size of a request in kilobytes.
-## By default it is unlimited (0).
-##
-## Uploads to your server cant be larger than this value.
-##
-#server.max-request-size = 0
-
-##
-## Time to read from a socket before we consider it idle.
-##
-## Default: 60
-##
-#server.max-read-idle = 60
-
-##
-## Time to write to a socket before we consider it idle.
-##
-## Default: 360
-##
-#server.max-write-idle = 360
-
-##
-## Traffic Shaping
-## -----------------
-##
-## see /usr/share/doc/lighttpd/traffic-shaping.txt
-##
-## Values are in kilobyte per second.
-##
-## Keep in mind that a limit below 32kB/s might actually limit the
-## traffic to 32kB/s. This is caused by the size of the TCP send
-## buffer.
-##
-## per server:
-##
-#server.kbytes-per-second = 128
-
-##
-## per connection:
-##
-#connection.kbytes-per-second = 32
-
-##
-#######################################################################
-
-#######################################################################
-##
-## Filename/File handling
-## ------------------------
-
-##
-## files to check for if .../ is requested
-## index-file.names = ( "index.php", "index.rb", "index.html",
-## "index.htm", "default.htm" )
-##
-index-file.names += (
- "index.xhtml", "index.html", "index.htm", "default.htm", "index.php"
-)
-
-##
-## deny access the file-extensions
-##
-## ~ is for backupfiles from vi, emacs, joe, ...
-## .inc is often used for code includes which should in general not be part
-## of the document-root
-url.access-deny = ( "~", ".inc" )
-
-##
-## disable range requests for pdf files
-## workaround for a bug in the Acrobat Reader plugin.
-##
-$HTTP["url"] =~ "\.pdf$" {
- server.range-requests = "disable"
-}
-
-##
-## url handling modules (rewrite, redirect)
-##
-#url.rewrite = ( "^/$" => "/server-status" )
-#url.redirect = ( "^/wishlist/(.+)" =>
"http://www.example.com/$1"; )
-
-##
-## both rewrite/redirect support back reference to regex conditional using %n
-##
-#$HTTP["host"] =~ "^www\.(.*)" {
-# url.redirect = ( "^/(.*)" => "http://%1/$1"; )
-#}
-
-##
-## which extensions should not be handle via static-file transfer
-##
-## .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
-##
-static-file.exclude-extensions = ( ".php", ".pl", ".fcgi", ".scgi" )
-
-##
-## error-handler for status 404
-##
-#server.error-handler-404 = "/error-handler.html"
-#server.error-handler-404 = "/error-handler.php"
-
-##
-## Format: <errorfile-prefix><status-code>.html
-## -> ..../status-404.html for 'File not found'
-##
-#server.errorfile-prefix = "@WWW_BASE@/htdocs/errors/status-"
-
-##
-## mimetype mapping
-##
-#include "conf.d/mime.conf"
-
-##
-## directory listing configuration
-##
-#include "conf.d/dirlisting.conf"
-
-##
-## Should lighttpd follow symlinks?
-##
-server.follow-symlink = "enable"
-
-##
-## force all filenames to be lowercase?
-##
-#server.force-lowercase-filenames = "disable"
-
-##
-## defaults to /var/tmp as we assume it is a local harddisk
-##
-server.upload-dirs = ( "/var/tmp" )
-
-##
-#######################################################################
-
-
-#######################################################################
-##
-## SSL Support
-## -------------
-##
-## To enable SSL for the whole server you have to provide a valid
-## certificate and have to enable the SSL engine.::
-##
-## ssl.engine = "enable"
-## ssl.pemfile = "/path/to/server.pem"
-##
-## The HTTPS protocol does not allow you to use name-based virtual
-## hosting with SSL. If you want to run multiple SSL servers with
-## one lighttpd instance you must use IP-based virtual hosting: ::
-##
-## $SERVER["socket"] == "10.0.0.1:443" {
-## ssl.engine = "enable"
-## ssl.pemfile = "/etc/ssl/private/www.example.com.pem"
-## server.name = "www.example.com"
-##
-## server.document-root = "@WWW_BASE@/vhosts/example.com/www/"
-## }
-##
-
-## If you have a .crt and a .key file, cat them together into a
-## single PEM file:
-## $ cat /etc/ssl/private/lighttpd.key /etc/ssl/certs/lighttpd.crt \
-## > /etc/ssl/private/lighttpd.pem
-##
-#ssl.pemfile = "/etc/ssl/private/lighttpd.pem"
-
-##
-## optionally pass the CA certificate here.
-##
-##
-#ssl.ca-file = ""
-
-##
-#######################################################################
-
-#######################################################################
-##
-## custom includes like vhosts.
-##
-#include "conf.d/config.conf"
-#include_shell "cat /etc/lighttpd/vhosts.d/*.conf"
-##
-#######################################################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/hawk/config/puma.rb
new/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/puma.rb
--- old/hawk-0.7.0+git.1424349779.eb17098/hawk/config/puma.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/puma.rb 2015-03-06
10:39:32.000000000 +0100
@@ -0,0 +1,74 @@
+#======================================================================
+# 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.
+#
+#======================================================================
+
+ROOT = File.expand_path("../../", __FILE__)
+ENVIRONMENT = ENV["HAWK_ENV"] || "production"
+
+THREADS = ENV["HAWK_THREADS"] || 16
+WORKERS = ENV["HAWK_WORKERS"] || 3
+
+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"
+
+directory ROOT
+environment ENVIRONMENT
+
+tag "hawk"
+
+quiet
+
+daemonize false
+prune_bundler false
+
+threads 0, THREADS
+
+workers WORKERS
+worker_timeout 60
+
+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
+}
+
+[
+ "tmp/pids",
+ "tmp/sessions",
+ "tmp/sockets",
+ "tmp/cache"
+].each do |name|
+ FileUtils.mkdir_p File.join(ROOT, name)
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/hawk/config/routes.rb
new/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/routes.rb
--- old/hawk-0.7.0+git.1424349779.eb17098/hawk/config/routes.rb 2015-02-19
16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/hawk/config/routes.rb 2015-03-06
10:39:32.000000000 +0100
@@ -86,4 +86,5 @@
match '/login' => 'sessions#new', as: :login, via: [:get, :post]
match '/logout' => 'sessions#destroy', as: :logout, via: [:get, :post]
match 'dashboard' => 'dashboard#index', as: :dashboard, via: [:get, :post]
+ get 'monitor' => 'main#monitor', :as => :monitor
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1424349779.eb17098/rpm/hawk.spec
new/hawk-0.7.0+git.1425634715.4717cb9/rpm/hawk.spec
--- old/hawk-0.7.0+git.1424349779.eb17098/rpm/hawk.spec 2015-02-19
16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/rpm/hawk.spec 2015-03-06
10:39:33.000000000 +0100
@@ -16,6 +16,14 @@
#
+%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
@@ -39,7 +47,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 0.7.0+git.1424258458.f83efc0
+Version: 0.7.0+git.1424349779.eb17098
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
@@ -54,14 +62,12 @@
Requires: graphviz
Requires: graphviz-gd
Requires: hawk-templates >= %{version}-%{release}
-Requires: lighttpd >= 1.4.20
Requires: pacemaker >= 1.1.8
-Requires: ruby
%if 0%{?fedora_version} >= 19
Requires: rubypick
BuildRequires: rubypick
%endif
-Requires: rubygem(bundler)
+Requires: rubygem(%{hawk_ruby_abi}:bundler)
%if 0%{?suse_version}
Recommends: graphviz-gnome
Requires: iproute2
@@ -74,40 +80,32 @@
%endif
%else
Requires: iproute
-Requires: lighttpd-fastcgi
BuildRequires: pacemaker-libs-devel
%endif
-BuildRequires: rubygems
-BuildRequires: rubygem(byebug)
-BuildRequires: rubygem(fast_gettext)
-BuildRequires: rubygem(gettext)
-BuildRequires: rubygem(gettext_i18n_rails)
-BuildRequires: rubygem(quiet_assets)
-BuildRequires: rubygem(rails) >= 4
-BuildRequires: rubygem(rake)
-BuildRequires: rubygem(spring)
-BuildRequires: rubygem(sprockets)
-BuildRequires: rubygem(tilt)
-BuildRequires: rubygem(web-console)
+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
%if 0%{?bundle_gems}
-%if 0%{?suse_version} == 1110
-BuildRequires: ruby-fcgi
-%endif
%else
# SLES bundles all this stuff at build time, other distros just
# use runtime dependencies.
-Requires: rubygems
-Requires: rubygem(fast_gettext)
-Requires: rubygem(gettext_i18n_rails)
-Requires: rubygem(rails) >= 4
-Requires: rubygem(rake)
-Requires: rubygem(sprockets)
-Requires: rubygem(tilt)
-# Not using this right now (seems to be unavailable due to ruby 2.0 --> 2.1
migration on Factory)
-#%%if 0%{?suse_version}
-#Requires: rubygem-ruby-fcgi
-#%%endif
+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
%endif
BuildRequires: glib2-devel
@@ -144,15 +142,6 @@
# copy of GPL
cp COPYING %{buildroot}%{www_base}/hawk/
%if 0%{?bundle_gems}
-# evil magic to get ruby-fcgi into the vendor directory
-for f in $(rpm -ql ruby-fcgi|grep %{vendor_ruby}); do
- # gives something simliar to:
- # /usr/lib64/ruby/vendor_ruby/1.8/fcgi.rb
- # /usr/lib64/ruby/vendor_ruby/1.8/x86_64-linux/fcgi.so
- r=$(echo $f | sed 's/.*%{vendor_ruby}\/[^\/]*\///')
- mkdir -p %{buildroot}%{www_base}/hawk/vendor/$(dirname $r)
- cp $f %{buildroot}%{www_base}/hawk/vendor/$r
-done
# get rid of gem sample and test cruft
rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/doc
rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/examples
@@ -214,8 +203,6 @@
%postun
%service_del_postun hawk.service
-%triggerin -- lighttpd
-%restart_on_update hawk
%endif
%files -f %{name}.lang
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-0.7.0+git.1424349779.eb17098/rpm/sysconfig.hawk
new/hawk-0.7.0+git.1425634715.4717cb9/rpm/sysconfig.hawk
--- old/hawk-0.7.0+git.1424349779.eb17098/rpm/sysconfig.hawk 1970-01-01
01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/rpm/sysconfig.hawk 2015-03-06
10:39:33.000000000 +0100
@@ -0,0 +1,58 @@
+## Path: Cluster/Hawk
+## Description: Mode of operation
+## Type: string(production,development,test)
+## Default: production
+## ServiceRestart: hawk
+# Hawk can run in production, development or test mode. Normally, this
+# determines which database is used, but it may also have other
+# implications.
+HAWK_ENV="production"
+
+## Path: Cluster/Hawk
+## Description: Maximum number of threads
+## Type: integer
+## Default: 16
+## ServiceRestart: hawk
+# Sets the maximum number of threads used by the web server.
+HAWK_THREADS="16"
+
+## Path: Cluster/Hawk
+## Description: Maximum number of worker processes
+## Type: integer
+## Default: 3
+## ServiceRestart: hawk
+# Sets the maximum number of separate worker processes spawned by the
+# web server.
+HAWK_WORKERS="3"
+
+## Path: Cluster/Hawk
+## Description: Listen address
+## Type: ip
+## Default: 0.0.0.0
+## ServiceRestart: hawk
+# Network address which Hawk listens to for connections.
+HAWK_LISTEN="0.0.0.0"
+
+## Path: Cluster/Hawk
+## Description: Port
+## Type: integer(0:65565)
+## Default: 7630
+## ServiceRestart: hawk
+# Port which Hawk listens to.
+HAWK_PORT="7630"
+
+## Path: Cluster/Hawk
+## Description: SSL key used by the web server
+## Type: string
+## Default: /etc/ssl/certs/hawk.key
+## ServiceRestart: hawk
+# Configures an SSL key that the Hawk web server presents.
+HAWK_KEY="/etc/ssl/certs/hawk.key"
+
+## Path: Cluster/Hawk
+## Description: SSL certificate used by the web server
+## Type: integer
+## Default: /etc/ssl/certs/hawk.pem
+## ServiceRestart: hawk
+# Configures an SSL certificate that the Hawk web server presents.
+HAWK_CERT="/etc/ssl/certs/hawk.pem"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/scripts/hawk.redhat.in
new/hawk-0.7.0+git.1425634715.4717cb9/scripts/hawk.redhat.in
--- old/hawk-0.7.0+git.1424349779.eb17098/scripts/hawk.redhat.in
2015-02-19 16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/scripts/hawk.redhat.in
2015-03-06 10:39:33.000000000 +0100
@@ -3,17 +3,17 @@
# RedHat system startup script for hawk
#
# Copyright (C) 2010 SUSE LLC
-#
+#
# This library is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or (at
# your option) any later version.
-#
+#
# This library is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
-#
+#
# You should have received a copy of the GNU Lesser General Public License
# along with this library; if not, see <http://www.gnu.org/licenses/>.
#
@@ -36,7 +36,7 @@
# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
LIGHTTPD_BIN=/usr/sbin/lighttpd
-test -x $LIGHTTPD_BIN || { echo "$LIGHTTPD_BIN not installed";
+test -x $LIGHTTPD_BIN || { echo "$LIGHTTPD_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
@@ -67,7 +67,7 @@
case "$1" in
start)
- @WWW_BASE@/hawk/script/generate-ssl-cert || {
+ @WWW_BASE@/hawk/bin/generate-ssl-cert || {
exit 1
}
echo -n "Starting hawk "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/scripts/hawk.service.in
new/hawk-0.7.0+git.1425634715.4717cb9/scripts/hawk.service.in
--- old/hawk-0.7.0+git.1424349779.eb17098/scripts/hawk.service.in
2015-02-19 16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/scripts/hawk.service.in
2015-03-06 10:39:33.000000000 +0100
@@ -1,13 +1,30 @@
[Unit]
-Description=HA Web Konsole (hawk)
+Description=HA Web Konsole
After=network.target
[Service]
-ExecStartPre=@WWW_BASE@/hawk/script/generate-ssl-cert
-ExecStartPre=/usr/sbin/lighttpd -t -f @WWW_BASE@/hawk/config/lighttpd.conf
-ExecStart=/usr/sbin/lighttpd -D -f @WWW_BASE@/hawk/config/lighttpd.conf
-ExecReload=/bin/kill -HUP $MAINPID
+Type=simple
+KillMode=none
+TimeoutSec=300
+
+User=hacluster
+Group=haclient
+
+WorkingDirectory=@WWW_BASE@/hawk
+
+Environment="HAWK_ENV=production"
+Environment="HAWK_THREADS=16"
+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"
+EnvironmentFile=-/etc/sysconfig/hawk
+
+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
+ExecReload=/usr/bin/pumactl -S @WWW_BASE@/hawk/tmp/pids/puma.state restart
[Install]
WantedBy=multi-user.target
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-0.7.0+git.1424349779.eb17098/scripts/hawk.suse.in
new/hawk-0.7.0+git.1425634715.4717cb9/scripts/hawk.suse.in
--- old/hawk-0.7.0+git.1424349779.eb17098/scripts/hawk.suse.in 2015-02-19
16:07:38.000000000 +0100
+++ new/hawk-0.7.0+git.1425634715.4717cb9/scripts/hawk.suse.in 2015-03-06
10:39:33.000000000 +0100
@@ -3,17 +3,17 @@
# SUSE system startup script for hawk
# Copyright (C) 1995--2005 Kurt Garloff, SUSE / Novell Inc.
# Copyright (C) 2009 SUSE LLC
-#
+#
# This library is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or (at
# your option) any later version.
-#
+#
# This library is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
-#
+#
# You should have received a copy of the GNU Lesser General Public License
# along with this library; if not, see <http://www.gnu.org/licenses/>.
#
@@ -24,10 +24,10 @@
# System startup script for hawk
#
# LSB compatible service control script; see http://www.linuxbase.org/spec/
-#
+#
# Note: This template uses functions rc_XXX defined in /etc/rc.status on
# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your
-# script on this template and ensure that it works on non UL based LSB
+# script on this template and ensure that it works on non UL based LSB
# compliant Linux distributions, you either have to provide the rc.status
# functions from UL or change the script to work without them.
# See skeleton.compat for a template that works with other distros as well.
@@ -49,7 +49,7 @@
# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
LIGHTTPD_BIN=/usr/sbin/lighttpd
-test -x $LIGHTTPD_BIN || { echo "$LIGHTTPD_BIN not installed";
+test -x $LIGHTTPD_BIN || { echo "$LIGHTTPD_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
@@ -76,7 +76,7 @@
}
# Source LSB init functions
-# providing start_daemon, killproc, pidofproc,
+# providing start_daemon, killproc, pidofproc,
# log_success_msg, log_failure_msg and log_warning_msg.
# This is currently not used by UnitedLinux based distributions and
# not needed for init scripts for UnitedLinux only. If it is used,
@@ -110,7 +110,7 @@
# 6 - program is not configured
# 7 - program is not running
# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
-#
+#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
# with force-reload (in case signaling is not supported) are
@@ -118,7 +118,7 @@
case "$1" in
start)
- @WWW_BASE@/hawk/script/generate-ssl-cert || {
+ @WWW_BASE@/hawk/bin/generate-ssl-cert || {
rc_failed
rc_status -v
rc_exit
@@ -182,7 +182,7 @@
## signaling, do nothing (!)
echo -n "Reload service hawk "
killproc -HUP -p $PID_FILE $LIGHTTPD_BIN
- rc_status -v
+ rc_status -v
;;
status)
echo -n "Checking for service hawk "
@@ -196,7 +196,7 @@
# 3 - service not running (unused)
# 4 - service status unknown :-(
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
-
+
# NOTE: checkproc returns LSB compliant status values.
/sbin/checkproc -p $PID_FILE $LIGHTTPD_BIN
# NOTE: rc_status knows that we called this init script with
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
