V0.6.0 Arroyo Toad

.devcontainer/DOCKERFILES/deno.dockerfile

@@ -0,0 +1,7 @@
+FROM denoland/deno
+RUN apt update -y && \
+apt install \
+git \
+sqlite3 \
+npm \
+-y 

.devcontainer/IoT-Simulator/devcontainer.json

@@ -7,6 +7,17 @@
 
     // Compose-File
     "dockerComposeFile": ["../../docker-compose.yaml"],
+
+    // Customization
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "sswg.swift-lang",
+                "fabiospampinato.vscode-highlight",
+                "fabiospampinato.vscode-todo-plus"
+            ]
+        }
+    },
     
     // The WorkspaceFolder inside container
     "workspaceFolder": "/workspace/IoT-Simulator",

.devcontainer/Leader-Service/devcontainer.json

@@ -7,6 +7,17 @@
 
     // Compose-File
     "dockerComposeFile": ["../../docker-compose.yaml"],
+
+    // Customization
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "denoland.vscode-deno",
+                "fabiospampinato.vscode-highlight",
+                "fabiospampinato.vscode-todo-plus"
+            ]
+        }
+    },
     
     // The WorkspaceFolder inside container
     "workspaceFolder": "/workspace/Leader-Service",

.devcontainer/Nginx-Mediator/devcontainer.json

@@ -1,24 +0,0 @@
-{
-    // Displayed name
-    "name": "nginx-mediator",
-
-    // Service name from compose file
-    "service": "nginx-mediator",
-
-    // Compose-File
-    "dockerComposeFile": ["../../docker-compose.yaml"],
-    
-    // The WorkspaceFolder inside container
-    "workspaceFolder": "/workspace/nginx",
-
-    // Env in container
-    "containerEnv": {
-
-    }
-
-    
-
-    
-    
-
-}

.devcontainer/PublicKey-Backend/devcontainer.json

@@ -0,0 +1,35 @@
+{
+    // Displayed name
+    "name": "PublicKey-Backend",
+
+    // Service name from compose file
+    "service": "publickey-backend",
+
+    // Compose-File
+    "dockerComposeFile": ["../../docker-compose.yaml"],
+
+    // Customization
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "denoland.vscode-deno",
+                "fabiospampinato.vscode-highlight",
+                "fabiospampinato.vscode-todo-plus"
+            ]
+        }
+    },
+    
+    // The WorkspaceFolder inside container
+    "workspaceFolder": "/workspace/PublicKey-Backend",
+
+    // Env in container
+    "containerEnv": {
+
+    }
+
+    
+
+    
+    
+
+}

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "CA-Provisioners"]
 	path = CA-Provisioners
 	url = https://repositories.communitynotfound.work/PoliBa-Software-Architecture/CA-Provisioners.git
+[submodule "PublicKey-Backend"]
+	path = PublicKey-Backend
+	url = https://repositories.communitynotfound.work/PoliBa-Software-Architecture/PublicKey-Backend.git

IoT-Simulator

@@ -1 +1 @@
-Subproject commit c2539d22500f0c0c43d7627cb3495f05add4b78d
+Subproject commit 5d78c9be5855d5541dd07b24d8331c018ddd2c70

PublicKey-Backend

@@ -0,0 +1 @@
+Subproject commit 62bb31c69cb2898febc331fd4bae72c988eca478

docker-compose.yaml

@@ -1,15 +1,6 @@
 name: "IoT-Gatherer-Project"
 
 services:
-  root-ca:
-    image: "swift:latest"
-    volumes:
-      - .:/workspace
-    hostname: root-ca.internal
-    networks:
-      iot-network:
-    command: sleep infinity
-
   iot-simulator:
     image: "swift:latest"
     volumes:
@@ -20,23 +11,27 @@ services:
     command: sleep infinity
 
   leader-service:
-    image: denoland/deno
+    build: 
+      context: .
+      dockerfile: .devcontainer/DOCKERFILES/deno.dockerfile
     volumes:
       - .:/workspace
     hostname: leader-service.internal
     networks:
       iot-network:
     command: sleep infinity
-    
+
-  nginx-mediator:
+  publickey-backend:
-    image: "nginx:latest"
+    build: 
+      context: .
+      dockerfile: .devcontainer/DOCKERFILES/deno.dockerfile
     volumes:
       - .:/workspace
-      - ./nginx/proxy.conf:/etc/nginx/nginx.conf
+    hostname: public-key-db.internal
-    hostname: nginx-mediator.internal
     networks:
       iot-network:
     command: sleep infinity
+    
 
 networks:
   iot-network:

nginx/proxy.conf

@@ -1,33 +0,0 @@
-http {
-
-    # Leader-Service-Proxy
-    server {
-        # TODO: Change IP to a well defined one
-        listen *:80; # This is for testing purposes ONLY, to be changed to 443
-        server_name "nginx-mediator.internal";
-
-        location / {
-            
-            proxy_pass "http://leader-service.internal";
-            proxy_pass_request_headers on;
-            proxy_pass_request_body on;
-
-            proxy_set_header X-Forwarded-For $sent_http_x_iot_ip; # X-IoT-IP
-        }
-    }
-
-    # IoT-Simulator Proxy
-    server {
-        listen *:80; # This is for testing purposes ONLY, to be changed to 443
-
-        location / {
-
-            proxy_pass "http://iot-simulator.internal";
-            proxy_pass_request_headers on;
-            proxy_pass_request_body on;
-
-            proxy_set_header X-Forwarded-Host $sent_http_x_iot_ip; # Set forwarded host to keep the original IP request
-            
-        }
-    }
-}