diff options
| author | Kali Kaneko <kali@leap.se (leap communications)> | 2019-07-30 20:19:51 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se (leap communications)> | 2019-07-30 20:19:51 +0200 |
| commit | b15b36c04bf7ecb94530feb64fb1cfbee428d688 (patch) | |
| tree | 40d2419d21ecbf4d3ce301f7b63a6eec04ddf070 | |
| parent | ec98da8015aae7715b412b1a97101d989d5ea682 (diff) | |
expected list of gateways, make port string
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/templates/eip-service.json.jinja (renamed from scripts/templates/eip-service.json) | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -9,7 +9,7 @@ gen-shapeshifter: scripts/gen-shapeshifter-state.py deploy/shapeshifter-state gen-provider: mkdir -p deploy/public/3 - python3 scripts/simplevpn.py config/demo.yaml scripts/templates/eip-service.json --obfs4_state deploy/shapeshifter-state > deploy/public/3/eip-service.json + python3 scripts/simplevpn.py config/demo.yaml scripts/templates/eip-service.json.jinja --obfs4_state deploy/shapeshifter-state > deploy/public/3/eip-service.json populate: cp test/1/* public/1/ cp test/files/ca.crt public/ diff --git a/scripts/templates/eip-service.json b/scripts/templates/eip-service.json.jinja index 18c7a07..189a422 100644 --- a/scripts/templates/eip-service.json +++ b/scripts/templates/eip-service.json.jinja @@ -9,8 +9,8 @@ "timezone": "{{ locations[loc]['timezone'] }}" }{{ "," if not loop.last }}{% endfor %} }, - "gateways": { {% for gw in gateways %} - "{{gw}}": { + "gateways": [ {% for gw in gateways %} + { "host": "{{ gateways[gw]["host"] }}", "ip_address": "{{ gateways[gw]["ip_address"] }}", "location": "{{ gateways[gw]["location"] }}", @@ -22,11 +22,11 @@ {"type": "{{ tr }}", "protocols": ["{{ proto }}"],{% if options %} "options": {{ options | tojson }},{% endif %} - "ports": [{{ port }}] + "ports": ["{{ port }}"] }{{ "," if not loop.last }}{% endfor %} ] } }{{ "," if not loop.last }}{% endfor %} - }, + ], "openvpn_configuration": {{ openvpn|tojson(indent=8) }} } |