From 17a4e89c4f2b81caedf584a3ae9c0cce6a09237e Mon Sep 17 00:00:00 2001
From: Ali Makki <alimakki@gmail.com>
Date: Sun, 23 Sep 2018 14:48:36 -0400
Subject: [PATCH] comment out openvpn apt, install from ubuntu repo instead

---
 playbooks/roles/openvpn/tasks/install.yml | 28 +++++++++++------------
 playbooks/streisand.yml                   |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/playbooks/roles/openvpn/tasks/install.yml b/playbooks/roles/openvpn/tasks/install.yml
index ce2505871..d63c667c6 100644
--- a/playbooks/roles/openvpn/tasks/install.yml
+++ b/playbooks/roles/openvpn/tasks/install.yml
@@ -1,19 +1,19 @@
 ---
-- name: "Add the official OpenVPN APT key; hiding 25 lines of log..."
-  apt_key:
-    id: E158C569
-    data: "{{ item }}"
-  with_file: openvpn_signing.key
-  no_log: True
+#- name: "Add the official OpenVPN APT key; hiding 25 lines of log..."
+#  apt_key:
+#    id: E158C569
+#    data: "{{ item }}"
+#  with_file: openvpn_signing.key
+#  no_log: True
 
-- name: Add the official OpenVPN repository
-  apt_repository:
-    repo: 'deb https://build.openvpn.net/debian/openvpn/stable {{ ansible_lsb.codename }} main'
-    state: present
-  register: openvpn_add_apt_repository
-  until: not openvpn_add_apt_repository.failed
-  retries: "{{ apt_repository_retries }}"
-  delay: "{{ apt_repository_delay }}"
+#- name: Add the official OpenVPN repository
+#  apt_repository:
+#    repo: 'deb https://build.openvpn.net/debian/openvpn/stable {{ ansible_lsb.codename }} main'
+#    state: present
+#  register: openvpn_add_apt_repository
+#  until: not openvpn_add_apt_repository.failed
+#  retries: "{{ apt_repository_retries }}"
+#  delay: "{{ apt_repository_delay }}"
 
 - name: Install OpenVPN and its dependencies from APT
   apt:
diff --git a/playbooks/streisand.yml b/playbooks/streisand.yml
index b9e9f8e3b..649fbb234 100644
--- a/playbooks/streisand.yml
+++ b/playbooks/streisand.yml
@@ -22,8 +22,8 @@
     - ssh
     - role: openconnect
       when: streisand_openconnect_enabled
-    #- role: openvpn
-    #  when: streisand_openvpn_enabled
+    - role: openvpn
+      when: streisand_openvpn_enabled
     #- role: shadowsocks
     #  when: streisand_shadowsocks_enabled
     - role: ssh-forward