Commit 06d4db50 authored by Alain Takoudjou's avatar Alain Takoudjou

re6stnet sr: allow to set parameter 'same-contry'

parent 8d4b5445
...@@ -72,6 +72,12 @@ ...@@ -72,6 +72,12 @@
"description": "Specify that tunnels should be encrypted.", "description": "Specify that tunnels should be encrypted.",
"type": "boolean", "type": "boolean",
"default": false "default": false
},
"same-country": {
"title": "Same Country",
"description": "Prevent tunnelling accross borders of listed countries",
"type": "string",
"default": ""
} }
} }
} }
\ No newline at end of file
...@@ -125,6 +125,7 @@ max-clients = {{ slapparameter_dict.get('max-clients', 0) }} ...@@ -125,6 +125,7 @@ max-clients = {{ slapparameter_dict.get('max-clients', 0) }}
hello = {{ slapparameter_dict.get('hello', 15) }} hello = {{ slapparameter_dict.get('hello', 15) }}
min-protocol = {{ slapparameter_dict.get('min-protocol', -1) }} min-protocol = {{ slapparameter_dict.get('min-protocol', -1) }}
encrypt = {{ slapparameter_dict.get('encrypt', 'False') }} encrypt = {{ slapparameter_dict.get('encrypt', 'False') }}
same-country = {{ slapparameter_dict.get('same-country', '') }}
[re6st-registry-conf] [re6st-registry-conf]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
......
...@@ -25,4 +25,7 @@ encrypt ...@@ -25,4 +25,7 @@ encrypt
{% endif -%} {% endif -%}
{% if parameter_dict.get('max-clients') != '0' -%} {% if parameter_dict.get('max-clients') != '0' -%}
max-clients {{ parameter_dict['max-clients'] }} max-clients {{ parameter_dict['max-clients'] }}
{% endif -%}
{% if parameter_dict.get('same-country') -%}
same-country {{ parameter_dict['same-country'] }}
{% endif -%} {% endif -%}
\ No newline at end of file
...@@ -87,7 +87,7 @@ extra-context = ...@@ -87,7 +87,7 @@ extra-context =
[template-re6stnet] [template-re6stnet]
< = download-base < = download-base
filename = instance-re6stnet.cfg.in filename = instance-re6stnet.cfg.in
md5sum = 6f28b611a0e2415768238f5e8d29d36e md5sum = 8c167f2adb2ed36aeaff773f59214981
[template-apache-conf] [template-apache-conf]
< = download-base < = download-base
...@@ -97,7 +97,7 @@ md5sum = d64cafda1139b740a49a9f5e30a1b57b ...@@ -97,7 +97,7 @@ md5sum = d64cafda1139b740a49a9f5e30a1b57b
[template-re6st-registry-conf] [template-re6st-registry-conf]
< = download-base < = download-base
filename = re6st-registry.conf.in filename = re6st-registry.conf.in
md5sum = 5dc218f887faeffc466e41c7d6191e49 md5sum = b85375cd45c5f2fb0d68e449ae70e2a1
[template-wrapper] [template-wrapper]
< = download-base < = download-base
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment