summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2015-03-27 17:33:35 +0100
committerMagnus Ahltorp <map@kth.se>2015-03-30 15:42:40 +0200
commit2d8d55bb9b6672ebe829b185beb05d4a399167f5 (patch)
treeb13113b172bca8c148a11141384d3274de16edf9 /test
parent1481cc600aee9f8a8b9308fc5cb99bb93ec1898d (diff)
Allow local administrator to override IP address and port for web server
Closes CATLFISH-30
Diffstat (limited to 'test')
-rw-r--r--test/catlfish-test-local-1.cfg7
-rw-r--r--test/catlfish-test-local-signing.cfg3
-rw-r--r--test/catlfish-test.cfg10
3 files changed, 15 insertions, 5 deletions
diff --git a/test/catlfish-test-local-1.cfg b/test/catlfish-test-local-1.cfg
index 5e9a593..608d4c0 100644
--- a/test/catlfish-test-local-1.cfg
+++ b/test/catlfish-test-local-1.cfg
@@ -2,6 +2,13 @@ localnodes:
- frontend-1
- storage-1
+addresses:
+ frontend-1: 127.0.0.1:8082
+ storage-1: 127.0.0.1:8081
+
+publicaddresses:
+ frontend-1: 127.0.0.1:8080
+
paths:
configdir: test/config/
knownroots: known_roots
diff --git a/test/catlfish-test-local-signing.cfg b/test/catlfish-test-local-signing.cfg
index 047c02b..2cc4df2 100644
--- a/test/catlfish-test-local-signing.cfg
+++ b/test/catlfish-test-local-signing.cfg
@@ -1,6 +1,9 @@
localnodes:
- signing-1
+addresses:
+ signing-1: 127.0.0.1:8088
+
paths:
configdir: test/config/
https_certfile: catlfish/webroot/certs/webcert.pem
diff --git a/test/catlfish-test.cfg b/test/catlfish-test.cfg
index 7a4bb18..3131415 100644
--- a/test/catlfish-test.cfg
+++ b/test/catlfish-test.cfg
@@ -1,17 +1,17 @@
-baseurl: https://127.0.0.1:8080/
+baseurl: https://localhost:8080/
frontendnodes:
- name: frontend-1
- publicaddress: 127.0.0.1:8080
- address: 127.0.0.1:8082
+ publicaddress: localhost:8080
+ address: localhost:8082
storagenodes:
- name: storage-1
- address: 127.0.0.1:8081
+ address: localhost:8081
signingnodes:
- name: signing-1
- address: 127.0.0.1:8088
+ address: localhost:8088
mergenodes:
- name: merge-1