diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index 870cea9b9..3fe9b5945 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -54,7 +54,8 @@ with_items: - /etc/openvpn/keys - /etc/openvpn/scripts - - /usr/lib/iiab # For executable up_wan. Comment out in future? Might still be relevant for CentOS but unused for ~2 years as of August 2018. + # Obsolete & unused for ~2 years as of August 2018: + #- /usr/lib/iiab - name: Configure OpenVPN (BACKS UP FILES IF CHANGED) template: @@ -77,8 +78,8 @@ - { src: 'openvpn_handle.j2', dest: '/etc/iiab/openvpn_handle', mode: '0644' } # Comment out in future? Not recommended as of August 2018: - { src: 'iiab-handle.j2', dest: '/usr/bin/iiab-handle', mode: '0755' } - # Comment out in future? Might still be relevant for CentOS but unused for ~2 years as of August 2018: - - { src: 'up_wan', dest: '/usr/lib/iiab/up_wan', mode: '0755' } + # Obsolete & unused for ~2 years as of August 2018: + # - { src: 'up_wan', dest: '/usr/lib/iiab/up_wan', mode: '0755' } # Obsolete & unused for ~2 years as of August 2018: #- { src: 'start.j2', dest: '/usr/lib/iiab/start', mode: '0755' } # Obsolete & unused for ~2 years as of August 2018: @@ -97,11 +98,12 @@ # Comment out in future? Contained serious bug (15-openvpn called # up-wan instead of up_wan in /usr/lib/iiab/ as of August 2018) so # evidently unused for ~2 years: -- name: Put dispatcher up for NM (not debuntu) +- name: Install NM dispatcher.d (for older OS's only, where OpenVPN doesn't auto-start openvpn@xscenet) template: src: 15-openvpn dest: /etc/NetworkManager/dispatcher.d/ - when: not is_debuntu # SHOULD THIS CONDITION ACT ON THE PRESENCE OF NETWORKMANAGER? e.g. some Ubuntu's use NM, others don't. + #when: not is_debuntu # CONDITION APPEARS TOO BROAD + when: False # ADD/ITEMIZE ANY OS'S HERE, WHERE TRULY NEC (e.g. older CentOS, if running older OpenVPN?) # Was obsolete/unused for ~2 years as of August 2018: (replaced by /etc/openvpn/xscenet.conf) #- name: Check for manually configured OpenVPN tunnel @@ -158,6 +160,7 @@ - name: Enable hourly cron job for OpenVPN (starts CHILD service openvpn@xscenet, typically for CentOS only?) lineinfile: path: /etc/crontab + # CONSIDER "restart" not just "start" if something stronger is confirmed needed? line: "25 * * * * root (/usr/bin/systemctl start openvpn@xscenet.service) > /dev/null" when: openvpn_enabled and openvpn_cron_enabled