From 47d3ddcb320675911ec4e55eb5823ebbceeb3687 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Mon, 20 Mar 2017 13:23:50 +0000
Subject: Revert "Strip out debian metadata"
This reverts commit 4d9ca84e57dad6746eb0882b91171ccd69298807.
---
Makefile | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 52 insertions(+), 6 deletions(-)
(limited to 'Makefile')
diff --git a/Makefile b/Makefile
index 0ccfd8c..2254496 100644
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,62 @@ man/%.1: bin/%
clean:
$(RM) -r man
+ # Theoretically this will clean up the shebang munging done by the openbsd_tarball task below.
+ if [ -e ./setup.rb ] ; then \
+ ruby ./setup.rb distclean ; \
+ ruby ./setup.rb config ; \
+ ruby ./setup.rb setup ; \
+ ruby ./setup.rb clean ; \
+ fi
$(RM) -r tmp
+ $(RM) -r OpenBSD
+ $(RM) setup.rb
-# NOP task to keep au happy
-release:
- true
distclean: clean
+ if [ -e ./setup.rb ] ; then ruby ./setup.rb distclean ; fi
+ $(RM) setup.rb
+ $(RM) -r OpenBSD
-test:
- ruby -Ilib:test:. test/test_mauve.rb
+test: setup.rb
+ ruby ./setup.rb test
-.PHONY: all clean test distclean release
+setup.rb: /usr/lib/ruby/1.8/setup.rb
+ ln -sf /usr/lib/ruby/1.8/setup.rb .
+
+OpenBSD: OpenBSD/sha256.asc
+
+OpenBSD/sha256: OpenBSD/ruby-mauvealert.tar.gz OpenBSD/ruby-protobuf.tar.gz
+ #
+ # rejig sha256sum to openbsd sha256
+ #
+ $(RM) OpenBSD/sha256
+ cd OpenBSD && sha256sum * | sed -e 's/\([^ ]\+\) \(.*\)$$/SHA256 (\2) = \1/' > sha256
+
+OpenBSD/sha256.asc: OpenBSD/sha256
+ #
+ # Sign it.
+ #
+ gpg --clearsign OpenBSD/sha256
+
+OpenBSD/ruby-mauvealert.tar.gz: all setup.rb
+ mkdir -p tmp/ruby-mauvealert
+ ruby ./setup.rb config ${OPENBSD_SETUP_FLAGS}
+ ruby ./setup.rb setup
+ ruby ./setup.rb install --prefix=tmp/ruby-mauvealert
+ mkdir -p OpenBSD
+ tar -C tmp/ruby-mauvealert -czvf $@ .
+
+OpenBSD/ruby-protobuf.tar.gz:
+ mkdir -p tmp/ruby-protobuf-source
+ git clone https://github.com/macks/ruby-protobuf.git tmp/ruby-protobuf-source
+ cd tmp/ruby-protobuf-source && git checkout -b v0.4.5
+ ln -sf /usr/lib/ruby/1.8/setup.rb tmp/ruby-protobuf-source/
+ cd tmp/ruby-protobuf-source && ruby ./setup.rb config ${OPENBSD_SETUP_FLAGS}
+ cd tmp/ruby-protobuf-source && ruby ./setup.rb setup
+ cd tmp/ruby-protobuf-source && ruby ./setup.rb install --prefix=../ruby-protobuf
+ mkdir -p OpenBSD
+ tar -C tmp/ruby-protobuf -czvf $@ .
+
+.PHONY: all clean openbsd_tarball test distclean OpenBSD
--
cgit v1.2.3
From 6d1c6bc1b8421fd4dba63ab55b08599965fd11f7 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Thu, 22 Jun 2017 16:23:40 +0100
Subject: Use bundler to make manpages
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'Makefile')
diff --git a/Makefile b/Makefile
index 2254496..d8176f7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ man:
mkdir -p man
man/%.1: bin/%
- ruby -I lib $< --manual | txt2man -t $(notdir $<) -s 1 > $@
+ bundle exec $< --manual | txt2man -t $(notdir $<) -s 1 > $@
+ test -s $@
clean:
$(RM) -r man
--
cgit v1.2.3
From 89f7cb1762a865d72827a024559018efc247e185 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Tue, 1 Aug 2017 11:13:37 +0100
Subject: Removed more cruft. Updated debian/rules to use the Makefile. Updated
bundle
---
CHANGELOG | 21 ---------------------
Gemfile.lock | 6 +++---
Makefile | 29 +++++++++++------------------
Rakefile | 9 ---------
TODO-PJC | 3 ---
debian/mauvealert-server.docs | 2 --
debian/mauvealert-server.examples | 1 -
debian/rules | 17 +++++------------
heartbeat_hammer.sh | 39 ---------------------------------------
utils/heartbeat_hammer.sh | 39 +++++++++++++++++++++++++++++++++++++++
10 files changed, 58 insertions(+), 108 deletions(-)
delete mode 100644 CHANGELOG
delete mode 100644 TODO-PJC
delete mode 100644 debian/mauvealert-server.examples
delete mode 100644 heartbeat_hammer.sh
create mode 100644 utils/heartbeat_hammer.sh
(limited to 'Makefile')
diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 2b04e22..0000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,21 +0,0 @@
-... Because it is needed.
-
-Version 1.0.13
- * Buttons now appear in a line.
- * Function were called in wrong order on buttons.
- * Alerts no longer sorted by source, just by subject.
- * Alerts sorted by subject then summary.
- * Page no longer needs to reload on status changes. No new conglomerate created.
- * Bug #1111 fix: Alerts do not acknowledge for longer than maximum time.
- * Bug #1116 fix: Ajax requests take too long, now spawn a new thread --
- see feature 1131 for full fix.
-
-
-Version 1.0.12
- * Added time scales to bulk alerts acknowledgement.
- * Change the web page header to be simpler and nicer.
- * Added link to alert history.
-
-
-Version 1.0.11 and below.
- * Nothing documented.
diff --git a/Gemfile.lock b/Gemfile.lock
index f207604..716949f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -64,7 +64,7 @@ GEM
do_sqlite3 (0.10.17)
data_objects (= 0.10.17)
docile (1.1.5)
- eventmachine (1.2.3)
+ eventmachine (1.2.5)
fastercsv (1.5.5)
haml (4.0.7)
tilt
@@ -87,7 +87,7 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
- rmail (1.1.2)
+ rmail (1.1.3)
ruby_protobuf (0.4.11)
safe_yaml (1.0.4)
sanitize (2.1.0)
@@ -148,4 +148,4 @@ DEPENDENCIES
webmock (~> 1.19.0)
BUNDLED WITH
- 1.11.2
+ 1.13.6
diff --git a/Makefile b/Makefile
index d8176f7..a36e32b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,40 +4,33 @@
##
OPENBSD_SETUP_FLAGS = --prefix=/usr/local --installdirs=site --ruby-path=/usr/local/bin/ruby18 --mandir=\$$prefix/man/man1 --siteruby=\$$libdir/ruby/site_ruby --siterubyver=\$$siteruby/1.8
+BUNDLER_FLAGS ?= --path=vendor/bundle --jobs=4 --no-deployment
-all: man man/mauvesend.1 man/mauveserver.1 man/mauveconsole.1
+all: vendor/bundle man/mauvesend.1 man/mauveserver.1 man/mauveconsole.1
man:
mkdir -p man
-man/%.1: bin/%
+man/%.1: bin/% vendor/bundle man
bundle exec $< --manual | txt2man -t $(notdir $<) -s 1 > $@
test -s $@
clean:
$(RM) -r man
- # Theoretically this will clean up the shebang munging done by the openbsd_tarball task below.
- if [ -e ./setup.rb ] ; then \
- ruby ./setup.rb distclean ; \
- ruby ./setup.rb config ; \
- ruby ./setup.rb setup ; \
- ruby ./setup.rb clean ; \
- fi
$(RM) -r tmp
- $(RM) -r OpenBSD
- $(RM) setup.rb
-
distclean: clean
- if [ -e ./setup.rb ] ; then ruby ./setup.rb distclean ; fi
- $(RM) setup.rb
$(RM) -r OpenBSD
+ $(RM) -r vendor/bundle
+
+vendor/bundle: Gemfile
+ @bundle install $(BUNDLER_FLAGS)
-test: setup.rb
- ruby ./setup.rb test
+Gemfile.lock: Gemfile
+ @bundle update
-setup.rb: /usr/lib/ruby/1.8/setup.rb
- ln -sf /usr/lib/ruby/1.8/setup.rb .
+test: vendor/bundle
+ @bundle exec rake test
OpenBSD: OpenBSD/sha256.asc
diff --git a/Rakefile b/Rakefile
index feea409..b1fe254 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,14 +1,5 @@
require 'rake/testtask'
-task :console do
- $:.push("lib")
- require 'irb'
- require 'irb/completion'
- require 'mauve/server'
- ARGV.clear
- IRB.start
-end
-
Rake::TestTask.new do |t|
t.libs << "test"
t.libs << "lib"
diff --git a/TODO-PJC b/TODO-PJC
deleted file mode 100644
index e54435a..0000000
--- a/TODO-PJC
+++ /dev/null
@@ -1,3 +0,0 @@
- * Javascript ack_time update if ajax synchronicity a bit shite
- * Template SMS bit better with the link URL to the actual alert.
- * Add an internal heartbeat to send to another mauve instance.
diff --git a/debian/mauvealert-server.docs b/debian/mauvealert-server.docs
index e84b576..e845566 100644
--- a/debian/mauvealert-server.docs
+++ b/debian/mauvealert-server.docs
@@ -1,3 +1 @@
-bytemark_example_alerts.sh
-bytemark_policy.txt
README
diff --git a/debian/mauvealert-server.examples b/debian/mauvealert-server.examples
deleted file mode 100644
index ae5a993..0000000
--- a/debian/mauvealert-server.examples
+++ /dev/null
@@ -1 +0,0 @@
-example.conf
diff --git a/debian/rules b/debian/rules
index c43ea38..4097e2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,13 @@
#!/usr/bin/make -f
-
-# Ugh
-export GEM_HOME := $(shell pwd)/vendor/bundle
-export PATH := ${GEM_HOME}/bin:${PATH}
+
+export BUNDLER_FLAGS=--deployment --without='test development' --jobs=4
%:
dh $@ --with-systemd
-override_dh_auto_build:
- bundler install --deployment --without="test development" --jobs=4
- make
-
-override_dh_clean:
- dh_clean
- $(RM) -r vendor/
-
+#
+# We test separately in Gitlab.
+#
override_dh_auto_test:
echo "NOP"
diff --git a/heartbeat_hammer.sh b/heartbeat_hammer.sh
deleted file mode 100644
index 12b74bc..0000000
--- a/heartbeat_hammer.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-PRE="ruby -I lib bin/mauvesend [::1]"
-F=60
-S=10
-n=$*
-
-_host () {
- hostname="imaginary-$i.example.com"
- down="n"
-
- while( true ) ; do
-
- if [ "$down" == "n" ] ; then
- $PRE -o $hostname -i heartbeat -r +$F -c now -s "heartbeat failed" --detail="<p>The heartbeat wasn't sent for this host</p><p>This indicates that the host might be down</p>"
- sleep $((F - $RANDOM*$S/32768 - $S))
- else
- sleep $((RANDOM*$S/32768 + $F + $S))
- fi
-
- if [ $RANDOM -gt 30000 ] ; then
- [ "$down" == "n" ] && echo "Host $hostname down"
- down="y"
- else
- [ "$down" == "y" ] && echo "Host $hostname up"
- down="n"
- fi
- done
-}
-
-echo -e "This command will go beserk. To kill run\n pkill -t `tty`\n\nGiving you 5 seconds to quit!"
-
-sleep 5
-
-for i in `seq 1 100` ; do
- _host $i &
- sleep 0.2
-done
-
diff --git a/utils/heartbeat_hammer.sh b/utils/heartbeat_hammer.sh
new file mode 100644
index 0000000..12b74bc
--- /dev/null
+++ b/utils/heartbeat_hammer.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+PRE="ruby -I lib bin/mauvesend [::1]"
+F=60
+S=10
+n=$*
+
+_host () {
+ hostname="imaginary-$i.example.com"
+ down="n"
+
+ while( true ) ; do
+
+ if [ "$down" == "n" ] ; then
+ $PRE -o $hostname -i heartbeat -r +$F -c now -s "heartbeat failed" --detail="<p>The heartbeat wasn't sent for this host</p><p>This indicates that the host might be down</p>"
+ sleep $((F - $RANDOM*$S/32768 - $S))
+ else
+ sleep $((RANDOM*$S/32768 + $F + $S))
+ fi
+
+ if [ $RANDOM -gt 30000 ] ; then
+ [ "$down" == "n" ] && echo "Host $hostname down"
+ down="y"
+ else
+ [ "$down" == "y" ] && echo "Host $hostname up"
+ down="n"
+ fi
+ done
+}
+
+echo -e "This command will go beserk. To kill run\n pkill -t `tty`\n\nGiving you 5 seconds to quit!"
+
+sleep 5
+
+for i in `seq 1 100` ; do
+ _host $i &
+ sleep 0.2
+done
+
--
cgit v1.2.3