From 47d3ddcb320675911ec4e55eb5823ebbceeb3687 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 13:23:50 +0000 Subject: Revert "Strip out debian metadata" This reverts commit 4d9ca84e57dad6746eb0882b91171ccd69298807. --- debian/changelog | 721 +++++++++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 68 ++++ debian/copyright | 19 + debian/mauvealert-client.install | 3 + debian/mauvealert-client.manpages | 1 + debian/mauvealert-common.install | 6 + debian/mauvealert-server.dirs | 2 + debian/mauvealert-server.docs | 6 + debian/mauvealert-server.examples | 1 + debian/mauvealert-server.init | 225 ++++++++++++ debian/mauvealert-server.install | 38 ++ debian/mauvealert-server.links | 1 + debian/mauvealert-server.logrotate | 10 + debian/mauvealert-server.manpages | 2 + debian/mauvealert-server.postinst | 28 ++ debian/mauvealert-server.postrm | 23 ++ debian/rules | 8 + 18 files changed, 1163 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/mauvealert-client.install create mode 100644 debian/mauvealert-client.manpages create mode 100644 debian/mauvealert-common.install create mode 100644 debian/mauvealert-server.dirs create mode 100644 debian/mauvealert-server.docs create mode 100644 debian/mauvealert-server.examples create mode 100644 debian/mauvealert-server.init create mode 100644 debian/mauvealert-server.install create mode 100644 debian/mauvealert-server.links create mode 100644 debian/mauvealert-server.logrotate create mode 100644 debian/mauvealert-server.manpages create mode 100644 debian/mauvealert-server.postinst create mode 100644 debian/mauvealert-server.postrm create mode 100755 debian/rules (limited to 'debian') diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0627303 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,721 @@ +mauvealert (3.15.15-1) stable; urgency=medium + + * Tidied up iconv usage for ruby1.9+ + + -- Patrick J Cherry Thu, 10 Jul 2014 13:40:27 +0100 + +mauvealert (3.15.14-2) stable; urgency=low + + * Relaxed mauvealert-client ruby dependency. + + -- Patrick J Cherry Thu, 03 Jul 2014 11:43:00 +0100 + +mauvealert (3.15.14-1) stable; urgency=low + + * Web interface now defaults to wall-clock hours. + + -- Patrick J Cherry Wed, 22 May 2013 11:47:52 +0100 + +mauvealert (3.15.13-1) stable; urgency=low + + * Switched off global socket reverse lookups. + + -- Patrick J Cherry Tue, 21 May 2013 14:34:15 +0100 + +mauvealert (3.15.12-1) stable; urgency=low + + * Removed extra database lookup when receiving alert updates. + * Added extra to_a when checking to see if an alert should be suppressed to + force the database lookup at that point. + + -- Patrick J Cherry Tue, 21 May 2013 12:24:13 +0100 + +mauvealert (3.15.11-1) stable; urgency=low + + * Notifications now generate just one history entry to ensure that the + previous changes regarding notification supression work. + + -- Patrick J Cherry Thu, 16 May 2013 14:13:43 +0100 + +mauvealert (3.15.10-1ubuntu1) stable; urgency=low + + * Database is now queried to see if a notification should be suppressed. + * Notification suppression now takes urgency into account, such that more + urgent alerts are not smothered by less urgent ones. + * Templates now include which level the alert is. + + -- Patrick J Cherry Thu, 16 May 2013 11:47:33 +0100 + +mauvealert (3.15.9-1) stable; urgency=low + + * Added Mauve::QuickUpdate library + + -- Patrick J Cherry Thu, 02 May 2013 14:23:34 +0100 + +mauvealert (3.15.8-1) stable; urgency=low + + * Added a further check to make sure the last alert of the same update type + was being updated by reminders. + + -- Patrick J Cherry Wed, 01 May 2013 15:41:10 +0100 + +mauvealert (3.15.7-1) stable; urgency=low + + * Altered alert_group to only set one reminder. + * Allow alert to clear raised_at/cleared_at times if none specified. + + -- Patrick J Cherry Wed, 01 May 2013 10:16:52 +0100 + +mauvealert (3.15.6-2) stable; urgency=low + + * Added generic_http library that had been missed off. + + -- Patrick J Cherry Fri, 25 Jan 2013 13:47:05 +0000 + +mauvealert (3.15.6-1) stable; urgency=low + + * Alert fields are now truncated if they're too long. + + -- Patrick J Cherry Wed, 12 Dec 2012 10:47:28 +0000 + +mauvealert (3.15.5-1) stable; urgency=low + + * Fixed bug whereby alerts cleared by a "replace" flag were not sending + notifications. + * The alert summary is now recorded in the history for an alert. + + -- Patrick J Cherry Wed, 05 Dec 2012 12:34:21 +0000 + +mauvealert (3.15.4-1) stable; urgency=low + + * Fixed typo in AlertGroup. + + -- Patrick J Cherry Tue, 04 Dec 2012 14:34:31 +0000 + +mauvealert (3.15.3-1) stable; urgency=low + + * Further fix-ups to the alert notification suppression code. + + -- Patrick J Cherry Tue, 04 Dec 2012 14:08:47 +0000 + +mauvealert (3.15.2-1) stable; urgency=low + + * Added "eager" loading when looking at event histories. + * Fixed event views to use dates, and to miss queries for days with no + events. + + -- Patrick J Cherry Tue, 04 Dec 2012 11:56:19 +0000 + +mauvealert (3.15.1-1) stable; urgency=low + + * Rationalised alert tables to look the same for both searches and + normal views. + * Events calendar is now faster as fewer queries are made when loading. + + -- Patrick J Cherry Fri, 30 Nov 2012 22:48:43 +0000 + +mauvealert (3.14.2-1) stable; urgency=low + + * Added search views to package + * Alert actions are now controlled by just one form, and two actions. + * Alerts in search results are now de-duped. + * Serch results are only coloured if they're raised. + + -- Patrick J Cherry Fri, 30 Nov 2012 14:55:16 +0000 + +mauvealert (3.14.1-1) stable; urgency=low + + * Web frontend now has a search box. + * Alert counts now reinstated. + + -- Patrick J Cherry Fri, 30 Nov 2012 12:35:44 +0000 + +mauvealert (3.13.2-1) stable; urgency=low + + * Raised time now set to unacknowledgment time when alerts become + unacknowledged + * Tidied up history entries + * Changed UNACKNOWLEDGED to RE-RAISED when alerts are no longer ack'd + * Added suppression information to views + + -- Patrick J Cherry Thu, 29 Nov 2012 21:05:51 +0000 + +mauvealert (3.13.1-1) stable; urgency=low + + * Rewrote decision code for notifying on save for an alert. + + -- Patrick J Cherry Thu, 29 Nov 2012 16:17:11 +0000 + +mauvealert (3.12.1-1) stable; urgency=low + + * Added optional notification suppression for alerts. + + -- Patrick J Cherry Thu, 29 Nov 2012 10:35:04 +0000 + +mauvealert (3.11.8-1) stable; urgency=low + + * Re-wrote alert saving logic to use database transactions. + + -- Patrick J Cherry Tue, 27 Nov 2012 16:16:09 +0000 + +mauvealert (3.11.7-1) stable; urgency=low + + * Models are now more picky when setting created_at/updated_at times. + + -- Patrick J Cherry Tue, 27 Nov 2012 11:51:55 +0000 + +mauvealert (3.11.6-2) stable; urgency=low + + * Fixed missing library file. + + -- Patrick J Cherry Tue, 27 Nov 2012 10:16:35 +0000 + +mauvealert (3.11.6-1) stable; urgency=low + + * Added dm-validations monkey-patch to automatically save validation + failures, when no failures are given. + * Reverted change to AlertChanged. + + -- Patrick J Cherry Tue, 27 Nov 2012 09:55:44 +0000 + +mauvealert (3.11.5-1) stable; urgency=low + + * Now uses ruby-ipaddress instead of IPAddr. + * Now logs when AlertChanged fails, and bypassess validation when needed. + + -- Patrick J Cherry Mon, 26 Nov 2012 17:06:39 +0000 + +mauvealert (3.11.4-1) stable; urgency=low + + * AlertGroup is no longer looked for on raise/clear/ack. It is looked up on + notification. + * Update web_interface to use public_folder instead of just public + * Tidied notifier a little. Alert#cached_alert_group is reset before + notification. + + -- Patrick J Cherry Fri, 23 Nov 2012 15:43:11 +0000 + +mauvealert (3.11.3-3) stable; urgency=low + + * dm-aggregates now included. + + -- Patrick J Cherry Fri, 23 Nov 2012 13:05:26 +0000 + +mauvealert (3.11.3-2) stable; urgency=low + + * Updated dependencies to take new-style library names + + -- Patrick J Cherry Fri, 23 Nov 2012 12:03:49 +0000 + +mauvealert (3.11.3) stable; urgency=low + + * minimal_dns_lookups configuration item added, preventing extra DNS lookups + when matching hosts to source lists. + * When the cached alert group is saved (in Notifier#notify) the callbacks + which trigger notifications are now skipped. + * Tidied up postgres test failure. + + -- Patrick J Cherry Fri, 23 Nov 2012 10:49:21 +0000 + +mauvealert (3.11.2) stable; urgency=low + + * Fixed typo in WebInterface. + * Make sure alerts only get sent on save if their status has changed. + + -- Patrick J Cherry Wed, 21 Nov 2012 16:38:00 +0000 + +mauvealert (3.11.1) stable; urgency=low + + * Added a sleep to the server main loop + * The alert gets saved after notification to make sure that the + cached_alert_group gets stored. + * xmmp errors now crash mauve completely. (deliberately). + + -- Patrick J Cherry Wed, 21 Nov 2012 14:32:20 +0000 + +mauvealert (3.11.0) stable; urgency=low + + * Removed needless counting of alerts in the web interface + * Made alert queries more accurate + * Removed duplicate code in Alert#in_source_list + * Cut down on the number of DNS queries in SourceList#includes? + + -- Patrick J Cherry Wed, 21 Nov 2012 14:20:42 +0000 + +mauvealert (3.10.0) stable; urgency=low + + * Added URLs which can be polled for source lists + * Removed freeze/thaw functionality from the threads which hasn't been used + for a while. + * Threads are now checked to make sure they're running, and not stuck. + + -- Patrick J Cherry Thu, 05 Jul 2012 14:00:55 +0100 + +mauvealert (3.9.4) stable; urgency=low + + * Clear cleared_at time if raised_at time is set on alert reception. + + -- Patrick J Cherry Mon, 02 Jul 2012 11:33:35 +0100 + +mauvealert (3.9.3) stable; urgency=low + + * no_one_in is now only called once per DuringRunner instance per + people_list to try and reduce hammering on the calendar. + * Fixed notify_when_on_holiday/off_sick to actually work. + + -- Patrick J Cherry Fri, 08 Jun 2012 10:32:23 +0100 + +mauvealert (3.9.2) stable; urgency=low + + * Removed destroy XMPP command -- replaced with clear. + + -- Patrick J Cherry Wed, 09 May 2012 17:05:43 +0100 + +mauvealert (3.9.1) stable; urgency=low + + * Web interface now uses an ajax call to work out ack times, falling back to + javascript if that takes too long. + * Default working hours are now 9.30 - 5.30 as per SLA. + * Fixed time tests + standardised dead zone + daylight hours. + * Fixed up PeopleList#resolve_notifications to check for recursion, and only + return notify clauses that refer to people. + * Changed Person#resolve_notification to match the signature for the + people_list version. + * Updated notifier only to try to connect to objects that respond to xmpp. + + -- Patrick J Cherry Tue, 08 May 2012 12:05:56 +0100 + +mauvealert (3.9.0) stable; urgency=low + + * Notify anyone who has contributed to an alert's history since its last + raise, either by acknowledging, or by being notified about it. + * Username is now recorded in the History wherever possible. + * Update Time.bank_holiday? etc. to work correctly. + * Mauve::Configuration#do_parse_time now a class method, and used elsewhere + to standardise ranges in the configuration file. + * Updated notification tests to test bank_holiday changes etc. + * Person and people lists have now become interchangeable, with + notifications only recording the username, rather than the + Person/PeopleList. This means that notifications in alert groups can use + default #during clauses and #every values from people lists and persons. + * Notify clauses can now take an array of persons/people_lists, and + people_lists can refer to other people lists. + * PeopleList names are now in the same namespace as usernames. + + -- Patrick J Cherry Fri, 04 May 2012 16:52:39 +0100 + +mauvealert (3.8.5) stable; urgency=low + + * Added configuration options for daytime_hours, dead_zone, and + working_hours. + * Updated views to be neater with respect to notice/errors and in the case + when no alerts are found in a table. + * Set default hostname to Socket.gethostname, and default base_url now + includes the port, if it is not port 80 + * Added ruby locale dependency for server. + * Symlink jquery if possible in server postinst. + * Updated history partial to be better. + * Updated sender to try and get things into UTF8 where poss. + * Fixed warn on nil method in person. + + -- Patrick J Cherry Wed, 02 May 2012 15:24:52 +0100 + +mauvealert (3.8.4) stable; urgency=low + + * Fixed notification when on holiday/off sick + * Strings are now stripped of any illegal/non-UTF8 characters + + -- Patrick J Cherry Mon, 30 Apr 2012 12:53:33 +0100 + +mauvealert (3.8.3) stable; urgency=low + + * Reverted bad changes to mauveserver + example.conf + * Added default options for a person + * Added calendar check for a people_list + * Added a time at which to check the people in a people_list + + -- Patrick J Cherry Fri, 27 Apr 2012 11:56:52 +0100 + +mauvealert (3.8.2) stable; urgency=low + + * Reverted a couple of duff changes. + + -- Patrick J Cherry Fri, 27 Apr 2012 11:00:21 +0100 + +mauvealert (3.8.1) stable; urgency=low + + * Calendar now honours http timeout + ssl verify settings. + * Added no_one_in test for DuringRunner + + -- Patrick J Cherry Fri, 27 Apr 2012 09:32:02 +0100 + +mauvealert (3.8.0) stable; urgency=low + + * HTML sanitizing only takes place if the text looks like HTML. + * Tests improved to couple processor and notifier buffers. + * Added authentication tests + * Removed remote auth tests in from the web interface tests. + * If no bytemark_auth_url is set, then no remote auth takes place. + * SSL peer cert validation now takes place by default. + * People/PeopleLists can now specify individualy notification times/frequencies + * Notification now uses #during/#every from the Person/PeopleList if nothing was specified + * Max acknowledgement time is now specified in the config + * Calendar interface improved. + * holiday_url no longer used -- replaced by notify_when_on_holiday! + * added notify_when_off_sick! + * Added ability for the calendar to be queried for a list of bank holdays. + * Added ability for Time to be given a list of bank holidays to check + against. + * PeopleLists can now be a Proc, allowing downloading of lists. + * Testing is much improved. + + -- Patrick J Cherry Wed, 25 Apr 2012 17:16:56 +0100 + +mauvealert (3.7.8) stable; urgency=low + + * Reduced the liklihood of race conditions during evaluation of during {} + clauses. + * Added cache to DuringRunner to reduce the number of times now? is + evaluated. + * Added a debug! option to notification_method clauses for easier, erm, + debugging. + * Alert#notify and AlertChanged#notify now make use of the notification + buffer make the disconnection betweeen the processing loop and + notifications happen sooner. + * Manpage typo sorted out. + * - + + -- Patrick J Cherry Fri, 27 Apr 2012 09:10:37 +0100 + +mauvealert (3.7.7) stable; urgency=low + + * Javascript refreshes now happen every two minutes. + * Alert now tries to find just one matching AlertGroup, not all. + + -- Patrick J Cherry Fri, 23 Mar 2012 15:02:53 +0000 + +mauvealert (3.7.6) stable; urgency=low + + * Tweaked alert display to show the alert_group properly. + * Bumped Mauve::Version correctly. + + -- Patrick J Cherry Thu, 22 Mar 2012 17:55:51 +0000 + +mauvealert (3.7.5) stable; urgency=low + + * Added tests for web interface. + * Tidied up HTTP auth codes when auth fails. + * Further tweaks to alert_group caching, and source_list searches. + + -- Patrick J Cherry Thu, 22 Mar 2012 17:44:58 +0000 + +mauvealert (3.7.4) stable; urgency=low + + * Possible improvements in alert group caching, in an attempt to fix + slowness in the interface. + + -- Patrick J Cherry Thu, 22 Mar 2012 10:06:07 +0000 + +mauvealert (3.7.3) stable; urgency=low + + * Added destroy command to XMPP interface. + + -- Patrick J Cherry Tue, 28 Feb 2012 14:35:17 +0000 + +mauvealert (3.7.2) stable; urgency=low + + * Fixed Hash/Array confusions when merging conditions for notification. + + -- Patrick J Cherry Thu, 02 Feb 2012 10:59:28 +0000 + +mauvealert (3.7.1) stable; urgency=low + + * Fixed debian packaging to install everything. + + -- Patrick J Cherry Mon, 30 Jan 2012 17:03:48 +0000 + +mauvealert (3.7.0) stable; urgency=low + + * Bundled timer in with processor. What could go wrong..? + * Updated example.conf to work + * Added possibility of using postgres databases. + + -- Patrick J Cherry Mon, 30 Jan 2012 12:31:06 +0000 + +mauvealert (3.6.3) stable; urgency=low + + * Logs received at time in Processor + * Added lsb-base dependency + * Added test-task to init script + * Added include, include_file, and include_directory directives to + configuration. + + -- Patrick J Cherry Fri, 06 Jan 2012 14:41:45 +0000 + +mauvealert (3.6.2) stable; urgency=low + + * Tinkered with dependencies + + -- Patrick J Cherry Mon, 07 Nov 2011 10:09:54 +0000 + +mauvealert (3.6.1) stable; urgency=low + + * Fixed up alert ack parsing a bit. + + -- Patrick J Cherry Mon, 07 Nov 2011 09:38:05 +0000 + +mauvealert (3.6.0) stable; urgency=low + + * Changed ack command to split on spaces or commas or both + * Fixed initscripts to, erm, work when VERBOSE is not set + * Robustificated XMPP some more + * Moved all timestamps into epoch time from regular timestamps + + -- Patrick J Cherry Fri, 04 Nov 2011 08:33:13 +0000 + +mauvealert (3.5.10) stable; urgency=low + + * Fixed up Pop3Client class to work. + + -- Patrick J Cherry Tue, 04 Oct 2011 15:29:22 +0100 + +mauvealert (3.5.9) stable; urgency=low + + * Improve documentation in code + * Fix XMPP crash problem properly + * Fix XMPP acknowledge syntax for minutes, seconds, etc. + * Update template to remove colon between the subject and summary. + + -- Patrick J Cherry Fri, 16 Sep 2011 13:20:51 +0100 + +mauvealert (3.5.8) stable; urgency=low + + * Added rescue clause to XMPP connect + + -- Patrick J Cherry Tue, 13 Sep 2011 07:56:38 +0100 + +mauvealert (3.5.7) stable; urgency=low + + * Reminders are now unconditionally cleared when an alert is cleared. + + -- Patrick J Cherry Mon, 12 Sep 2011 11:18:09 +0100 + +mauvealert (3.5.6) stable; urgency=low + + * XMPP interface now saves note. + + -- Patrick J Cherry Tue, 06 Sep 2011 15:56:01 +0100 + +mauvealert (3.5.5) stable; urgency=low + + * Further updates to the suppression code. Should be much better now. + * XMPP interface fixed. + + -- Patrick J Cherry Tue, 06 Sep 2011 15:30:11 +0100 + +mauvealert (3.5.4) stable; urgency=low + + * Fixed up alert suppression to work better + * Also allow multiple suppression clauses in config + * Test for dual alerts when an alert unacknowledges. + + -- Patrick J Cherry Tue, 06 Sep 2011 11:06:09 +0100 + +mauvealert (3.5.3) stable; urgency=low + + * Fixed do_get timeout + * Added small cache for fetching external URIs. + + -- Patrick J Cherry Wed, 31 Aug 2011 14:03:45 +0100 + +mauvealert (3.5.2) stable; urgency=low + + * Added holiday checks + * Suppression now a bit less jumpy. + + -- Patrick J Cherry Wed, 31 Aug 2011 13:07:50 +0100 + +mauvealert (3.5.1) stable; urgency=low + + * Fixed XMPP interface to allow ack's from groupchat. + * Fixed XMPP interface to allow private chats to work. + + -- Patrick J Cherry Wed, 24 Aug 2011 16:55:30 +0100 + +mauvealert (3.5.0) stable; urgency=low + + * Added XMPP interface + + -- Patrick J Cherry Wed, 24 Aug 2011 12:24:55 +0100 + +mauvealert (3.4.4) stable; urgency=low + + * Added events calendar + + -- Patrick J Cherry Tue, 23 Aug 2011 18:24:52 +0100 + +mauvealert (3.4.3) stable; urgency=low + + * Fixed notification race-conditions. + * Reminders now get sent at the start of the next during period. + + -- Patrick J Cherry Mon, 22 Aug 2011 11:58:28 +0100 + +mauvealert (3.4.2) stable; urgency=low + + * Improved polling interval timing. + + -- Patrick J Cherry Fri, 19 Aug 2011 16:56:33 +0100 + +mauvealert (3.4.1) stable; urgency=low + + * Fixed note in alert acknowledgement box + * HTML now sanitized on save for Alert and History types + * Default thread interval now 0s for UDP server and Timer, 5s for everything + else + * Moar tests + + -- Patrick J Cherry Fri, 19 Aug 2011 16:24:56 +0100 + +mauvealert (3.4.0) stable; urgency=low + + * More thread monitoring + * Altered alert path for reminders + * Lengthened cookie lifetime + * Added an initial logger + * Can now have one history with multiple alerts + * Changed DateTime to Time everywhere + * Moar tests + + -- Patrick J Cherry Wed, 17 Aug 2011 14:26:18 +0100 + +mauvealert (3.3.2) stable; urgency=low + + * More pop3 tweaks + + -- Patrick J Cherry Thu, 04 Aug 2011 17:18:13 +0100 + +mauvealert (3.3.1) stable; urgency=low + + * Fixed bug in Pop3 server + + -- Patrick J Cherry Thu, 04 Aug 2011 15:18:27 +0100 + +mauvealert (3.3.0) stable; urgency=low + + * Added pop3 server + * Rejigged authentication + * Web interface improvements + + -- Patrick J Cherry Thu, 04 Aug 2011 14:26:24 +0100 + +mauvealert (3.2.1) stable; urgency=low + + * Fixed up alert_group matching. + + -- Patrick J Cherry Fri, 22 Jul 2011 16:28:52 +0100 + +mauvealert (3.2.0) stable; urgency=low + + * Re-organisation of config + * Added lots of tests. + + -- Patrick J Cherry Fri, 22 Jul 2011 13:30:23 +0100 + +mauvealert (3.1.6) stable; urgency=low + + * Added new heartbeat to remote mauve + * Added alert URL to messages. + + -- Patrick J Cherry Wed, 20 Jul 2011 16:15:07 +0100 + +mauvealert (3.1.5) stable; urgency=low + + * mauvesend can now specify an absolute time + + -- Patrick J Cherry Wed, 20 Jul 2011 10:54:17 +0100 + +mauvealert (3.1.4) stable; urgency=low + + * Fixed up recording of update_type for alerts + * Tidied up threading. + + -- Patrick J Cherry Tue, 19 Jul 2011 22:44:30 +0100 + +mauvealert (3.1.3) stable; urgency=low + + * Tidied up initscript + + -- Patrick J Cherry Tue, 19 Jul 2011 17:59:01 +0100 + +mauvealert (3.1.2) stable; urgency=low + + * Fixed up some gruesome spelling errors. + + -- Patrick J Cherry Tue, 19 Jul 2011 16:42:19 +0100 + +mauvealert (3.1.1) stable; urgency=low + + * Fixed mauveserver config file searching + * Updated dependencies for lenny (ugh) + + -- Patrick J Cherry Tue, 19 Jul 2011 15:48:53 +0100 + +mauvealert (3.1.0) stable; urgency=low + + * New version. + + -- Patrick J Cherry Fri, 15 Jul 2011 14:03:15 +0100 + +mauvealert (3.0.6) stable; urgency=low + + * Reminders to peple lists now work. + + -- Patrick J Cherry Sun, 19 Jun 2011 21:52:16 +0100 + +mauvealert (3.0.5) stable; urgency=low + + * Moar fiXXord. + + -- Patrick J Cherry Fri, 17 Jun 2011 18:08:21 +0100 + +mauvealert (3.0.4) stable; urgency=low + + * New release. + + -- Patrick J Cherry Fri, 17 Jun 2011 08:57:55 +0100 + +mauvealert (3.0.3) stable; urgency=low + + * Added get_all back to front-end + * Fixed up logging for more classes + * Catch empty notification lists + * Added console to server package + * Fixed document_root location + + -- Patrick J Cherry Tue, 19 Apr 2011 11:31:10 +0100 + +mauvealert (3.0.2) stable; urgency=low + + * Now checks for transmission time set to zero. + + -- Patrick J Cherry Tue, 19 Apr 2011 10:27:13 +0100 + +mauvealert (3.0.1) stable; urgency=low + + * Fixed up logging for the web interface + * Added better catch for validation errors + + -- Patrick J Cherry Tue, 19 Apr 2011 10:18:44 +0100 + +mauvealert (3.0.0) stable; urgency=low + + * New version. + + -- Patrick J Cherry Wed, 13 Apr 2011 17:02:22 +0100 + +mauvealert (0.1-1) stable; urgency=low + + * First release. + + -- Patrick J Cherry Wed, 28 Oct 2009 10:34:17 +0000 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..1fdc4f5 --- /dev/null +++ b/debian/control @@ -0,0 +1,68 @@ +Source: mauvealert +Maintainer: Matthew Bloch +Uploaders: Patrick J Cherry +Section: ruby +Priority: optional +Build-Depends: ruby | ruby-interpreter, debhelper, cdbs, rdoc, txt2man, cdbs, libsetup-ruby1.8 | ruby-setup +Standards-Version: 3.9.1 + +Package: mauvealert-client +Architecture: all +Depends: ruby | ruby-interpreter, + mauvealert-common (>= 3.8.0), + ${misc:Depends} +Recommends: liblocale-ruby1.8 | ruby-locale +Description: Mauve network alert system -- client + Mauve is a network alert system for system and network administrators. You + can use it to quickly set up ad-hoc monitoring for a variety of services, and + to confidently replace all scripts that might otherwise send floods of emails + or text messages. + . + This is the client package. + +Package: mauvealert-server +Architecture: all +Pre-Depends: libjs-jquery +Depends: mauvealert-common (>= 3.8.0), + adduser, + ruby-dm-core (>= 1.2.0) | libdm-core-ruby1.8 (>= 1.2.0), + ruby-dm-migrations (>= 1.2.0) | libdm-migrations-ruby1.8 (>= 1.2.0), + ruby-dm-sqlite-adapter (>= 1.2.0) | libdm-sqlite-adapter-ruby1.8 (>= 1.2.0), + ruby-dm-types (>= 1.2.0) | libdm-types-ruby1.8 (>= 1.2.0), + ruby-dm-aggregates (>= 1.2.0) | libdm-aggregates-ruby1.8 (>= 1.2.0), + ruby-dm-validations (>= 1.2.0) | libdm-validations-ruby1.8 (>= 1.2.0), + ruby-dm-transactions (>= 1.2.0) | libdm-transactions-ruby1.8 (>= 1.2.0), + ruby-haml (>= 3.0.15) | libhaml-ruby1.8 (>= 3.0.15) | haml (>= 3.0.15), + ruby-sanitize (>= 2.0.3) | libsanitize-ruby1.8 (>= 2.0.3), + ruby-sinatra (>= 1.0) | libsinatra-ruby1.8 (>= 1.0), + ruby-ipaddress | libipaddresss-ruby1.8, + ruby-log4r | liblog4r-ruby1.8, + ruby-redcloth | libredcloth-ruby1.8, + ruby-rmail | librmail-ruby1.8, + ruby-thin | thin1.8 | thin, + ruby-xmpp4r | libxmpp4r-ruby1.8, + lsb-base (>= 3.2-14), + ruby1.8 (>= 1.8.7), + ${misc:Depends} +Suggests: mauvealert-client +Recommends: ruby-locale | liblocale-ruby1.8 +Description: Mauve network alert system -- server + Mauve is a network alert system for system and network administrators. You can + use it to quickly set up ad-hoc monitoring for a variety of services, and to + confidently replace all scripts that might otherwise send floods of emails or + text messages. + . + This is the server package. + +Package: mauvealert-common +Architecture: all +Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} +Suggests: mauvealert-client +Description: Mauve network alert system -- common libraries + Mauve is a network alert system for system and network administrators. You can + use it to quickly set up ad-hoc monitoring for a variety of services, and to + confidently replace all scripts that might otherwise send floods of emails or + text messages. + . + This is the package of libraries in common with both the client and server. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..e0fe391 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,19 @@ +This is Mauve Alert, Bytemark's networked alert system. + +Copyright © 2009 Bytemark Computer Consulting Ltd + +Licence: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program 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 +General Public License for more details. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in ‘/usr/share/common-licenses/GPL’ or in the dpkg +source as the file ‘COPYING’ diff --git a/debian/mauvealert-client.install b/debian/mauvealert-client.install new file mode 100644 index 0000000..5cdaca6 --- /dev/null +++ b/debian/mauvealert-client.install @@ -0,0 +1,3 @@ +bin/mauvesend usr/bin/ +lib/mauve/sender.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/quick_update.rb usr/lib/ruby/vendor_ruby/mauve/ diff --git a/debian/mauvealert-client.manpages b/debian/mauvealert-client.manpages new file mode 100644 index 0000000..d8c2d70 --- /dev/null +++ b/debian/mauvealert-client.manpages @@ -0,0 +1 @@ +man/mauvesend.1 diff --git a/debian/mauvealert-common.install b/debian/mauvealert-common.install new file mode 100644 index 0000000..b132d51 --- /dev/null +++ b/debian/mauvealert-common.install @@ -0,0 +1,6 @@ +mauve.proto usr/lib/mauvealert/ +lib/mauve/proto.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/mauve_time.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/version.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/mauve_resolv.rb usr/lib/ruby/vendor_ruby/mauve/ + diff --git a/debian/mauvealert-server.dirs b/debian/mauvealert-server.dirs new file mode 100644 index 0000000..ae8ddd8 --- /dev/null +++ b/debian/mauvealert-server.dirs @@ -0,0 +1,2 @@ +var/lib/mauvealert +var/log/mauvealert diff --git a/debian/mauvealert-server.docs b/debian/mauvealert-server.docs new file mode 100644 index 0000000..20c256d --- /dev/null +++ b/debian/mauvealert-server.docs @@ -0,0 +1,6 @@ +bytemark_example_alerts.sh +bytemark_policy.txt +CHANGELOG +README +TODO +TODO-PJC diff --git a/debian/mauvealert-server.examples b/debian/mauvealert-server.examples new file mode 100644 index 0000000..ae5a993 --- /dev/null +++ b/debian/mauvealert-server.examples @@ -0,0 +1 @@ +example.conf diff --git a/debian/mauvealert-server.init b/debian/mauvealert-server.init new file mode 100644 index 0000000..71d287d --- /dev/null +++ b/debian/mauvealert-server.init @@ -0,0 +1,225 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: mauvealert-server +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Mauve Alert Server +# Description: Mauve Alert Server +### END INIT INFO + +# Author: Patrick J Cherry +# + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Mauve Alert Server" +NAME=mauveserver +DAEMON=/usr/sbin/$NAME +DAEMON_ARGS="/etc/mauvealert/$NAME.conf" +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME +RUNASUSER=mauvealert + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.2-14) to ensure that this file is present +# and status_of_proc is working. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + do_test || return 2 + + start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON --chuid $RUNASUSER --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --chuid $RUNASUSER --background --startas $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. + count=0 + + while [ $((count = count + 1)) -le 5 ] ; do + sleep 1 + # This is just a test to see if the daemon is running yet. + start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON --chuid $RUNASUSER --test > /dev/null \ + || return 0 + done + + return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --user $RUNASUSER + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --pidfile $PIDFILE --user $RUNASUSER + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --user $RUNASUSER + return 0 +} + +# +# Function that sends a SIGUSR1 to reopen logfiles +# +do_reopenlogs() { + start-stop-daemon --stop --signal USR1 --quiet --pidfile $PIDFILE --user $RUNASUSER + return 0 +} + + +# +# Test the config file before execution +# +do_test() { + # + # Make sure we're root + # + [ "$USER" = "root" ] || return 1 + + # + # OK test. + # + su $RUNASUSER -s /bin/bash -c "$DAEMON -t $DAEMON_ARGS" 1>/dev/null 2>&1 || return 1 + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 || exit 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 || exit 1 ;; + esac + ;; + + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 || exit 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 || exit 1 ;; + esac + ;; + + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + reload|force-reload) + log_daemon_msg "Reloading $DESC" "$NAME" + do_reload + log_end_msg $? + ;; + + # + # This is for use by logrotate, as the post-rotate method. + # + reopen-logs) + log_daemon_msg "Re-opening logs for $DESC" "$NAME" + do_reopenlogs + log_end_msg $? + ;; + + # + # This is to test the configuration + # + test|config-test) + log_daemon_msg "Testing configuration for $DESC" "$NAME" + do_test + log_end_msg $? + ;; + + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + restart) + log_daemon_msg "Restarting $DESC" "$NAME" + + do_test + if [ "$?" != "0" ] ; then + log_end_msg 1 # test failed + fi + + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload|test}" >&2 + exit 3 + ;; +esac + diff --git a/debian/mauvealert-server.install b/debian/mauvealert-server.install new file mode 100644 index 0000000..ca7eb5f --- /dev/null +++ b/debian/mauvealert-server.install @@ -0,0 +1,38 @@ +bin/mauveserver usr/sbin/ +bin/mauveconsole usr/sbin/ +lib/dm-sqlite-adapter-with-mutex.rb usr/lib/ruby/1.8/ +lib/dm-validations-with-empty-errors-hack.rb usr/lib/ruby/1.8/ +lib/mauve/alert.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/alert_changed.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/alert_group.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/authentication.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/calendar_interface.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/configuration.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/configuration_builder.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/configuration_builders.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/configuration_builders usr/lib/ruby/1.8/mauve/ +lib/mauve/datamapper.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/generic_http_api_client.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/heartbeat.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/history.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/http_server.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/mauve_thread.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/notification.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/notifier.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/notifiers usr/lib/ruby/1.8/mauve/ +lib/mauve/notifiers.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/people_list.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/person.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/pop3_server.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/processor.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/server.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/source_list.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/udp_server.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/web_interface.rb usr/lib/ruby/1.8/mauve/ +lib/object_builder.rb usr/lib/ruby/1.8/ +lib/rack-flash.rb usr/lib/ruby/1.8/ +lib/sinatra-partials.rb usr/lib/ruby/1.8/ +static usr/share/mauvealert +views usr/share/mauvealert +etc/mauveserver.conf etc/mauvealert/ + diff --git a/debian/mauvealert-server.links b/debian/mauvealert-server.links new file mode 100644 index 0000000..bc1cdbe --- /dev/null +++ b/debian/mauvealert-server.links @@ -0,0 +1 @@ +usr/share/javascript/jquery usr/share/mauvealert/static/javascript/jquery diff --git a/debian/mauvealert-server.logrotate b/debian/mauvealert-server.logrotate new file mode 100644 index 0000000..9d15453 --- /dev/null +++ b/debian/mauvealert-server.logrotate @@ -0,0 +1,10 @@ +/var/log/mauvealert/mauvealert.log { + rotate 7 + daily + compress + delaycompress + postrotate + /usr/sbin/invoke-rc.d mauvealert-server reopen-logs >/dev/null + endscript +} + diff --git a/debian/mauvealert-server.manpages b/debian/mauvealert-server.manpages new file mode 100644 index 0000000..5d0c618 --- /dev/null +++ b/debian/mauvealert-server.manpages @@ -0,0 +1,2 @@ +man/mauveserver.1 +man/mauveconsole.1 diff --git a/debian/mauvealert-server.postinst b/debian/mauvealert-server.postinst new file mode 100644 index 0000000..967aa8d --- /dev/null +++ b/debian/mauvealert-server.postinst @@ -0,0 +1,28 @@ +#!/bin/bash + +set -e + +## +# Add a mauve user +## +RUNASUSER=mauvealert + +adduser --system --no-create-home --home /nonexistent $RUNASUSER > /dev/null + +## +# Add default directories +## +for i in log lib ; do + mkdir -p /var/$i/mauvealert + chown -R $RUNASUSER:nogroup /var/$i/mauvealert +done + +# +# Symlink jquery libraries in. +# +if [ -e /usr/share/javascript/jquery -a ! -e /usr/share/mauvealert/static/javascript/jquery ] ; then + ln -s /usr/share/javascript/jquery /usr/share/mauvealert/static/javascript/ +fi + + +#DEBHELPER# diff --git a/debian/mauvealert-server.postrm b/debian/mauvealert-server.postrm new file mode 100644 index 0000000..24fd158 --- /dev/null +++ b/debian/mauvealert-server.postrm @@ -0,0 +1,23 @@ +#!/bin/bash + +set -e + +## +# Add a mauve user +## +RUNASUSER=mauvealert + +if [ "$1" = "purge" ] ; then + ## + # Remove the system user + ## + deluser --system $RUNASUSER > /dev/null + + ## + # remove default directories + ## + rm -rf /var/log/mauvealert/ + rm -rf /var/lib/mauvealert/ +fi + +#DEBHELPER# diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..99a63c4 --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# +# Use CDBS, so we can build for etch (ugh) +# + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk + -- cgit v1.2.1 From bcde8969e4ef5acba8ee1fe3a284c9757c73678d Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 15:36:33 +0000 Subject: Added haml-contrib for the textile filter; updated debian packaging a little --- debian/compat | 2 +- debian/control | 39 ++++++++++++++++++++------------------- debian/rules | 7 ++----- 3 files changed, 23 insertions(+), 25 deletions(-) (limited to 'debian') diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index 1fdc4f5..491aedf 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,9 @@ Maintainer: Matthew Bloch Uploaders: Patrick J Cherry Section: ruby Priority: optional -Build-Depends: ruby | ruby-interpreter, debhelper, cdbs, rdoc, txt2man, cdbs, libsetup-ruby1.8 | ruby-setup +Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, gem2deb, dh-systemd, ruby-setup Standards-Version: 3.9.1 +XS-Ruby-Versions: all Package: mauvealert-client Architecture: all @@ -25,24 +26,24 @@ Architecture: all Pre-Depends: libjs-jquery Depends: mauvealert-common (>= 3.8.0), adduser, - ruby-dm-core (>= 1.2.0) | libdm-core-ruby1.8 (>= 1.2.0), - ruby-dm-migrations (>= 1.2.0) | libdm-migrations-ruby1.8 (>= 1.2.0), - ruby-dm-sqlite-adapter (>= 1.2.0) | libdm-sqlite-adapter-ruby1.8 (>= 1.2.0), - ruby-dm-types (>= 1.2.0) | libdm-types-ruby1.8 (>= 1.2.0), - ruby-dm-aggregates (>= 1.2.0) | libdm-aggregates-ruby1.8 (>= 1.2.0), - ruby-dm-validations (>= 1.2.0) | libdm-validations-ruby1.8 (>= 1.2.0), - ruby-dm-transactions (>= 1.2.0) | libdm-transactions-ruby1.8 (>= 1.2.0), - ruby-haml (>= 3.0.15) | libhaml-ruby1.8 (>= 3.0.15) | haml (>= 3.0.15), - ruby-sanitize (>= 2.0.3) | libsanitize-ruby1.8 (>= 2.0.3), - ruby-sinatra (>= 1.0) | libsinatra-ruby1.8 (>= 1.0), - ruby-ipaddress | libipaddresss-ruby1.8, - ruby-log4r | liblog4r-ruby1.8, - ruby-redcloth | libredcloth-ruby1.8, - ruby-rmail | librmail-ruby1.8, - ruby-thin | thin1.8 | thin, - ruby-xmpp4r | libxmpp4r-ruby1.8, - lsb-base (>= 3.2-14), - ruby1.8 (>= 1.8.7), + ruby-dm-core, + ruby-dm-migrations, + ruby-dm-sqlite-adapter, + ruby-dm-types, + ruby-dm-aggregates, + ruby-dm-validations, + ruby-dm-transactions, + ruby-haml, + ruby-haml-contrib, + ruby-sanitize, + ruby-sinatra, + ruby-ipaddress, + ruby-log4r, + ruby-redcloth, + ruby-rubymail, + ruby-thin, + lsb-base, + ruby | ruby-interpreter, ${misc:Depends} Suggests: mauvealert-client Recommends: ruby-locale | liblocale-ruby1.8 diff --git a/debian/rules b/debian/rules index 99a63c4..f938869 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,5 @@ #!/usr/bin/make -f -# -# Use CDBS, so we can build for etch (ugh) -# -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk +%: + dh $@ --buildsystem=ruby --with ruby --with systemd -- cgit v1.2.1 From 40533e34cca72fee719a9d84f6e07b13ca893b6e Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 22:41:48 +0000 Subject: Updated packaging .. still need a datamapper package --- debian/control | 38 ++++++++++-------------- debian/mauvealert-server.docs | 3 -- debian/mauvealert-server.install | 62 +++++++++++++++++++--------------------- debian/rules | 2 +- 4 files changed, 46 insertions(+), 59 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 491aedf..70baca0 100644 --- a/debian/control +++ b/debian/control @@ -3,36 +3,14 @@ Maintainer: Matthew Bloch Uploaders: Patrick J Cherry Section: ruby Priority: optional -Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, gem2deb, dh-systemd, ruby-setup +Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, bundler Standards-Version: 3.9.1 -XS-Ruby-Versions: all - -Package: mauvealert-client -Architecture: all -Depends: ruby | ruby-interpreter, - mauvealert-common (>= 3.8.0), - ${misc:Depends} -Recommends: liblocale-ruby1.8 | ruby-locale -Description: Mauve network alert system -- client - Mauve is a network alert system for system and network administrators. You - can use it to quickly set up ad-hoc monitoring for a variety of services, and - to confidently replace all scripts that might otherwise send floods of emails - or text messages. - . - This is the client package. Package: mauvealert-server Architecture: all Pre-Depends: libjs-jquery Depends: mauvealert-common (>= 3.8.0), adduser, - ruby-dm-core, - ruby-dm-migrations, - ruby-dm-sqlite-adapter, - ruby-dm-types, - ruby-dm-aggregates, - ruby-dm-validations, - ruby-dm-transactions, ruby-haml, ruby-haml-contrib, ruby-sanitize, @@ -55,6 +33,20 @@ Description: Mauve network alert system -- server . This is the server package. +Package: mauvealert-client +Architecture: all +Depends: ruby | ruby-interpreter, + mauvealert-common (>= 3.8.0), + ${misc:Depends} +Recommends: liblocale-ruby1.8 | ruby-locale +Description: Mauve network alert system -- client + Mauve is a network alert system for system and network administrators. You + can use it to quickly set up ad-hoc monitoring for a variety of services, and + to confidently replace all scripts that might otherwise send floods of emails + or text messages. + . + This is the client package. + Package: mauvealert-common Architecture: all Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} diff --git a/debian/mauvealert-server.docs b/debian/mauvealert-server.docs index 20c256d..e84b576 100644 --- a/debian/mauvealert-server.docs +++ b/debian/mauvealert-server.docs @@ -1,6 +1,3 @@ bytemark_example_alerts.sh bytemark_policy.txt -CHANGELOG README -TODO -TODO-PJC diff --git a/debian/mauvealert-server.install b/debian/mauvealert-server.install index ca7eb5f..6d5dddf 100644 --- a/debian/mauvealert-server.install +++ b/debian/mauvealert-server.install @@ -1,37 +1,35 @@ bin/mauveserver usr/sbin/ bin/mauveconsole usr/sbin/ -lib/dm-sqlite-adapter-with-mutex.rb usr/lib/ruby/1.8/ -lib/dm-validations-with-empty-errors-hack.rb usr/lib/ruby/1.8/ -lib/mauve/alert.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/alert_changed.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/alert_group.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/authentication.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/calendar_interface.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/configuration.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/configuration_builder.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/configuration_builders.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/configuration_builders usr/lib/ruby/1.8/mauve/ -lib/mauve/datamapper.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/generic_http_api_client.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/heartbeat.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/history.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/http_server.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/mauve_thread.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/notification.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/notifier.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/notifiers usr/lib/ruby/1.8/mauve/ -lib/mauve/notifiers.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/people_list.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/person.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/pop3_server.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/processor.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/server.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/source_list.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/udp_server.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/web_interface.rb usr/lib/ruby/1.8/mauve/ -lib/object_builder.rb usr/lib/ruby/1.8/ -lib/rack-flash.rb usr/lib/ruby/1.8/ -lib/sinatra-partials.rb usr/lib/ruby/1.8/ +lib/dm-sqlite-adapter-with-mutex.rb usr/lib/ruby/vendor_ruby/ +lib/dm-validations-with-empty-errors-hack.rb usr/lib/ruby/vendor_ruby/ +lib/mauve/alert.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/alert_changed.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/alert_group.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/authentication.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/calendar_interface.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/configuration.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/configuration_builder.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/configuration_builders.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/configuration_builders usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/datamapper.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/generic_http_api_client.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/heartbeat.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/history.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/http_server.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/mauve_thread.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/notification.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/notifier.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/notifiers usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/notifiers.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/people_list.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/person.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/processor.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/server.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/source_list.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/udp_server.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/web_interface.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/object_builder.rb usr/lib/ruby/vendor_ruby/ +lib/sinatra-partials.rb usr/lib/ruby/vendor_ruby/ static usr/share/mauvealert views usr/share/mauvealert etc/mauveserver.conf etc/mauvealert/ diff --git a/debian/rules b/debian/rules index f938869..5289f9d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f %: - dh $@ --buildsystem=ruby --with ruby --with systemd + dh $@ --with systemd -- cgit v1.2.1 From d9fa2ee01af71e3d2c867dfca52e9f6286b11988 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Tue, 13 Jun 2017 09:16:50 +0300 Subject: Added build-dep on ruby-setup --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 70baca0..17ed090 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Matthew Bloch Uploaders: Patrick J Cherry Section: ruby Priority: optional -Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, bundler +Build-Depends: ruby | ruby-interpreter, ruby-setup, debhelper, rdoc, txt2man, dh-systemd, bundler Standards-Version: 3.9.1 Package: mauvealert-server -- cgit v1.2.1 From 2eea70308258eb29b8806809e546108878e7122a Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Tue, 13 Jun 2017 09:20:48 +0300 Subject: Revert previous changes with 'ruby-setup'. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 17ed090..70baca0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Matthew Bloch Uploaders: Patrick J Cherry Section: ruby Priority: optional -Build-Depends: ruby | ruby-interpreter, ruby-setup, debhelper, rdoc, txt2man, dh-systemd, bundler +Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, bundler Standards-Version: 3.9.1 Package: mauvealert-server -- cgit v1.2.1 From 72e9937cbf43dff08921c2adf72b3bb6eb1837ab Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Tue, 13 Jun 2017 09:21:58 +0300 Subject: Disable `make test`. This might seem controversial, but the pipeline for our package(s) already runs a distinct testing-step. So in practice this should be safe, and should avoid the problems I had with the Makefile referring to `ruby/1.8/setup.rb` --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 5289f9d..1db7492 100755 --- a/debian/rules +++ b/debian/rules @@ -3,3 +3,7 @@ %: dh $@ --with systemd + +override_dh_auto_test: + echo "NOP" + -- cgit v1.2.1 From 929c689f3381ac71d80b2dda55a0ddf602efafe2 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 14:16:29 +0100 Subject: Reconfigure server package to deploy to /srv/mauvealert --- debian/mauvealert-server.install | 43 +++++++--------------------------------- debian/rules | 14 ++++++++++++- 2 files changed, 20 insertions(+), 37 deletions(-) (limited to 'debian') diff --git a/debian/mauvealert-server.install b/debian/mauvealert-server.install index 6d5dddf..95dce77 100644 --- a/debian/mauvealert-server.install +++ b/debian/mauvealert-server.install @@ -1,36 +1,7 @@ -bin/mauveserver usr/sbin/ -bin/mauveconsole usr/sbin/ -lib/dm-sqlite-adapter-with-mutex.rb usr/lib/ruby/vendor_ruby/ -lib/dm-validations-with-empty-errors-hack.rb usr/lib/ruby/vendor_ruby/ -lib/mauve/alert.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/alert_changed.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/alert_group.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/authentication.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/calendar_interface.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/configuration.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/configuration_builder.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/configuration_builders.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/configuration_builders usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/datamapper.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/generic_http_api_client.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/heartbeat.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/history.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/http_server.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/mauve_thread.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/notification.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/notifier.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/notifiers usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/notifiers.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/people_list.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/person.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/processor.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/server.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/source_list.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/udp_server.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/web_interface.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/object_builder.rb usr/lib/ruby/vendor_ruby/ -lib/sinatra-partials.rb usr/lib/ruby/vendor_ruby/ -static usr/share/mauvealert -views usr/share/mauvealert -etc/mauveserver.conf etc/mauvealert/ - +bin srv/mauvealert +lib srv/mauvealert +static srv/mauvealert +views srv/mauvealert +vendor srv/mauvealert +.bundle srv/mauvealert +etc/mauveserver.conf etc/mauvealert/ diff --git a/debian/rules b/debian/rules index 5289f9d..04033e8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,17 @@ #!/usr/bin/make -f +# Ugh +export GEM_HOME := $(shell pwd)/vendor/bundle +export PATH := ${GEM_HOME}/bin:${PATH} + %: - dh $@ --with systemd + dh $@ --with-systemd + +override_dh_auto_build: + gem install bundler + bundler install --deployment --without="test development" --jobs=4 + +override_dh_clean: + dh_clean + $(RM) -r vendor/ -- cgit v1.2.1 From ce399f3203cbd7f5834fb5fb93d36576adb85834 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 14:20:04 +0100 Subject: Update gitlab-ci and debian control to use gems --- debian/control | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 70baca0..5ce74d8 100644 --- a/debian/control +++ b/debian/control @@ -9,20 +9,7 @@ Standards-Version: 3.9.1 Package: mauvealert-server Architecture: all Pre-Depends: libjs-jquery -Depends: mauvealert-common (>= 3.8.0), - adduser, - ruby-haml, - ruby-haml-contrib, - ruby-sanitize, - ruby-sinatra, - ruby-ipaddress, - ruby-log4r, - ruby-redcloth, - ruby-rubymail, - ruby-thin, - lsb-base, - ruby | ruby-interpreter, - ${misc:Depends} +Depends: adduser, lsb-base, ruby | ruby-interpreter, ${misc:Depends} Suggests: mauvealert-client Recommends: ruby-locale | liblocale-ruby1.8 Description: Mauve network alert system -- server -- cgit v1.2.1 From 783a411ec3369949e9122b2fc9ed6ce525f5dcf9 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 14:29:34 +0100 Subject: Updated build-deps --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 5ce74d8..f4cdbab 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Maintainer: Matthew Bloch Uploaders: Patrick J Cherry Section: ruby Priority: optional -Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, bundler +Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, + bundler, libsqlite3-dev, zlib1g-dev, libxml2-dev, ruby-dev, libpq-dev Standards-Version: 3.9.1 Package: mauvealert-server -- cgit v1.2.1 From a2e698d0b173f5f7531ff0c70b26f2eacf3a5608 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 14:40:00 +0100 Subject: Add postgres headers. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index f4cdbab..7786112 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,8 @@ Uploaders: Patrick J Cherry Section: ruby Priority: optional Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, - bundler, libsqlite3-dev, zlib1g-dev, libxml2-dev, ruby-dev, libpq-dev + bundler, libsqlite3-dev, zlib1g-dev, libxml2-dev, ruby-dev, libpq-dev, + postgresql-server-dev-9.4 | postgresql-server-dev-9.6 Standards-Version: 3.9.1 Package: mauvealert-server -- cgit v1.2.1 From 0db800af457e5c3839156813bcbd8f5d3560b3a9 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 16:31:36 +0100 Subject: Don't install bundler with gem; run make --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 9449283..c43ea38 100755 --- a/debian/rules +++ b/debian/rules @@ -8,14 +8,13 @@ export PATH := ${GEM_HOME}/bin:${PATH} dh $@ --with-systemd override_dh_auto_build: - gem install bundler bundler install --deployment --without="test development" --jobs=4 + make override_dh_clean: dh_clean $(RM) -r vendor/ - override_dh_auto_test: echo "NOP" -- cgit v1.2.1 From da925080e7eddd86f5987f6ef95c7b0e333bb2b5 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 31 Jul 2017 11:42:14 +0100 Subject: Removed init script, added systemd service, removed common package etc Also * added bundler boilerplate to bin/mauveserver * fixed jquery symlinks in server postinst and links files * updated gitignore --- debian/changelog | 6 + debian/control | 22 +--- debian/mauvealert-client.install | 6 + debian/mauvealert-common.install | 6 - debian/mauvealert-server.init | 225 -------------------------------------- debian/mauvealert-server.install | 2 + debian/mauvealert-server.links | 2 +- debian/mauvealert-server.postinst | 4 +- debian/mauvealert-server.service | 14 +++ 9 files changed, 37 insertions(+), 250 deletions(-) delete mode 100644 debian/mauvealert-common.install delete mode 100644 debian/mauvealert-server.init create mode 100644 debian/mauvealert-server.service (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0627303..ab9ca5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mauvealert (3.16.0) UNRELEASED; urgency=medium + + * Re-packaged to install server into /srv, removing common package. + + -- Patrick J Cherry Mon, 31 Jul 2017 11:31:34 +0100 + mauvealert (3.15.15-1) stable; urgency=medium * Tidied up iconv usage for ruby1.9+ diff --git a/debian/control b/debian/control index 7786112..3686b43 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,9 @@ Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, Standards-Version: 3.9.1 Package: mauvealert-server -Architecture: all +Architecture: any Pre-Depends: libjs-jquery -Depends: adduser, lsb-base, ruby | ruby-interpreter, ${misc:Depends} +Depends: adduser, lsb-base, ruby | ruby-interpreter, ruby-bundler, libpq5, ${misc:Depends} Suggests: mauvealert-client Recommends: ruby-locale | liblocale-ruby1.8 Description: Mauve network alert system -- server @@ -24,10 +24,12 @@ Description: Mauve network alert system -- server Package: mauvealert-client Architecture: all -Depends: ruby | ruby-interpreter, - mauvealert-common (>= 3.8.0), +Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} ${misc:Depends} Recommends: liblocale-ruby1.8 | ruby-locale +Replaces: mauvealert-common +Conflicts: mauvealert-common +Provides: mauvealert-common Description: Mauve network alert system -- client Mauve is a network alert system for system and network administrators. You can use it to quickly set up ad-hoc monitoring for a variety of services, and @@ -36,15 +38,3 @@ Description: Mauve network alert system -- client . This is the client package. -Package: mauvealert-common -Architecture: all -Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} -Suggests: mauvealert-client -Description: Mauve network alert system -- common libraries - Mauve is a network alert system for system and network administrators. You can - use it to quickly set up ad-hoc monitoring for a variety of services, and to - confidently replace all scripts that might otherwise send floods of emails or - text messages. - . - This is the package of libraries in common with both the client and server. - diff --git a/debian/mauvealert-client.install b/debian/mauvealert-client.install index 5cdaca6..839a24b 100644 --- a/debian/mauvealert-client.install +++ b/debian/mauvealert-client.install @@ -1,3 +1,9 @@ bin/mauvesend usr/bin/ lib/mauve/sender.rb usr/lib/ruby/vendor_ruby/mauve/ lib/mauve/quick_update.rb usr/lib/ruby/vendor_ruby/mauve/ +mauve.proto usr/lib/mauvealert/ +lib/mauve/proto.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/mauve_time.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/version.rb usr/lib/ruby/vendor_ruby/mauve/ +lib/mauve/mauve_resolv.rb usr/lib/ruby/vendor_ruby/mauve/ + diff --git a/debian/mauvealert-common.install b/debian/mauvealert-common.install deleted file mode 100644 index b132d51..0000000 --- a/debian/mauvealert-common.install +++ /dev/null @@ -1,6 +0,0 @@ -mauve.proto usr/lib/mauvealert/ -lib/mauve/proto.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/mauve_time.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/version.rb usr/lib/ruby/vendor_ruby/mauve/ -lib/mauve/mauve_resolv.rb usr/lib/ruby/vendor_ruby/mauve/ - diff --git a/debian/mauvealert-server.init b/debian/mauvealert-server.init deleted file mode 100644 index 71d287d..0000000 --- a/debian/mauvealert-server.init +++ /dev/null @@ -1,225 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: mauvealert-server -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Mauve Alert Server -# Description: Mauve Alert Server -### END INIT INFO - -# Author: Patrick J Cherry -# - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Mauve Alert Server" -NAME=mauveserver -DAEMON=/usr/sbin/$NAME -DAEMON_ARGS="/etc/mauvealert/$NAME.conf" -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -RUNASUSER=mauvealert - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - do_test || return 2 - - start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON --chuid $RUNASUSER --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --chuid $RUNASUSER --background --startas $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. - count=0 - - while [ $((count = count + 1)) -le 5 ] ; do - sleep 1 - # This is just a test to see if the daemon is running yet. - start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON --chuid $RUNASUSER --test > /dev/null \ - || return 0 - done - - return 2 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --user $RUNASUSER - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --pidfile $PIDFILE --user $RUNASUSER - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --user $RUNASUSER - return 0 -} - -# -# Function that sends a SIGUSR1 to reopen logfiles -# -do_reopenlogs() { - start-stop-daemon --stop --signal USR1 --quiet --pidfile $PIDFILE --user $RUNASUSER - return 0 -} - - -# -# Test the config file before execution -# -do_test() { - # - # Make sure we're root - # - [ "$USER" = "root" ] || return 1 - - # - # OK test. - # - su $RUNASUSER -s /bin/bash -c "$DAEMON -t $DAEMON_ARGS" 1>/dev/null 2>&1 || return 1 - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 || exit 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 || exit 1 ;; - esac - ;; - - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 || exit 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 || exit 1 ;; - esac - ;; - - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - reload|force-reload) - log_daemon_msg "Reloading $DESC" "$NAME" - do_reload - log_end_msg $? - ;; - - # - # This is for use by logrotate, as the post-rotate method. - # - reopen-logs) - log_daemon_msg "Re-opening logs for $DESC" "$NAME" - do_reopenlogs - log_end_msg $? - ;; - - # - # This is to test the configuration - # - test|config-test) - log_daemon_msg "Testing configuration for $DESC" "$NAME" - do_test - log_end_msg $? - ;; - - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - restart) - log_daemon_msg "Restarting $DESC" "$NAME" - - do_test - if [ "$?" != "0" ] ; then - log_end_msg 1 # test failed - fi - - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload|test}" >&2 - exit 3 - ;; -esac - diff --git a/debian/mauvealert-server.install b/debian/mauvealert-server.install index 95dce77..089726b 100644 --- a/debian/mauvealert-server.install +++ b/debian/mauvealert-server.install @@ -5,3 +5,5 @@ views srv/mauvealert vendor srv/mauvealert .bundle srv/mauvealert etc/mauveserver.conf etc/mauvealert/ +Gemfile srv/mauvealert +Gemfile.lock srv/mauvealert diff --git a/debian/mauvealert-server.links b/debian/mauvealert-server.links index bc1cdbe..0a2fc11 100644 --- a/debian/mauvealert-server.links +++ b/debian/mauvealert-server.links @@ -1 +1 @@ -usr/share/javascript/jquery usr/share/mauvealert/static/javascript/jquery +usr/share/javascript/jquery srv/mauvealert/static/javascript/jquery diff --git a/debian/mauvealert-server.postinst b/debian/mauvealert-server.postinst index 967aa8d..945cec4 100644 --- a/debian/mauvealert-server.postinst +++ b/debian/mauvealert-server.postinst @@ -20,8 +20,8 @@ done # # Symlink jquery libraries in. # -if [ -e /usr/share/javascript/jquery -a ! -e /usr/share/mauvealert/static/javascript/jquery ] ; then - ln -s /usr/share/javascript/jquery /usr/share/mauvealert/static/javascript/ +if [ -e /usr/share/javascript/jquery -a ! -e /srv/mauvealert/static/javascript/jquery ] ; then + ln -s /usr/share/javascript/jquery /srv/mauvealert/static/javascript/ fi diff --git a/debian/mauvealert-server.service b/debian/mauvealert-server.service new file mode 100644 index 0000000..7cd49ba --- /dev/null +++ b/debian/mauvealert-server.service @@ -0,0 +1,14 @@ +[Unit] +Description=Mauve Alert Server +After=network.target + +[Service] +Type=simple +Restart=always +WorkingDirectory=/srv/mauvealert +ExecStart=/srv/mauvealert/bin/mauvealert /etc/mauveserver.conf + +[Install] +WantedBy=multi-user.target + + -- cgit v1.2.1 From eee62dc8edaec35aebc89d5ce430ab53eae5a5ae Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 31 Jul 2017 13:10:18 +0100 Subject: Added in shlibs substitution variable --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 3686b43..528abff 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Standards-Version: 3.9.1 Package: mauvealert-server Architecture: any Pre-Depends: libjs-jquery -Depends: adduser, lsb-base, ruby | ruby-interpreter, ruby-bundler, libpq5, ${misc:Depends} +Depends: adduser, lsb-base, ruby | ruby-interpreter, ruby-bundler, ${shlibs:Depends}, ${misc:Depends} Suggests: mauvealert-client Recommends: ruby-locale | liblocale-ruby1.8 Description: Mauve network alert system -- server -- cgit v1.2.1 From 89f7cb1762a865d72827a024559018efc247e185 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Tue, 1 Aug 2017 11:13:37 +0100 Subject: Removed more cruft. Updated debian/rules to use the Makefile. Updated bundle --- debian/mauvealert-server.docs | 2 -- debian/mauvealert-server.examples | 1 - debian/rules | 17 +++++------------ 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 debian/mauvealert-server.examples (limited to 'debian') 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" -- cgit v1.2.1 From 1cf80d07aed06f9d0d53d22fccfb6645d8933b34 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Tue, 1 Aug 2017 11:29:07 +0100 Subject: Fix typo in control --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 528abff..5e913b3 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,6 @@ Description: Mauve network alert system -- server Package: mauvealert-client Architecture: all Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} - ${misc:Depends} Recommends: liblocale-ruby1.8 | ruby-locale Replaces: mauvealert-common Conflicts: mauvealert-common -- cgit v1.2.1 From f4cd829b1157defb3d03b1b15aa815287a866b46 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Tue, 1 Aug 2017 14:37:49 +0100 Subject: Updated changelog --- debian/changelog | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ab9ca5f..a5a176b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ mauvealert (3.16.0) UNRELEASED; urgency=medium - * Re-packaged to install server into /srv, removing common package. - - -- Patrick J Cherry Mon, 31 Jul 2017 11:31:34 +0100 + * Re-packaged to install server into /srv, removing common package. (!2) + * Fixed a typo in the Depends field for mauvealert-client. (!2) + * Removed lots of old, unused scripts, and merged the example configuration + into /etc/mauvealert/mauveserver.conf. (!2) + * Changed supervision model to systemd. (!2) + * Removed XMPP support. (!2) + + -- Patrick J Cherry Mon, 01 Aug 2017 14:37:32 +0100 mauvealert (3.15.15-1) stable; urgency=medium -- cgit v1.2.1 From 814ed65fd415cc62b2f6f661a7f6d1629562544b Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Tue, 1 Aug 2017 15:50:13 +0100 Subject: Removed misleading comment --- debian/mauvealert-server.postrm | 3 --- 1 file changed, 3 deletions(-) (limited to 'debian') diff --git a/debian/mauvealert-server.postrm b/debian/mauvealert-server.postrm index 24fd158..d54e402 100644 --- a/debian/mauvealert-server.postrm +++ b/debian/mauvealert-server.postrm @@ -2,9 +2,6 @@ set -e -## -# Add a mauve user -## RUNASUSER=mauvealert if [ "$1" = "purge" ] ; then -- cgit v1.2.1 From 936433a8e3330021abaf6543d79b055d23565d99 Mon Sep 17 00:00:00 2001 From: Phil Manavopoulos Date: Tue, 12 Sep 2017 16:28:35 +0100 Subject: Update changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a5a176b..aced497 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ mauvealert (3.16.0) UNRELEASED; urgency=medium into /etc/mauvealert/mauveserver.conf. (!2) * Changed supervision model to systemd. (!2) * Removed XMPP support. (!2) + * Change 'Events' nav item to load day list instead of calendar (#18, !4) -- Patrick J Cherry Mon, 01 Aug 2017 14:37:32 +0100 -- cgit v1.2.1 From 44636adb743dbe538a059a8dd34485a678018f0b Mon Sep 17 00:00:00 2001 From: Phil Manavopoulos Date: Tue, 12 Sep 2017 16:30:37 +0100 Subject: Update changelog --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aced497..e4d42d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,8 @@ mauvealert (3.16.0) UNRELEASED; urgency=medium into /etc/mauvealert/mauveserver.conf. (!2) * Changed supervision model to systemd. (!2) * Removed XMPP support. (!2) - * Change 'Events' nav item to load day list instead of calendar (#18, !4) + * Make authentication work for AJAX requests (#22, !3) + * Change 'Events' nav item to load day list instead of calendar (#18, !3) -- Patrick J Cherry Mon, 01 Aug 2017 14:37:32 +0100 -- cgit v1.2.1 From fa9b1e69d7835bce47990648c6d01fc3f67fcded Mon Sep 17 00:00:00 2001 From: telyn Date: Mon, 29 Jan 2018 15:36:25 +0000 Subject: Add changelog entry & remove locale from gemfile --- debian/changelog | 3 +++ debian/control | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e4d42d3..b436c88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ mauvealert (3.16.0) UNRELEASED; urgency=medium * Make authentication work for AJAX requests (#22, !3) * Change 'Events' nav item to load day list instead of calendar (#18, !3) + [ Telyn Roat] + * Removed need for locale gem outside of tests. (github pr #3) + -- Patrick J Cherry Mon, 01 Aug 2017 14:37:32 +0100 mauvealert (3.15.15-1) stable; urgency=medium diff --git a/debian/control b/debian/control index 5e913b3..41864f8 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ Architecture: any Pre-Depends: libjs-jquery Depends: adduser, lsb-base, ruby | ruby-interpreter, ruby-bundler, ${shlibs:Depends}, ${misc:Depends} Suggests: mauvealert-client -Recommends: ruby-locale | liblocale-ruby1.8 Description: Mauve network alert system -- server Mauve is a network alert system for system and network administrators. You can use it to quickly set up ad-hoc monitoring for a variety of services, and to @@ -25,7 +24,6 @@ Description: Mauve network alert system -- server Package: mauvealert-client Architecture: all Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} -Recommends: liblocale-ruby1.8 | ruby-locale Replaces: mauvealert-common Conflicts: mauvealert-common Provides: mauvealert-common -- cgit v1.2.1 From 9af0d1761552601db30de7a991d90d64ec6c88f5 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Wed, 31 Jan 2018 11:06:29 +0000 Subject: Updated changelog for release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b436c88..bde7fd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mauvealert (3.16.0) UNRELEASED; urgency=medium +mauvealert (3.16.0) stable; urgency=medium * Re-packaged to install server into /srv, removing common package. (!2) * Fixed a typo in the Depends field for mauvealert-client. (!2) @@ -12,7 +12,7 @@ mauvealert (3.16.0) UNRELEASED; urgency=medium [ Telyn Roat] * Removed need for locale gem outside of tests. (github pr #3) - -- Patrick J Cherry Mon, 01 Aug 2017 14:37:32 +0100 + -- Patrick J Cherry Wed, 31 Jan 2018 11:05:14 +0000 mauvealert (3.15.15-1) stable; urgency=medium -- cgit v1.2.1