remove charonstart option as deprecated

README.md

@@ -26,7 +26,6 @@ The `ipsec.conf` file is configured through the following vars (and their defaul
 ```
 strongswan_config_setup:
   uniqueids: yes
-  charonstart: yes
   charondebug: ''
 
 strongswan_conn_default: {}

defaults/main.yml

@@ -1,12 +1,11 @@
 ---
 
-strongswan_config_file:  "{{strongswan_prefix}}/ipsec.conf"
+strongswan_config_file:  "{{ strongswan_prefix }}/ipsec.conf"
 
-strongswan_secrets_file: "{{strongswan_prefix}}/ipsec.secrets"
+strongswan_secrets_file: "{{ strongswan_prefix }}/ipsec.secrets"
 
 strongswan_config_setup:
   uniqueids: 'yes'
-  charonstart: 'yes'
   charondebug: ''
 
 # strongswan_conn_default: Defaults for connections

handlers/main.yml

@@ -2,12 +2,12 @@
 
 - name: ipsec reload
   command: >
-    {{strongswan_ipsec_bin}} reload
+    {{ strongswan_ipsec_bin }} reload
   when: not (_strongswan_pkgs|changed)
 
 - name: ipsec secrets reload
   command: >
-    {{strongswan_ipsec_bin}} rereadsecrets
+    {{ strongswan_ipsec_bin }} rereadsecrets
   when: not (_strongswan_pkgs|changed)
 
 

tasks/config.yml

@@ -3,7 +3,7 @@
 - name: Strongswan ipsec.conf
   template:
     src: etc/ipsec.conf.j2
-    dest: "{{strongswan_config_file}}"
+    dest: "{{ strongswan_config_file }}"
     owner: "root"
     group: "root"
     mode: "0644"
@@ -12,7 +12,7 @@
 - name: Strongswan ipsec.secrets
   template:
     src: etc/ipsec.secrets.j2
-    dest: "{{strongswan_secrets_file}}"
+    dest: "{{ strongswan_secrets_file }}"
     owner: "root"
     group: "root"
     mode: "0640"

tasks/install.yml

@@ -1,12 +1,12 @@
 ---
 
-- include: "install/{{ansible_os_family}}.yml"
+- include: "install/{{ ansible_os_family }}.yml"
 
 - name: Strongswan packages
   package:
-    name: "{{item}}"
+    name: "{{ item }}"
     state: present
-  with_items: "{{strongswan_packages}}"
+  with_items: "{{ strongswan_packages }}"
   register: _strongswan_pkgs
 
 # vi:ts=2:sw=2:et:ft=yaml

tasks/install/RedHat.yml

@@ -2,7 +2,7 @@
 
 - name: EPEL Repository (RedHat)
   yum:
-    name: "{{strongswan_epel_url}}"
+    name: "{{ strongswan_epel_url }}"
     state: present
 
 # vi:ts=2:sw=2:et:ft=yaml

tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Include OS Family vars
-  include_vars: "{{ansible_os_family}}.yml"
+  include_vars: "{{ ansible_os_family }}.yml"
   tags: always
 
 - include: install.yml

tests/test_config.yml

@@ -9,8 +9,8 @@
         uniqueids: yes
         charondebug: 'ike 2, knl 3, cfg 0'
     - strongswan_conn_default:
-        left: "{{ansible_default_ipv4.address}}"
-        leftsourceip: "{{ansible_default_ipv4.address}}"
+        left: "{{ ansible_default_ipv4.address }}"
+        leftsourceip: "{{ ansible_default_ipv4.address }}"
         leftsubnet: 10.0.0.0/16
         type: tunnel
         keyexchange: ikev2
@@ -22,7 +22,7 @@
           esp: aes256-sha1-modp1024
           auto: route
     - strongswan_secrets:
-        - left: "{{ansible_default_ipv4.address}}"
+        - left: "{{ ansible_default_ipv4.address }}"
           right: 1.2.3.4
           type: PSK
           credentials: '"super wooper dooper secret"'

tests/test_vagrant.yml

@@ -9,8 +9,8 @@
         uniqueids: yes
         charondebug: 'ike 2, knl 3, cfg 0'
     - strongswan_conn_default:
-        left: "{{ansible_default_ipv4.address}}"
-        leftsourceip: "{{ansible_default_ipv4.address}}"
+        left: "{{ ansible_default_ipv4.address }}"
+        leftsourceip: "{{ ansible_default_ipv4.address }}"
         leftsubnet: 10.0.0.0/16
         type: tunnel
         keyexchange: ikev2
@@ -22,7 +22,7 @@
           esp: aes256-sha1-modp1024
           auto: route
     - strongswan_secrets:
-        - left: "{{ansible_default_ipv4.address}}"
+        - left: "{{ ansible_default_ipv4.address }}"
           right: 1.2.3.4
           type: PSK
           credentials: '"super wooper dooper secret"'

vars/RedHat.yml

@@ -7,13 +7,13 @@ strongswan_prefix: /etc/strongswan
 
 strongswan_ipsec_bin: /sbin/strongswan
 
-strongswan_os_major: "{{ansible_distribution_major_version}}"
-#  CentOS: "{{ansible_distribution_major_version}}"
-#  RedHat: "{{ansible_distribution_major_version}}"
+strongswan_os_major: "{{ ansible_distribution_major_version }}"
+#  CentOS: "{{ ansible_distribution_major_version }}"
+#  RedHat: "{{ ansible_distribution_major_version }}"
 #  Amazon: 6
 
 strongswan_epel_baseurl: "https://dl.fedoraproject.org"
-strongswan_epel_package: "epel-release-latest-{{strongswan_os_major[ansible_distribution]}}.noarch.rpm"
-strongswan_epel_url: "{{strongswan_epel_baseurl}}/pub/epel/{{strongswan_epel_package}}"
+strongswan_epel_package: "epel-release-latest-{{ strongswan_os_major[ansible_distribution] }}.noarch.rpm"
+strongswan_epel_url: "{{ strongswan_epel_baseurl }}/pub/epel/{{ strongswan_epel_package }}"
 
 # vi:ts=2:sw=2:et:ft=yaml