summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@autistici.org>2021-02-23 15:44:34 +0100
committerkali kaneko (leap communications) <kali@leap.se>2021-05-27 20:45:06 +0200
commitbbe82d29b8f97bda48ea27e76d0a60d1caa99b85 (patch)
tree2c37c2ea1d14b659b719950514407ff86a874812 /Makefile
parentb32696ea1c07c823b806b00b44ee71d1e9d09c30 (diff)
[feat] add eip v4HEAD1.0master
- Closes: #16
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a435bcd..209e71c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
CONFIG=config/demo.yaml
-EIP_TEMPLATE=scripts/templates/eip-service.json.jinja
-EIP_SERVICE=deploy/public/3/eip-service.json
+EIP_TEMPLATE_3=scripts/templates/3/eip-service.json.jinja
+EIP_TEMPLATE_4=scripts/templates/4/eip-service.json.jinja
+EIP_SERVICE_3=deploy/public/3/eip-service.json
+EIP_SERVICE_4=deploy/public/4/eip-service.json
PROVIDER_TEMPLATE=scripts/templates/provider.json.jinja
PROVIDER=deploy/public/provider.json
@@ -17,7 +19,9 @@ gen-shapeshifter:
scripts/gen-shapeshifter-state.py deploy/shapeshifter-state
gen-provider:
mkdir -p deploy/public/3
- @python3 scripts/simplevpn.py --file=eip --config=$(CONFIG) --template=$(EIP_TEMPLATE) --obfs4_state deploy/shapeshifter-state > $(EIP_SERVICE) || echo "ERROR: see $(EIP_SERVICE) for output"
+ mkdir -p deploy/public/4
+ @python3 scripts/simplevpn.py --file=eip --config=$(CONFIG) --template=$(EIP_TEMPLATE_3) --obfs4_state deploy/shapeshifter-state > $(EIP_SERVICE_3) || echo "ERROR: see $(EIP_SERVICE_3) for output"
+ @python3 scripts/simplevpn.py --file=eip --config=$(CONFIG) --template=$(EIP_TEMPLATE_4) --obfs4_state deploy/shapeshifter-state > $(EIP_SERVICE_4) || echo "ERROR: see $(EIP_SERVICE_4) for output"
@python3 scripts/simplevpn.py --file=provider --config=$(CONFIG) --template=$(PROVIDER_TEMPLATE) > $(PROVIDER) || echo "ERROR: see $(PROVIDER) for output"
rsync -ra deploy/public/ public/
populate: