Separating the networks

deploy/bootstrap/run.sh

@@ -172,8 +172,9 @@ version: '3'
 
 # Use the default driver for network creation
 networks:
-  lega:
+  lega-external:
   lega-internal:
+  lega-private:
 
 # Use the default driver for volume creation
 volumes:
@@ -224,7 +225,7 @@ services:
       - ../images/db/grants.sql:/docker-entrypoint-initdb.d/grants.sql:ro
       - ../images/db/entrypoint.sh:/usr/bin/ega-entrypoint.sh
     networks:
-      - lega-internal
+      - lega-private
     entrypoint: ["/bin/bash", "/usr/bin/ega-entrypoint.sh"]
 
   # SFTP inbox
@@ -245,7 +246,8 @@ services:
       - ~/_ega/lega:/home/lega/.local/lib/python3.6/site-packages/lega
       - ~/_auth:/root/_auth
     networks:
-      - lega
+      - lega-external
+      - lega-internal
 #    entrypoint: ["/bin/bash", "/usr/bin/ega-entrypoint.sh"]
 
   # Ingestion Workers
@@ -266,6 +268,7 @@ services:
        - ~/_cryptor/crypt4gh:/home/lega/.local/lib/python3.6/site-packages/crypt4gh
     networks:
       - lega-internal
+      - lega-private
     entrypoint: ["gosu", "lega", "ega-ingest"]
 
   # Checksum validation
@@ -286,6 +289,7 @@ services:
       - ~/_cryptor/crypt4gh:/home/lega/.local/lib/python3.6/site-packages/crypt4gh
     networks:
       - lega-internal
+      - lega-private
     entrypoint: ["gosu", "lega", "ega-verify"]
 
   # Stable ID mapper, and inbox clean up
@@ -299,6 +303,7 @@ services:
       - ~/_ega/lega:/home/lega/.local/lib/python3.6/site-packages/lega
     networks:
       - lega-internal
+      - lega-private
     entrypoint: ["gosu", "lega", "ega-finalize"]
 
   # Here we use S3
@@ -312,7 +317,7 @@ services:
     volumes:
       - vault:/data
     networks:
-      - lega-internal
+      - lega-private
     command: server /data
 
   # HTTP Data-Edge (using OpenID Connect + Permissions Server)
@@ -328,7 +333,7 @@ services:
       - ./outgest.key:/etc/ega/ssl.key
       - ~/_ega/lega:/home/lega/.local/lib/python3.6/site-packages/lega
     networks:
-      - lega
+      - lega-external
       - lega-internal
     entrypoint: ["gosu", "lega", "ega-outgest"]
 
@@ -351,6 +356,7 @@ services:
       - ~/_cryptor/crypt4gh:/home/lega/.local/lib/python3.6/site-packages/crypt4gh
     networks:
       - lega-internal
+      - lega-private
     entrypoint: ["gosu", "lega", "ega-streamer"]
 EOF
 

lega/notifications.py

@@ -18,9 +18,9 @@
 port = 8888
 delim = b'$'
 
-from .conf import CONF
+from .conf import CONF, configure
 from .utils.amqp import publish
-from .utils.checksum import calculate, supported_algorithms
+from .utils.checksum import calculate
 
 LOG = logging.getLogger(__name__)
 
@@ -89,11 +89,8 @@ def connection_lost(self, exc):
         self.transport.close()
 
 
-def main(args=None):
-    if not args:
-        args = sys.argv[1:]
-
-    CONF.setup(args)  # re-conf
+@configure
+def main():
 
     loop = asyncio.get_event_loop()
     server = loop.run_until_complete(loop.create_server(Forwarder, host, port))