diff --git a/config/roles/vpnweb/tasks/main.yml b/config/roles/vpnweb/tasks/main.yml index 36484a1234a3a7ed2ebfb8ef74adf40c1b86d819..1fc9e33a5d1ae349c1d39e0ad71e6adf25c04000 100644 --- a/config/roles/vpnweb/tasks/main.yml +++ b/config/roles/vpnweb/tasks/main.yml @@ -12,6 +12,7 @@ obfs4_state_dir: "{{ credentials_dir }}/shapeshifter" locations: "{{ locations }}" domain: "{{ domain_public[0] }}" + provider_description: "{{ provider_config.description }}" gateways: "{{ groups['openvpn'] | map('extract', hostvars) | list }}" openvpn: "{{ openvpn_config }}" provider_api_uri: "https://{{ api_uri }}:4430" diff --git a/plugins/action/simplevpn.py b/plugins/action/simplevpn.py index 0b44bee5a96897c9e6f90e8dd7f5334b9846e8d4..87afc92d23c3649fdb74d5f604e2248af04514e1 100644 --- a/plugins/action/simplevpn.py +++ b/plugins/action/simplevpn.py @@ -59,7 +59,7 @@ def produceEipConfig(config, obfs4_state_dir, public_domain, transports): return eip_config -def produceProviderConfig(public_domain, provider_api_uri, ca_cert_uri, ca_public_crt): +def produceProviderConfig(public_domain, provider_description, provider_api_uri, ca_cert_uri, ca_public_crt): ca_fp = get_fingerprint(ca_public_crt) # Build the JSON data structure that needs to end up in provider.json. @@ -70,7 +70,7 @@ def produceProviderConfig(public_domain, provider_api_uri, ca_cert_uri, ca_publi "ca_cert_uri": ca_cert_uri, "default_language": "en", "description": { - "en": "LEAP Provider" + "en": provider_description }, "domain": "%s" % (public_domain), "enrollment_policy": "open", @@ -78,7 +78,7 @@ def produceProviderConfig(public_domain, provider_api_uri, ca_cert_uri, ca_publi "en" ], "name": { - "en": "LEAP Provider" + "en": provider_description }, "service": { "allow_anonymous": True, @@ -115,6 +115,7 @@ class ActionModule(ActionBase): obfs4_state_dir = self._task.args.get('obfs4_state_dir') locations = self._task.args['locations'] public_domain = self._task.args['domain'] + provider_description = self._task.args['provider_description'] transports = self._task.args.get('transports', [ dict(type="openvpn", protocols=["tcp"], ports=["1194"]), dict(type="obfs4", protocols=["tcp"], ports=["23042"]), @@ -129,7 +130,7 @@ class ActionModule(ActionBase): config = EIPConfig(openvpn, locations, gateways) eip_config = produceEipConfig(config, obfs4_state_dir, public_domain, transports) - provider_config = produceProviderConfig(public_domain, provider_api_uri, ca_cert_uri, ca_public_crt) + provider_config = produceProviderConfig(public_domain, provider_description, provider_api_uri, ca_cert_uri, ca_public_crt) result = super(ActionModule, self).run(tmp, task_vars) result.update({