diff options
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | debian/.debhelper/generated/allmon3/dh_installchangelogs.dch.trimmed | 153 | ||||
| -rw-r--r-- | debian/.debhelper/generated/allmon3/installed-by-dh_installdocs | 0 | ||||
| -rw-r--r-- | debian/.debhelper/generated/allmon3/installed-by-dh_installman | 0 | ||||
| -rw-r--r-- | debian/.debhelper/generated/allmon3/postinst.service | 30 | ||||
| -rw-r--r-- | debian/.debhelper/generated/allmon3/prerm.service | 5 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 18 | ||||
| -rw-r--r-- | debian/source/lintian-overrides | 11 |
9 files changed, 25 insertions, 219 deletions
@@ -1,6 +1,8 @@ # # Build variables # +SRCNAME = mfamily-scripts +PKGNAME = $(SRCNAME) RELVER = 1.0 DEBVER = 1 @@ -28,20 +30,22 @@ deb: debclean debprep debuild debchange: - debchange -r -v $(RELVER)-$(DEBVER) + debchange -v $(RELVER)-$(DEBVER) + debchange -r debprep: debclean (cd .. && \ - rm -f mfamily-scripts-$(RELVER) && \ - rm -f mfamily-scripts-$(RELVER).tar.gz && \ - rm -f mfamily-scripts_$(RELVER).orig.tar.gz && \ - ln -s Allmon3 mfamily-scripts-$(RELVER) && \ - tar --exclude=".git" -h -zvcf mfamily-scripts-$(RELVER).tar.gz mfamily-scripts-$(RELVER) && \ - ln -s mfamily-scripts-$(RELVER).tar.gz mfamily-scripts_$(RELVER).orig.tar.gz ) + rm -f $(PKGNAME)-$(RELVER) && \ + rm -f $(PKGNAME)-$(RELVER).tar.gz && \ + rm -f $(PKGNAME)_$(RELVER).orig.tar.gz && \ + ln -s $(SRCNAME) $(PKGNAME)-$(RELVER) && \ + tar --exclude=".git" -h -zvcf $(PKGNAME)-$(RELVER).tar.gz $(PKGNAME)-$(RELVER) && \ + ln -s $(PKGNAME)-$(RELVER).tar.gz $(PKGNAME)_$(RELVER).orig.tar.gz ) debclean: - rm -f ../mfamily-scripts_$(RELVER)* - rm -rf debian/mfamily-scripts + rm -f ../$(PKGNAME)_$(RELVER)* + rm -f ../$(PKGNAME)-$(RELVER)* + rm -rf debian/$(PKGNAME) rm -f debian/files diff --git a/debian/.debhelper/generated/allmon3/dh_installchangelogs.dch.trimmed b/debian/.debhelper/generated/allmon3/dh_installchangelogs.dch.trimmed deleted file mode 100644 index 390f209..0000000 --- a/debian/.debhelper/generated/allmon3/dh_installchangelogs.dch.trimmed +++ /dev/null @@ -1,153 +0,0 @@ -allmon3 (1.1.0-1) unstable; urgency=medium - - * Ensure ASLNodeDB objects are fully async and non-blocking (#185) - * Docker containers have provisional support (#182) - * Fix HTML page title (#186) - * Remove extraneous info-level logging for websocket-based classes - * Better logging around database retrieval errors - - -- Jason McCormick <jason@mfamily.org> Wed, 20 Dec 2023 07:41:10 -0500 - -allmon3 (1.0.2-1) unstable; urgency=medium - - * Provide Nginx configuration (#169) - * Fix CSS breakage from Bootstrap version upgrade (#180) - * Keyed node is now green highlited rather than beige (#181) - - -- Jason McCormick <jason@mfamily.org> Sat, 18 Nov 2023 15:09:36 -0500 - -allmon3 (1.0.1-1) unstable; urgency=medium - - * Fix retry bug that caused silent crash in websocket handlers (#171) - - -- Jason McCormick <jason@mfamily.org> Mon, 30 Oct 2023 19:32:40 -0400 - -allmon3 (1.0.0-1) unstable; urgency=medium - - * Release of major version 1.0.0 - * From 0.11.6, implement asyncio stream code to replace tcp sockets - - -- Jason McCormick <jason@mfamily.org> Fri, 29 Sep 2023 19:51:47 -0400 - -allmon3 (0.11.6-1) unstable; urgency=medium - - * Implement per-user node restrictions (#161) - * Display node uptime in header bar (#162) - - -- Jason McCormick <jason@mfamily.org> Wed, 06 Sep 2023 13:05:56 -0400 - -allmon3 (0.11.5-1) unstable; urgency=medium - - * Don't fail node(s) that are unreachable on startup (#160) - * Pages with the same page#anchor now reload in the menu (#163) - * Better close of asyncio Tasks in the signal handler (#158) - - -- Jason McCormick <jason@mfamily.org> Tue, 05 Sep 2023 11:15:25 -0400 - -allmon3 (0.11.4-2) unstable; urgency=medium - - * Attempt to clarify web client errors for different websocket problems - (#155) - * Add customziation for CONENCTING client lines in main.css/custom.css - (#148) - * Commands starting with 'voter' are only show on the voter page (#153) - * Commands starting with 'voter' are suppressed on the main page (#153) - * Removed links from the node header on the voter display (#153) - * iNodes multinode= leaking in non-displayed node data (#156) - - -- Jason McCormick <jason@mfamily.org> Sun, 06 Aug 2023 13:16:50 -0400 - -allmon3 (0.11.3-1) unstable; urgency=medium - - * Fix issue with WebKit-based browser (Safari) not reloading - websockets on page-back navigation (#151) - * Fix parsing of Asterisk 1.4 commands with voter output (#152) - * Fix issue with nulls turning into text "None" in JSON API calls (#154) - - -- Jason McCormick <jason@mfamily.org> Thu, 13 Jul 2023 12:07:50 -0400 - -allmon3 (0.11.2-2) unstable; urgency=medium - - * Updated the logic of sockets management/retries (#138, #149, #150) - * Fix issue for node-overrides not in the core database (#147) - - -- Jason McCormick <jason@mfamily.org> Fri, 30 Jun 2023 13:11:00 -0400 - -allmon3 (0.11.1-1) unstable; urgency=medium - - * Fix error when node-overrides tries to override a non-existing node - * Split out Debian 10 packaging - - -- Jason McCormick <jason@mfamily.org> Tue, 20 Jun 2023 18:23:11 -0400 - -allmon3 (0.11.0-1) unstable; urgency=medium - - * Complete installation by apt/dpkg into a basic working Allmon3 - * Implementation of per-node commands in web.ini - * IP binding is now configurable - * menu.ini ordering is now preserved in the web interface - * Fix compatability in asyncio with Python 3.7 for Debian 10 support - * Cleanup of JavaScript code - * Handle additional network-related error conditions for AMI connections - - - -- Jason McCormick <jason@mfamily.org> Sat, 17 Jun 2023 15:57:35 -0400 - -allmon3 (0.10.2-2) unstable; urgency=medium - - * Support per-node command templates (see web.ini) - * Retain order of menu.ini submenus in the HTML dropdown - * Add the command modals to the voter display page - * Implement binding IP configuration directive (see web.ini) - * allmon3_server objects now listen on all IPs by default - * Fix apache.conf RewriteRule for v0.10 - * Expose in-browser websocket errors to the UI - * Fix string formatting error for remote transmission status - * Fix dependency issues in allmon3.service systemd service - - -- Jason McCormick <jason@mfamily.org> Sat, 17 Jun 2023 09:22:13 -0400 - -allmon3 (0.10.1-1) unstable; urgency=medium - - * Fix .deb packaging issues - * Implement keepalive cycles - - -- Jason McCormick <jason@mfamily.org> Mon, 22 May 2023 12:14:06 -0400 - -allmon3 (0.10.0-3) unstable; urgency=medium - - * Nearly-complete rewrite from Beta 0.9 - * Configuration files from Beta 0.9 are likely incompatible - * Review configuration files in /usr/share/doc/allmon3 and fix files from - beta 0.9 accordingly - * Apache configuration is fundamentally different - * Debian 10 / Raspian 10 is now semi-supported - - - -- Jason McCormick <jason@mfamily.org> Fri, 26 May 2023 18:22:46 -0400 - -allmon3 (0.9.7-1) unstable; urgency=medium - - * INCOMPATIBLE CHANGE: ip= fields in allmon3.ini and - * votermon.ini are now host= (or related names) and - * can specify an IPv4, IPv6, or DNS item - * Private node labels supported in web.ini - * asl-{statmon,cmdlink,votermon} now support DNS and IPv6 - * All stock configs and readme info now in /usr/share/doc/allmon3 - - -- Jason McCormick <jason@mfamily.org> Fri, 26 May 2023 18:18:01 -0400 - -allmon3 (0.9.6-1) unstable; urgency=medium - - * Implement subsecond polling as a option in `allmon3.ini`. When using the .deb file, `allmon3.ini` will not be updated with the newest information. See https://github.com/AllStarLink/Allmon3/commit/bda1e74e218c217e4381715297eaea72a8d2a236 for specifics - * Implement the voter functionality. Requires `voter.ini`. See `asl-votermon`. - * System commands are now configured in `web.ini` - * Customizable home button href in `web.ini`* - - -- Jason McCormick <jason@mfamily.org> Sat, 15 Apr 2023 13:05:02 -0400 - -allmon3 (0.9.5-1) unstable; urgency=medium - - * Initial complete release of Allmon3 as beta - - -- Jason McCormick <jason@mfamily.org> Tue, 11 Apr 2023 13:51:08 -0400 diff --git a/debian/.debhelper/generated/allmon3/installed-by-dh_installdocs b/debian/.debhelper/generated/allmon3/installed-by-dh_installdocs deleted file mode 100644 index e69de29..0000000 --- a/debian/.debhelper/generated/allmon3/installed-by-dh_installdocs +++ /dev/null diff --git a/debian/.debhelper/generated/allmon3/installed-by-dh_installman b/debian/.debhelper/generated/allmon3/installed-by-dh_installman deleted file mode 100644 index e69de29..0000000 --- a/debian/.debhelper/generated/allmon3/installed-by-dh_installman +++ /dev/null diff --git a/debian/.debhelper/generated/allmon3/postinst.service b/debian/.debhelper/generated/allmon3/postinst.service deleted file mode 100644 index e3bfc44..0000000 --- a/debian/.debhelper/generated/allmon3/postinst.service +++ /dev/null @@ -1,30 +0,0 @@ -# Automatically added by dh_installsystemd/13.11.4 -if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then - # The following line should be removed in trixie or trixie+1 - deb-systemd-helper unmask 'allmon3.service' >/dev/null || true - - # was-enabled defaults to true, so new installations run enable. - if deb-systemd-helper --quiet was-enabled 'allmon3.service'; then - # Enables the unit on first installation, creates new - # symlinks on upgrades if the unit file has changed. - deb-systemd-helper enable 'allmon3.service' >/dev/null || true - else - # Update the statefile to add new symlinks (if any), which need to be - # cleaned up on purge. Also remove old symlinks. - deb-systemd-helper update-state 'allmon3.service' >/dev/null || true - fi -fi -# End automatically added section -# Automatically added by dh_installsystemd/13.11.4 -if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then - if [ -d /run/systemd/system ]; then - systemctl --system daemon-reload >/dev/null || true - if [ -n "$2" ]; then - _dh_action=restart - else - _dh_action=start - fi - deb-systemd-invoke $_dh_action 'allmon3.service' >/dev/null || true - fi -fi -# End automatically added section diff --git a/debian/.debhelper/generated/allmon3/prerm.service b/debian/.debhelper/generated/allmon3/prerm.service deleted file mode 100644 index 3e66189..0000000 --- a/debian/.debhelper/generated/allmon3/prerm.service +++ /dev/null @@ -1,5 +0,0 @@ -# Automatically added by dh_installsystemd/13.11.4 -if [ -z "${DPKG_ROOT:-}" ] && [ "$1" = remove ] && [ -d /run/systemd/system ] ; then - deb-systemd-invoke stop 'allmon3.service' >/dev/null || true -fi -# End automatically added section diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0764198 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +mfamily-scripts (1.0-1) unstable; urgency=medium + + * Initial release + + -- Jason McCormick <jason@mfamily.org> Wed, 20 Dec 2023 17:06:22 -0500 diff --git a/debian/control b/debian/control index 954cb29..47778bb 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,15 @@ -Source: allmon3 +Source: mfamily-scripts Section: hamradio Priority: optional Maintainer: Jason McCormick <jason@mfamily.org> Build-Depends: debhelper-compat (= 13) Standards-Version: 4.5.1 -Homepage: https://github.com/AllStarLink/Allmon3 -Vcs-Browser: https://github.com/AllStarLink/Allmon3 -Vcs-Git: https://github.com/AllStarLink/Allmon3.git +Homepage: https://code.packetwarriors.com/mfamily-scripts +Vcs-Browser: https://code.packetwarriors.com/mfamily-scripts +Vcs-Git: https://code.packetwarriors.com/mfamily-scripts Rules-Requires-Root: binary-targets -Package: allmon3 +Package: mfamily-scripts Architecture: all -Recommends: apache2 | httpd -Depends: python3-argon2, python3, ${misc:Depends}, adduser, python3-aiohttp, python3-aiohttp-session -Description: Web monitoring interface for AllStarLink - application. Allmon3 is the next generation of - the venerable Allmon2 that is rewritten for - performance, scalability, and responsiveness. +Depends: ${misc:Depends}, python3-netifaces +Description: MFamily Scripts diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 16ee08a..e69de29 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,11 +0,0 @@ -# These are part of the source and I'm not sure -# why it's alerting -allmon3 source: source-is-missing [web/index.html] -allmon3 source: source-is-missing [web/voter.html] - -# Overkill to disribute the entire bootstrap download -# in the repository -allmon3 source: source-is-missing [web/js/bootstrap.bundle.min.js] - -# Upstream is debian -allmon3 source: no-debian-changes |