浏览代码

use protocol when specifying web serer

Also makes Bob send more attachment messages.
Justin Tracey 10 月之前
父节点
当前提交
83ac05ef39

+ 2 - 2
README.md

@@ -76,8 +76,8 @@ conversations:
     # where <address> is an IP, onion address, or hostname.
     message_server: "server.maybe.onion:6397"
 
-    # Similarly, but for the web server.
-    web_server: "server.maybe.onion:6398"
+    # Similarly, but for the web server (must include protocol).
+    web_server: "https://server.maybe.onion:6398"
 
     # The number of seconds to wait until the client starts sending messages.
     # This should be long enough that all clients have had time to start

+ 2 - 2
shadow/client/shadow.data.template/hosts/client1/alice.yaml

@@ -2,7 +2,7 @@ user: "Alice"
 conversations:
   - group: "group1"
     message_server: "server:6397"
-    web_server: "web:6398"
+    web_server: "https://web:6398"
     bootstrap: 5.0
     retry: 5.0
     distributions: &dists
@@ -15,7 +15,7 @@ conversations:
       a_r: { distribution: "Normal", mean: 10.0, std_dev: 5.0 }
   - group: "group2"
     message_server: "server:6397"
-    web_server: "web:6398"
+    web_server: "https://web:6398"
     bootstrap: 5.0
     retry: 5.0
     distributions: *dists

+ 3 - 3
shadow/client/shadow.data.template/hosts/client2/bob.yaml

@@ -2,20 +2,20 @@ user: "Bob"
 conversations:
   - group: "group1"
     message_server: "server:6397"
-    web_server: "web:6398"
+    web_server: "https://web:6398"
     bootstrap: 5.0
     retry: 5.0
     distributions: &dists
       s: 0.5
       r: 0.1
-      m: { distribution: "Poisson", lambda: 1.0 }
+      m: { distribution: "Binomial", n: 28, p: 0.5 }
       i: { distribution: "Normal", mean: 15.0, std_dev: 30.0 }
       w: { distribution: "Normal", mean: 30.0, std_dev: 30.0 }
       a_s: { distribution: "Normal", mean: 10.0, std_dev: 5.0 }
       a_r: { distribution: "Normal", mean: 10.0, std_dev: 5.0 }
   - group: "group2"
     message_server: "server:6397"
-    web_server: "web:6398"
+    web_server: "https://web:6398"
     bootstrap: 5.0
     retry: 5.0
     distributions: *dists

+ 1 - 1
shadow/client/shadow.data.template/hosts/client2/carol.yaml

@@ -2,7 +2,7 @@ user: "Carol"
 conversations:
   - group: "group1"
     message_server: "server:6397"
-    web_server: "web:6398"
+    web_server: "https://web:6398"
     bootstrap: 5.0
     retry: 5.0
     distributions:

+ 1 - 1
shadow/client/shadow.data.template/hosts/client3/dave.yaml

@@ -2,7 +2,7 @@ user: "Dave"
 conversations:
   - group: "group2"
     message_server: "server:6397"
-    web_server: "web:6398"
+    web_server: "https://web:6398"
     bootstrap: 5.0
     retry: 5.0
     distributions: