Merge pull request #105 from Native-Planet/nallux_dev

v1.0.2
Native-Planet · Jan 2, 2023 · 253da48 · 253da48
2 parents 84474d9 + 93fb4e1
commit 253da48
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 13 deletions.
diff --git a/api/orchestrator.py b/api/orchestrator.py
@@ -42,7 +42,7 @@ class Orchestrator:
     _disk = None
 
     # GroundSeg
-    gs_version = 'v1.0.1'
+    gs_version = 'v1.0.2'
     _vm = False
     anchor_config = {'lease': None,'ongoing': None}
     minIO_on = False
@@ -812,18 +812,39 @@ def register_urbit(self, patp):
                 self.anchor_config = x 
                 self.wireguard.update_wg_config(x['conf'])
 
-
             if self.anchor_config != None:
-                for ep in self.anchor_config['subdomains']:
-
-                    ep_patp = ep['url'].split('.')[-3]
-
-                    if patp == ep_patp :
-                        Log.log_groundseg(f"{patp}: {ep['svc_type']} already exists")
-                    else:
-                        Log.log_groundseg(f"{patp}: Registering services")
-                        self.wireguard.register_service(f'{patp}','urbit',url)
-                        self.wireguard.register_service(f's3.{patp}','minio',url)
+             if self.anchor_config != None:
+                 # Define services
+                 urbit_web = False
+                 urbit_ames = False
+                 minio_svc = False
+                 minio_console = False
+                 minio_bucket = False
+                 # Check if service exists for patp
+                 for ep in self.anchor_config['subdomains']:
+                     ep_patp = ep['url'].split('.')[-3]
+                     ep_svc = ep['svc_type']
+                     if ep_patp == patp:
+                         if ep_svc == 'urbit-web':
+                             urbit_web = True
+                         if ep_svc == 'urbit-ames':
+                             urbit_ames = True
+                         if ep_svc == 'minio':
+                             minio_svc = True
+                         if ep_svc == 'minio-console':
+                             minio_console = True
+                         if ep_svc == 'minio-bucket':
+                             minio_bucket = True
+
+                 # One or more of the urbit services is not registered
+                 if not (urbit_web and urbit_ames):
+                     Log.log_groundseg(f"{patp}: Registering Urbit anchor services")
+                     self.wireguard.register_service(f'{patp}','urbit',url)
+
+                 # One or more of the minio services is not registered
+                 if not (minio_svc and minio_console and minio_bucket):
+                     Log.log_groundseg(f"{patp}: Registering MinIO anchor services")
+                     self.wireguard.register_service(f's3.{patp}','minio',url)
 
             x = self.wireguard.get_status(url)
             if x != None:

diff --git a/release/version.csv b/release/version.csv
@@ -1,3 +1,4 @@
+v1.0.2,26e027154051ec0474eee1ee880460bc875d4ddfe37631abeb31be7dbbfa15b3,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.2/groundseg
 v1.0.1,b9f635e18ce391e18ab5c789f785394129ee5fb18c31032d051978f863385321,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.1/groundseg
 v1.0.0,f821c439ab5b4d47867fa40ba3e045f32143e16d7143534b3a6186e4e9a56ec1,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.0/groundseg
 Beta-3.5.5,c14bad974c2c7803e16cd6606b75195d162351e95106fa948783c4c72b50ad1f,https://github.com/Native-Planet/GroundSeg/releases/download/beta-3.5.5/groundseg

diff --git a/release/version_edge.csv b/release/version_edge.csv
@@ -1,3 +1,4 @@
+v1.0.2,26e027154051ec0474eee1ee880460bc875d4ddfe37631abeb31be7dbbfa15b3,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.2/groundseg
 v1.0.1-edge,2f54147e03851723c94b5469b0819b6475ee04205103e31fdc4ab00b1fa35257,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.1-edge/groundseg
 v1.0.0,f821c439ab5b4d47867fa40ba3e045f32143e16d7143534b3a6186e4e9a56ec1,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.0/groundseg
 Beta-3.5.6-edge,84c3346dbf510c9557162526163cda94096580e8f1fa3922e2d203f0d9a14583,https://github.com/Native-Planet/GroundSeg/releases/download/beta-3.5.6-edge/groundseg

diff --git a/ui/src/lib/api.js b/ui/src/lib/api.js
@@ -1,6 +1,6 @@
 import { writable } from 'svelte/store'
 
-export const webuiVersion = 'v1.0.1'
+export const webuiVersion = 'v1.0.2'
 
 //
 // fade transition params