Merge branch 'AddVPNService' of github.com:jermowery/xos into AddVPNService
diff --git a/xos/observers/vpn/steps/sync_vpntenant.py b/xos/observers/vpn/steps/sync_vpntenant.py
index 0ce7ab0..0cd2ef2 100644
--- a/xos/observers/vpn/steps/sync_vpntenant.py
+++ b/xos/observers/vpn/steps/sync_vpntenant.py
@@ -27,4 +27,4 @@
return objs
def get_extra_attributes(self, o):
- return {"server_key": o.server_key}
+ return {"server_key": o.server_key.splitlines()}
diff --git a/xos/observers/vpn/steps/sync_vpntenant.yaml b/xos/observers/vpn/steps/sync_vpntenant.yaml
index 1814593..4297fce 100644
--- a/xos/observers/vpn/steps/sync_vpntenant.yaml
+++ b/xos/observers/vpn/steps/sync_vpntenant.yaml
@@ -8,13 +8,23 @@
- name: install openvpn
apt: name=openvpn state=present update_cache=yes
+ - name: clear key
+ shell: echo "" > "static.key"
+
- name: write key
- shell:
- |
- printf "{{ server_key }}" > "/opt/xos/observers/vpn/static.key"
+ shell: echo {{ '{{' }} item {{ '}}' }} >> static.key
+ with_items: "{{ server_key }}"
- name: write config
- shell: printf "dev tun\nifconfig 10.8.0.1 10.8.0.2\nsecret /opt/xos/observers/vpn/static.key\nkeepalive 10 60\nping-timer-rem\npersist-tun\npersist-key" > "/opt/xos/observers/vpn/server.conf"
+ shell:
+ |
+ printf "dev tun
+ ifconfig 10.8.0.1 10.8.0.2
+ secret static.key
+ keepalive 10 60
+ ping-timer-rem
+ persist-tun
+ persist-key" > server.conf
- name: start openvpn
- shell: openvpn /opt/xos/observers/vpn/server.conf
+ shell: openvpn server.conf &