diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml index e4c380c06b..ee25a96ac5 100644 --- a/handlers/restart_services.yml +++ b/handlers/restart_services.yml @@ -68,6 +68,9 @@ - name: restart openvpn action: service name=openvpn state=restarted +- name: restart openvpn 7 + action: service name=openvpn@openvpn state=restarted + - name: restart postfix action: service name=postfix state=restarted diff --git a/tasks/openvpn_client.yml b/tasks/openvpn_client.yml index 6a350d0071..536f220d28 100644 --- a/tasks/openvpn_client.yml +++ b/tasks/openvpn_client.yml @@ -10,7 +10,7 @@ tags: - config notify: - - restart openvpn + - restart openvpn {{ ansible_distribution_major_version }} #- name: /etc/openvpn/crl.pem from vpn/openvpn/keys/crl.pem # copy: src="{{ puppet_private }}/vpn/openvpn/keys/crl.pem" dest=/etc/openvpn/crl.pem mode=0644 owner=root group=root @@ -24,24 +24,30 @@ tags: - config notify: - - restart openvpn + - restart openvpn {{ ansible_distribution_major_version }} - name: /etc/openvpn/client.crt copy: src="{{ puppet_private }}/vpn/openvpn/keys/{{ inventory_hostname }}.crt" dest=/etc/openvpn/client.crt mode=0600 owner=root group=root tags: - config notify: - - restart openvpn + - restart openvpn {{ ansible_distribution_major_version }} - name: /etc/openvpn/client.key copy: src="{{ puppet_private }}/vpn/openvpn/keys/{{ inventory_hostname }}.key" dest=/etc/openvpn/client.key mode=0600 owner=root group=root tags: - config notify: - - restart openvpn + - restart openvpn {{ ansible_distribution_major_version }} -- name: enable openvpn service for rhel +- name: enable openvpn service for rhel 6 service: name=openvpn state=running enabled=true tags: - service when: is_rhel is defined and ansible_distribution_major_version != '7' + +- name: enable openvpn service for rhel 7 or fedora + service: name=openvpn@openvpn state=running enabled=true + tags: + - service + when: ansible_distribution_major_version != '6'