diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index f25aa3ed2..85ef06a55 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -45,17 +45,18 @@ - { src: 'announcer.j2', dest: '/etc/openvpn/scripts/announcer', mode: '0755' } - { src: 'silence', dest: '/etc/openvpn/scripts/silence', mode: '0755' } - { src: 'xscenet.conf.j2', dest: '/etc/openvpn/xscenet.conf', mode: '0644' } + - { src: 'iiab-remote-on.j2', dest: '/usr/bin/iiab-remote-on', mode: '0755' } + - { src: 'iiab-remote-off', dest: '/usr/bin/iiab-remote-off', mode: '0755' } + # 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' } + # Unused for ~2 years as of August 2018: + #- { src: 'start.j2', dest: '/usr/lib/iiab/start', mode: '0755' } # Buggy & rarely used as of August 2018: #- { src: 'iiab-vpn.conf.in', dest: '/etc/openvpn/iiab-vpn.conf.in', mode: '0644' } # Buggy & rarely used as of August 2018: #- { src: 'iiab-vpn.j2', dest: '/usr/bin/iiab-vpn', mode: '0755' } - - { src: 'iiab-handle.j2', dest: '/usr/bin/iiab-handle', mode: '0755' } - # Comment out in future? Unused for ~2 years as of August 2018: - - { src: 'up_wan', dest: '/usr/lib/iiab/up_wan', mode: '0755' } - # Unused for ~2 years as of August 2018: - #- { src: 'start.j2', dest: '/usr/lib/iiab/start', mode: '0755' } - - { src: 'iiab-remote-on.j2', dest: '/usr/bin/iiab-remote-on', mode: '0755' } - - { src: 'iiab-remote-off', dest: '/usr/bin/iiab-remote-off', mode: '0755' } - name: Save openvpn_handle variable into /etc/iiab/openvpn_handle (BACKS UP FILE IF CHANGED) template: @@ -84,11 +85,11 @@ dest: /etc/NetworkManager/dispatcher.d/ when: not is_debuntu -# Comment out in future? Unused for ~2 years as of August 2018: -- name: Check for manually configured OpenVPN tunnel - stat: - path: /etc/openvpn/iiab-vpn.conf - register: stat +# Was buggy & unused for ~2 years as of August 2018: +#- name: Check for manually configured OpenVPN tunnel +# stat: +# path: /etc/openvpn/iiab-vpn.conf +# register: stat # FIXED SOMETIME PRIOR TO AUGUST 2018: earlier versions of Ansible had not @@ -120,13 +121,15 @@ name: openvpn@xscenet.service enabled: yes state: restarted - when: openvpn_enabled and not stat.exists is defined + when: openvpn_enabled + #when: openvpn_enabled and not stat.exists is defined - name: Enable hourly cron job for OpenVPN lineinfile: path: /etc/crontab line: "25 * * * * root (/usr/bin/systemctl start openvpn@xscenet.service) > /dev/null" - when: openvpn_enabled and openvpn_cron_enabled and not stat.exists is defined + when: openvpn_enabled and openvpn_cron_enabled + #when: openvpn_enabled and openvpn_cron_enabled and not stat.exists is defined - name: Remove hourly cron job for OpenVPN lineinfile: