Merge master
diff --git a/xos/synchronizers/vpn/steps/sync_vpntenant.py b/xos/synchronizers/vpn/steps/sync_vpntenant.py
index bd7a571..480211c 100644
--- a/xos/synchronizers/vpn/steps/sync_vpntenant.py
+++ b/xos/synchronizers/vpn/steps/sync_vpntenant.py
@@ -44,11 +44,6 @@
def create_client_script(self, tenant):
script = open("/opt/xos/core/static/vpn/" + str(tenant.script), 'w')
- # write the key portion
- script.write("printf \"")
- for line in tenant.server_key.splitlines():
- script.write(line + r"\n")
- script.write("\" > static.key\n")
# write the configuration portion
script.write("printf \"")
for line in self.generate_client_conf(tenant).splitlines():
diff --git a/xos/synchronizers/vpn/steps/sync_vpntenant.yaml b/xos/synchronizers/vpn/steps/sync_vpntenant.yaml
index 2ed1154..9de3c25 100644
--- a/xos/synchronizers/vpn/steps/sync_vpntenant.yaml
+++ b/xos/synchronizers/vpn/steps/sync_vpntenant.yaml
@@ -43,10 +43,10 @@
with_items: "{{ ca_crt }}"
- name: erase dh
- shell: rm -f dh2048.pem
+ shell: rm -f dh.pem
- name: write dh
- shell: echo {{ '{{' }} item {{ '}}' }} >> dh2048.pem
+ shell: echo {{ '{{' }} item {{ '}}' }} >> dh.pem
with_items: "{{ dh }}"
- name: erase config
@@ -67,7 +67,7 @@
dev tun
cert server.crt
key server.key
- dh dh2048.pem
+ dh dh.pem
server {{ server_network }} {{ vpn_subnet }}
ifconfig-pool-persist ipp.txt
comp-lzo