Merge branch 'php-fpm-environment'

Author: ndench

README.md

@@ -47,9 +47,9 @@ Here is a list of all the default variables for this role, which are also availa
 system_environment_file: /etc/environment
 
 # Set this to ennable php-fpm environment variables
-php_fpm_environmnet_file:
+php_fpm_environment_file: ''
 # Set this if you want the php-fpm service restarted
-php_fpm_service_name:
+php_fpm_service_name: ''
 
 # The environment file owner
 environment_file_owner: root
@@ -82,7 +82,7 @@ This is an example playbook:
     - franklinkim.environment
   vars:
     php_fpm_environment_file: /etc/php-fpm.www.conf
-    php_fpm_service_name: # Specify this to restart the php-fpm service
+    php_fpm_service_name: '' # Specify this to restart the php-fpm service
     environment_config:
       LC_ALL: en_US.UTF-8  # Added to system environment
       APP_ENV: 

defaults/main.yml

@@ -4,9 +4,9 @@
 system_environment_file: /etc/environment
 
 # Set this to ennable php-fpm environment variables
-php_fpm_environmnet_file:
+php_fpm_environment_file: ''
 # Set this if you want the php-fpm service restarted
-php_fpm_service_name:
+php_fpm_service_name: ''
 
 # The environment file owner
 environment_file_owner: root

tasks/config.yml

@@ -17,7 +17,7 @@
     state: touch
   register: environment_file_result
   changed_when: environment_file_result.diff.before.state != "file"
-  when: php_fpm_environment_file is defined
+  when: php_fpm_environment_file != ''
 
 - name: Remove previous system values
   lineinfile:
@@ -44,7 +44,7 @@
     regexp: '^env\[{{ item.key }}\]?\ ='
     state: absent
   with_dict: "{{ environment_config }}"
-  when: php_fpm_environment_file is defined and (item.value.environments is defined and 'php-fpm' in item.value.environments)
+  when: php_fpm_environment_file != '' and (item.value.environments is defined and 'php-fpm' in item.value.environments)
 
 # The config goes into the php-fpm environment file if:
 #   * the value is a dict that contains 
@@ -55,11 +55,11 @@
     dest: "{{ php_fpm_environment_file }}"
     line: 'env[{{ item.key }}] = "{{ item.value.value }}"'
   with_dict: "{{ environment_config }}"
-  when: php_fpm_environment_file is defined and (item.value.environments is defined and 'php-fpm' in item.value.environments)
+  when: php_fpm_environment_file != '' and (item.value.environments is defined and 'php-fpm' in item.value.environments)
 
 - name: restart php-fpm
   systemd: 
     name: "{{ php_fpm_service_name }}"
     state: restarted
-  when: php_fpm_service_name is defined
+  when: php_fpm_service_name != ''
 

tests/main.yml

@@ -5,7 +5,7 @@
     - franklinkim.environment
   vars:
     php_fpm_environment_file: /etc/php-fpm.www.conf
-    php_fpm_service_name: # Specify this to restart the php-fpm service
+    php_fpm_service_name: '' # Specify this to restart the php-fpm service
     environment_config:
       LC_ALL: en_US.UTF-8  # Added to system environment
       APP_ENV: