v1.3.2

AllStarLink · Aug 5, 2024 · 27490aa · 27490aa
1 parent 3189633
commit 27490aa
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 #
 SRCNAME = Allmon3
 PKGNAME = allmon3
-RELVER = 1.3.1
+RELVER = 1.3.2
 DEBVER = 1
 PKGNAME = allmon3
 RELPLAT ?= deb$(shell lsb_release -rs 2> /dev/null)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,12 @@
+allmon3 (1.3.2-1) stable; urgency=medium
+
+  * full support for make install by @jxmx (#239)
+  * Add cache busting for JS files by @Pross (#236)
+  * Fix template for Allow/Deny Lists in web.ini by @jxmx (#241)
+  * custom/ui/menu should return an empty JSON not an HTTP 400 error (#237)
+
+ -- Jason McCormick <[email protected]>  Mon, 05 Aug 2024 15:02:52 -0400
+
 allmon3 (1.3.1-1) stable; urgency=medium
 
   * Fix regression in generating menu links (#234)

diff --git a/src/allmon3 b/src/allmon3
@@ -19,7 +19,7 @@ import sys
 from asl_allmon import allmon3_server, allmon3_ws_status, allmon3_ws_cmd, allmon3_ws_voter
 from asl_allmon import node_configs, node_db, security, web_configs
 
-_BUILD_ID = "@@HEAD-DEVELOP@@"
+_BUILD_ID = "1.3.2"
 
 
 # Handle Signals

diff --git a/src/allmon3-passwd b/src/allmon3-passwd
@@ -12,7 +12,7 @@ import csv
 import logging
 import sys
 
-_BUILD_ID = "@@HEAD-DEVELOP@@"
+_BUILD_ID = "1.3.2"
 
 def get_user_index(lst, k, v):
     for i, dic in enumerate(lst):

diff --git a/src/allmon3.1.md b/src/allmon3.1.md
@@ -1,4 +1,4 @@
-% allmon3(1) allmon3 @@HEAD-DEVELOP@@
+% allmon3(1) allmon3 1.3.2
 % Jason McCormick
 % May 2023
 

diff --git a/src/asl_allmon/allmon3_server/__init__.py b/src/asl_allmon/allmon3_server/__init__.py
@@ -18,7 +18,7 @@
 import websockets
 from .. import node_configs, security, web_configs
 
-__BUILD_ID = "@@HEAD-DEVELOP@@"
+__BUILD_ID = "1.3.2"
 log = logging.getLogger(__name__)
 
 class ServerWS:

diff --git a/src/asl_allmon/allmon3_ws_cmd/__init__.py b/src/asl_allmon/allmon3_ws_cmd/__init__.py
@@ -18,7 +18,7 @@
 from websockets import exceptions as ws_exceptions
 from .. import ami_conn, ami_parser, node_configs, node_db, ws_broadcaster
 
-__BUILD_ID = "@@HEAD-DEVELOP@@"
+__BUILD_ID = "1.3.2"
 log = logging.getLogger(__name__)
 
 class NodeCmdWS:

diff --git a/src/asl_allmon/allmon3_ws_status/__init__.py b/src/asl_allmon/allmon3_ws_status/__init__.py
@@ -19,7 +19,7 @@
 from .. import ami_conn, ami_parser, node_configs, node_db, ws_broadcaster
 
 
-__BUILD_ID = "@@HEAD-DEVELOP@@"
+__BUILD_ID = "1.3.2"
 log = logging.getLogger(__name__)
 
 class NodeStatusWS:

diff --git a/src/asl_allmon/allmon3_ws_voter/__init__.py b/src/asl_allmon/allmon3_ws_voter/__init__.py
@@ -18,7 +18,7 @@
 from websockets import exceptions as ws_exceptions
 from .. import ami_conn, ami_parser, node_configs, node_db, ws_broadcaster
 
-__BUILD_ID = "@@HEAD-DEVELOP@@"
+__BUILD_ID = "1.3.2"
 log = logging.getLogger(__name__)
 
 class NodeVoterWS:

diff --git a/src/asl_allmon/ami_conn/__init__.py b/src/asl_allmon/ami_conn/__init__.py
@@ -12,7 +12,7 @@
 import socket
 import uuid
 
-_BUILD_ID = "@@HEAD-DEVELOP@@"
+_BUILD_ID = "1.3.2"
 log = logging.getLogger(__name__)
 
 class AMI:

diff --git a/src/asl_allmon/ami_parser/__init__.py b/src/asl_allmon/ami_parser/__init__.py
@@ -12,7 +12,7 @@
 import logging
 import re
 
-_BUILD_ID = "@@HEAD-DEVELOP@@"
+_BUILD_ID = "1.3.2"
 log = logging.getLogger(__name__)
 
 ## Command Execution Portions

diff --git a/src/asl_allmon/node_configs/__init__.py b/src/asl_allmon/node_configs/__init__.py
@@ -10,7 +10,7 @@
 import pprint
 import re
 
-_BUILD_ID = "@@HEAD-DEVELOP@@"
+_BUILD_ID = "1.3.2"
 log = logging.getLogger(__name__)
 
 class NodeConfigs:

diff --git a/src/asl_allmon/node_db/__init__.py b/src/asl_allmon/node_db/__init__.py
@@ -13,7 +13,7 @@
 import urllib.request
 from .. import node_configs
 
-_BUILD_ID = "@@HEAD-DEVELOP@@"
+_BUILD_ID = "1.3.2"
 log = logging.getLogger(__name__)
 
 class ASLNodeDB:

diff --git a/src/asl_allmon/security/__init__.py b/src/asl_allmon/security/__init__.py
@@ -12,7 +12,7 @@
 import time
 import argon2
 
-_BUILD_ID = "@@HEAD-DEVELOP@@"
+_BUILD_ID = "1.3.2"
 log = logging.getLogger(__name__)
 
 class Security:

diff --git a/src/asl_allmon/web_configs/__init__.py b/src/asl_allmon/web_configs/__init__.py
@@ -10,7 +10,7 @@
 import re
 import sys
 
-_BUILD_ID = "@@HEAD-DEVELOP@@"
+_BUILD_ID = "1.3.2"
 log = logging.getLogger(__name__)
 
 class WebConfigs:

diff --git a/web/index.html b/web/index.html
@@ -19,9 +19,9 @@
     <title>Allmon3</title>
 
 	<!-- CSS -->
-	<link href="css/bootstrap.min.css?v=@@HEAD-DEVELOP@@" rel="stylesheet" crossorigin="anonymous">
-    <link href="css/main.css?v=@@HEAD-DEVELOP@@" rel="stylesheet">
-    <link href="css/custom.css?v=@@HEAD-DEVELOP@@" rel="stylesheet">
+	<link href="css/bootstrap.min.css?v=1.3.2" rel="stylesheet" crossorigin="anonymous">
+    <link href="css/main.css?v=1.3.2" rel="stylesheet">
+    <link href="css/custom.css?v=1.3.2" rel="stylesheet">
 
     <!-- Favicons -->
 	<link rel="apple-touch-icon" href="img/favicons/favicon-180x180.png" type="image/png" sizes="180x180">
@@ -175,7 +175,7 @@ <h5 class="modal-title" id="commandModalTitleBox"></h5>
 				<div class="text-center text-wrap">
 					<img src="img/asl-sidebar-logo.png"><br>
 					<b>Allmon v3</b><br>
-					<span style="color:red">@@HEAD-DEVELOP@@</span>
+					<span style="color:red">1.3.2</span>
 				</div>
 			</div>
 		</nav>
@@ -192,9 +192,9 @@ <h5 class="modal-title" id="commandModalTitleBox"></h5>
 </div>
 <!-- End Main Page -->
 
-<script src="js/bootstrap.bundle.min.js?v=@@HEAD-DEVELOP@@" crossorigin="anonymous"></script>
-<script src="js/functions.js?v=@@HEAD-DEVELOP@@" crossorigin="anonymous"></script>
-<script src="js/commands.js?v=@@HEAD-DEVELOP@@" crossorigin="anonymous"></script>
-<script src="js/index.js?v=@@HEAD-DEVELOP@@" crossorigin="anonymous"></script>
+<script src="js/bootstrap.bundle.min.js?v=1.3.2" crossorigin="anonymous"></script>
+<script src="js/functions.js?v=1.3.2" crossorigin="anonymous"></script>
+<script src="js/commands.js?v=1.3.2" crossorigin="anonymous"></script>
+<script src="js/index.js?v=1.3.2" crossorigin="anonymous"></script>
 </body>
 </html>
diff --git a/web/voter.html b/web/voter.html
@@ -20,9 +20,9 @@
     <title>Allmon3 Voter</title>
 
 	<!-- CSS -->
-	<link href="css/bootstrap.min.css?v=@@HEAD-DEVELOP@@" rel="stylesheet" crossorigin="anonymous">
-    <link href="css/main.css?v=@@HEAD-DEVELOP@@" rel="stylesheet">
-    <link href="css/custom.css?v=@@HEAD-DEVELOP@@" rel="stylesheet">
+	<link href="css/bootstrap.min.css?v=1.3.2" rel="stylesheet" crossorigin="anonymous">
+    <link href="css/main.css?v=1.3.2" rel="stylesheet">
+    <link href="css/custom.css?v=1.3.2" rel="stylesheet">
 
     <!-- Favicons -->
 	<link rel="apple-touch-icon" href="img/favicons/favicon-180x180.png" type="image/png" sizes="180x180">
@@ -169,7 +169,7 @@ <h5 class="modal-title" id="commandModalTitleBox"></h5>
 				<div class="text-center text-wrap">
 					<img src="img/asl-sidebar-logo.png"><br>
 					<b>Allmon v3</b><br>
-					<span style="color:red">@@HEAD-DEVELOP@@</span>
+					<span style="color:red">1.3.2</span>
 				</div>
 			</div>
 		</nav>
@@ -201,10 +201,10 @@ <h5 class="modal-title" id="commandModalTitleBox"></h5>
 </div>
 <!-- End Main Page -->
 
-<script src="js/bootstrap.bundle.min.js?v=@@HEAD-DEVELOP@@" crossorigin="anonymous"></script>
-<script src="js/functions.js?v=@@HEAD-DEVELOP@@" crossorigin="anonymous"></script>
-<script src="js/commands.js?v=@@HEAD-DEVELOP@@" crossorigin="anonymous"></script>
-<script src="js/voter.js?v=@@HEAD-DEVELOP@@" crossorigin="anonymous"></script>
+<script src="js/bootstrap.bundle.min.js?v=1.3.2" crossorigin="anonymous"></script>
+<script src="js/functions.js?v=1.3.2" crossorigin="anonymous"></script>
+<script src="js/commands.js?v=1.3.2" crossorigin="anonymous"></script>
+<script src="js/voter.js?v=1.3.2" crossorigin="anonymous"></script>
 </body>
 </html>