From fe6f551049f381a01008916e7be0a7e74620af8b Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Wed, 4 Nov 2015 23:09:43 +0000
Subject: [PATCH] Move fix-routes.sh to openvpn base and run it on restart

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
 handlers/restart_services.yml                      | 9 +++++++++
 roles/openvpn/{client => base}/files/fix-routes.sh | 0
 roles/openvpn/base/tasks/main.yml                  | 4 ++++
 roles/openvpn/client/tasks/main.yml                | 3 ---
 4 files changed, 13 insertions(+), 3 deletions(-)
 rename roles/openvpn/{client => base}/files/fix-routes.sh (100%)

diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml
index 81c4749704..12189831d4 100644
--- a/handlers/restart_services.yml
+++ b/handlers/restart_services.yml
@@ -87,14 +87,23 @@
 - name: restart openvpn (Fedora)
   when: ansible_distribution == "Fedora"
   action: service name=openvpn@openvpn state=restarted
+  notify:
+  - fix openvpn routing
 
 - name: restart openvpn (RHEL6)
   when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 6
   action: service name=openvpn state=restarted
+  notify:
+  - fix openvpn routing
 
 - name: restart openvpn (RHEL7)
   when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 7
   action: service name=openvpn@openvpn state=restarted
+  notify:
+  - fix openvpn routing
+
+- name: fix openvpn routing
+  action: shell /etc/openvpn/fix-routing.sh
 
 - name: restart postfix
   action: service name=postfix state=restarted
diff --git a/roles/openvpn/client/files/fix-routes.sh b/roles/openvpn/base/files/fix-routes.sh
similarity index 100%
rename from roles/openvpn/client/files/fix-routes.sh
rename to roles/openvpn/base/files/fix-routes.sh
diff --git a/roles/openvpn/base/tasks/main.yml b/roles/openvpn/base/tasks/main.yml
index faba0ef9cc..12004b9842 100644
--- a/roles/openvpn/base/tasks/main.yml
+++ b/roles/openvpn/base/tasks/main.yml
@@ -20,3 +20,7 @@
   - restart openvpn (RHEL7)
   - restart openvpn (RHEL6)
 
+- name: install fix-routes.sh script
+  copy: src=fix-routes.sh
+        dest=/etc/openvpn/fix-routes.sh
+        owner=root group=root mode=0755
diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml
index 67e44b1ac8..76817a24f9 100644
--- a/roles/openvpn/client/tasks/main.yml
+++ b/roles/openvpn/client/tasks/main.yml
@@ -17,9 +17,6 @@
   - { file: client.conf,
       dest: /etc/openvpn/openvpn.conf,
       mode: '0644' }
-  - { file: fix-routes.sh,
-      dest: /etc/openvpn/fix-routes.sh,
-      mode: '0755' }
   - { file: "{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.crt",
       dest: "/etc/openvpn/client.crt",
       mode: '0600' }