Updated to 5.31

cli/l.py

@@ -46,17 +46,31 @@ def listen():
                 socket.SO_REUSEADDR,
                 1
             )
-        sock.bind(("0.0.0.0", int(config["seismic_port"])))
-        sock.setsockopt(
-                socket.IPPROTO_IP,
-                socket.IP_MULTICAST_TTL,
-                255
-            )
-        sock.setsockopt(
-                socket.IPPROTO_IP,
-                socket.IP_ADD_MEMBERSHIP,
-                socket.inet_aton(config["seismic_addr"]) + socket.inet_aton("0.0.0.0")
-            )
+
+        try:
+            firstoctet = int(config["seismic_addr"].split(".")[0])
+            is_multicast = firstoctet >= 224
+        except ValueError:
+            is_multicast = False
+
+        if is_multicast:
+            logging.info("Starting multicast listener {}:{}".format(config["seismic_addr"], config["seismic_port"]))
+            sock.bind(("0.0.0.0", int(config["seismic_port"])))
+            sock.setsockopt(
+                    socket.IPPROTO_IP,
+                    socket.IP_MULTICAST_TTL,
+                    255
+                )
+            sock.setsockopt(
+                    socket.IPPROTO_IP,
+                    socket.IP_ADD_MEMBERSHIP,
+                    socket.inet_aton(config["seismic_addr"]) + socket.inet_aton("0.0.0.0")
+                )
+        else:
+            logging.info("Starting unicast listener {}:{}".format(config["seismic_addr"], config["seismic_port"]))
+            sock.bind((config["seismic_addr"], int(config["seismic_port"])))
+
+
         sock.settimeout(1)
 
         while True:

hub/__init__.py

@@ -26,16 +26,19 @@
 
 
 SITE_CSS = [
-        "https://static.nebulabroadcast.com/nebula/css/nebula.css",
+        "/static/css/nebula.css",
+        "/static/css/gijgo-core.css",
+        "/static/css/gijgo-datepicker.css",
     ]
 
 SITE_JS = [
-        "https://static.nebulabroadcast.com/nebula/js/vendor/jquery.min.js",
-        "https://static.nebulabroadcast.com/nebula/js/vendor/popper.min.js",
-        "https://static.nebulabroadcast.com/nebula/js/vendor/bootstrap.min.js",
-        "https://static.nebulabroadcast.com/nebula/js/vendor/bootstrap-select.min.js",
-        "https://static.nebulabroadcast.com/nebula/js/vendor/gijgo.min.js",
-        "https://static.nebulabroadcast.com/nebula/js/vendor/inputmask.min.js",
+        "/static/js/vendor/jquery.min.js",
+        "/static/js/vendor/bootstrap.bundle.min.js",
+        "/static/js/vendor/bootstrap-select.min.js",
+        "/static/js/vendor/gijgo-core.js",
+        "/static/js/vendor/gijgo-datepicker.js",
+        "/static/js/vendor/jquery.inputmask.min.js",
+
         "/static/js/common.js"
     ]
 
@@ -76,13 +79,15 @@ def user_context_helper(meta):
 
 static_dir = config.get(
         "hub_static_dir",
-        os.path.join(config["nebula_root"], "hub", "static")
+        os.path.join(config["nebula_root"], "vendor", "nebula-hub", "dist", "static")
     )
 templates_dir = config.get(
         "hub_templates_dir",
-        os.path.join(config["nebula_root"], "hub", "templates")
+        os.path.join(config["nebula_root"], "vendor", "nebula-hub", "dist", "templates")
     )
 
+default_sessions_dir = os.path.join("/tmp", config["site_name"] + "-sessions")
+
 hub_config = {
         "host" : config.get("hub_host", "0.0.0.0"),
         "port" : config.get("hub_port", 8080),
@@ -92,7 +97,7 @@ def user_context_helper(meta):
         "site_context_helper" : site_context_helper,
         "page_context_helper" : page_context_helper,
         "user_context_helper" : user_context_helper,
-        "sessions_dir" : os.path.join("/tmp", config["site_name"] + "-sessions"),
+        "sessions_dir" : config.get("hub_sessions_dir", default_sessions_dir),
         "sessions_timeout" : 60*24*120,
         "hash_salt" : config.get("hash_salt", "nebulaissalty"),
         "blocking" : True,