Submitting

Containerfile

@@ -9,4 +9,4 @@ RUN apt-get update && apt-get install -y \
     vim
 WORKDIR /wgmesh
 RUN go mod tidy
-RUN go build -o /usr/local/bin ./...
+RUN go build -o /usr/local/bin ./...

examples/meshtomesh/docker-compose.yaml

@@ -1,95 +0,0 @@
-version: '3'
-networks:
-  net-1:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: 10.89.0.0/17
-  net-2:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: 10.89.155.0/17
-services:
-  wg-1:
-    image: wg-mesh-base:latest
-    cap_add:
-      - NET_ADMIN
-      - NET_RAW
-    tty: true
-    networks:
-      - net-1
-    volumes:
-      - ./shared:/shared
-    command: "wgmeshd /shared/configuration.yaml"
-  wg-2:
-    image: wg-mesh-base:latest
-    cap_add:
-      - NET_ADMIN
-      - NET_RAW
-    tty: true
-    networks:
-      - net-1
-    volumes:
-      - ./shared:/shared
-    command: "wgmeshd /shared/configuration.yaml"
-  wg-3:
-    image: wg-mesh-base:latest
-    cap_add:
-      - NET_ADMIN
-      - NET_RAW
-    tty: true
-    networks:
-      - net-1
-    volumes:
-      - ./shared:/shared
-    command: "wgmeshd /shared/configuration.yaml"
-  wg-4:
-    image: wg-mesh-base:latest
-    cap_add:
-      - NET_ADMIN
-      - NET_RAW
-    tty: true
-    sysctls:
-      - net.ipv6.conf.all.forwarding=1
-    networks:
-      - net-1
-      - net-2
-    volumes:
-      - ./shared:/shared
-    command: "wgmeshd /shared/configuration.yaml"
-  wg-5:
-    image: wg-mesh-base:latest
-    cap_add:
-      - NET_ADMIN
-      - NET_RAW
-    tty: true
-    networks:
-      - net-2
-    volumes:
-      - ./shared:/shared
-    command: "wgmeshd /shared/configuration.yaml"
-  wg-6:
-    image: wg-mesh-base:latest
-    cap_add:
-      - NET_ADMIN
-      - NET_RAW
-    tty: true
-    networks:
-      - net-2
-    volumes:
-      - ./shared:/shared
-    command: "wgmeshd /shared/configuration.yaml"
-  wg-7:
-    image: wg-mesh-base:latest
-    cap_add:
-      - NET_ADMIN
-      - NET_RAW
-    tty: true
-    networks:
-      - net-2
-    volumes:
-      - ./shared:/shared
-    command: "wgmeshd /shared/configuration.yaml"

examples/meshtomesh/shared/configuration.yaml

@@ -1,14 +0,0 @@
-certificatePath: "/wgmesh/cert/cert.pem"
-privateKeyPath: "/wgmesh/cert/priv.pem"
-caCertificatePath: "/wgmesh/cert/cacert.pem"
-skipCertVerification: true
-timeout: 5
-gRPCPort: "21906"
-advertiseRoutes: true
-clusterSize: 32
-syncRate: 1
-interClusterChance: 0.15
-branchRate: 3
-infectionCount: 3
-heartBeatTime: 10
-pruneTime: 20

examples/simple/docker-compose.yaml

@@ -1,14 +1,9 @@
 version: '3'
 networks:
   net-1:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: 10.89.0.0/17 
 services:
   wg-1:
-    image: wg-mesh-base:latest
+    image: localhost/smegmesh-base:latest
     cap_add:
       - NET_ADMIN
       - NET_RAW
@@ -17,9 +12,11 @@ services:
       - net-1
     volumes:
       - ./shared:/shared
-    command: "wgmeshd /shared/configuration.yaml"
+    command: "smegd /shared/configuration.yaml"
+    sysctls:
+      - net.ipv6.conf.all.forwarding=1
   wg-2:
-    image: wg-mesh-base:latest
+    image: localhost/smegmesh-base:latest
     cap_add:
       - NET_ADMIN
       - NET_RAW
@@ -28,9 +25,11 @@ services:
       - net-1
     volumes:
       - ./shared:/shared
-    command: "wgmeshd /shared/configuration.yaml"
+    command: "smegd /shared/configuration.yaml"
+    sysctls:
+      - net.ipv6.conf.all.forwarding=1
   wg-3:
-    image: wg-mesh-base:latest
+    image: localhost/smegmesh-base:latest
     cap_add:
       - NET_ADMIN
       - NET_RAW
@@ -39,4 +38,6 @@ services:
       - net-1
     volumes:
       - ./shared:/shared
-    command: "wgmeshd /shared/configuration.yaml" 
+    command: "smegd /shared/configuration.yaml"
+    sysctls:
+      - net.ipv6.conf.all.forwarding=1

examples/simple/shared/configuration.yaml

@@ -1,14 +1,34 @@
-certificatePath: "/wgmesh/cert/cert.pem"
+# Paths to the certificates modify
-privateKeyPath: "/wgmesh/cert/priv.pem"
+# if not running from Smegmesh
-caCertificatePath: "/wgmesh/cert/cacert.pem"
+certificatePath: "./cert/cert.pem"
+privateKeyPath: "./cert/priv.pem"
+caCertificatePath: "./cert/cacert.pem"
 skipCertVerification: true
+# timeout is the configured grpc timeout
 timeout: 5
-gRPCPort: "21906"
+# gRPC port to run the solution
-advertiseRoutes: true
+gRPCPort: 4000
-clusterSize: 32
+# whether or not to run go profiler
-syncRate: 1
+profile: false 
-interClusterChance: 0.15
+# stubWg: whether to install WireGuard configurations
-branchRate: 3
+# if true just tests the control plane
+stubWg: false
+heartbeatInterval: 60
+branch: 3
+pullInterval: 20
 infectionCount: 3
-heartBeatTime: 10
+interClusterChance: 0.15
-pruneTime: 20
+syncInterval: 2
+clusterSize: 64
+logLevel: "info"
+baseConfiguration:
+  # ipDiscovery: specifies how to find your IP address
+  ipDiscovery: "outgoing"
+  # alternative to ipDiscovery specify an actual endpoint yourself with publicEndpoint: "xxxx"
+  # role is the role that you are playing (peer | client)
+  # peers can only bootstrap meshes
+  role: "peer"
+  # advertise meshes to other meshes
+  advertiseRoute: true
+  # advertise default routes
+  advertiseDefaults: true