Merge pull request #100 from dedis/uses-new-dela-deploy

Uses new dela deploy
dedis · Apr 28, 2022 · 7efc821 · 7efc821
2 parents be99ef0 + 7b7a0f8
commit 7efc821
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/deb-package/pkg/etc/dedis/dvoting/network.env b/deb-package/pkg/etc/dedis/dvoting/network.env
@@ -3,7 +3,9 @@ export uk_ip="172.44.0.2"
 export uk_port="1024"
 export bridge_iface="uk0"
 
-export dela_port="9000"
 export proxy_addr="0.0.0.0:9080"
 export prometheus_addr="0.0.0.0:9100"
-export node_exporter_addr="0.0.0.0:9101"
+export node_exporter_addr="0.0.0.0:9101"
+
+export dela_listen="tcp://0.0.0.0:9000"
+export dela_public="//localhost:9000"
diff --git a/deb-package/pkg/opt/dedis/dvoting/bin/start-dvoting b/deb-package/pkg/opt/dedis/dvoting/bin/start-dvoting
@@ -5,5 +5,8 @@ sleep 5
 source /opt/dedis/dvoting/config/config.env
 source /etc/dedis/dvoting/network.env
 
-echo "Starting ${dela_bin} on port ${dela_port} using folder ${dela_data} ..."
-LLVL=info ${dela_bin} --config ${dela_data} start --unikerneladdr ${uk_ip}":"${uk_port} --unikernelfolder ${fs_mount} --externalip --postinstall --promaddr ${prometheus_addr} --proxyaddr ${proxy_addr} --port ${dela_port}
+echo "Starting ${dela_bin} on ${dela_listen} using folder ${dela_data} ..."
+
+pk=3c07e93b9d99032366f7d92697f8dc1337bf8bb617b3faa6389e94d18e3d0e40
+
+LLVL=info ${dela_bin} --config ${dela_data} start --unikerneladdr ${uk_ip}":"${uk_port} --unikernelfolder ${fs_mount} --postinstall --promaddr ${prometheus_addr} --proxyaddr ${proxy_addr} --listen ${dela_listen} --public ${dela_public} --proxykey ${pk}