cleanup

Author: ahelal

meta/main.yml

@@ -22,5 +22,4 @@ galaxy_info:
       - saucy
   categories:
    - web
-dependencies: []
-  
+dependencies: []

tasks/common.yml

@@ -2,7 +2,7 @@
 
 - name: common | Create the directories for site specific configurations
   file: 
-      path="{{nginx_etc}}/{{item}}"
+      path="{{ nginx_etc }}/{{ item }}"
       state=directory
       owner=root
       group=root
@@ -13,49 +13,49 @@
 
 - name: common | Copy the nginx default configuration file 
   template: 
-      src=default.j2
-      dest="{{ nginx_etc }}/sites-available/default.conf"
+    src=default.j2
+    dest="{{ nginx_etc }}/sites-available/default.conf"
 
 - name: common |Copy the nginx default site configuration file 
   template: 
-      src=default.j2
-      dest="{{nginx_etc}}/sites-available/default"
+    src=default.j2
+    dest="{{ nginx_etc }}/sites-available/default"
 
 - name: common | Create the link for site enabled specific configurations
   file: 
-      path="{{nginx_etc}}/sites-enabled/default"
-      state=link
-      src="{{nginx_etc}}/sites-available/default"
+    path="{{ nginx_etc }}/sites-enabled/default"
+    state=link
+    src="{{ nginx_etc }}/sites-available/default"
 
 - name: common | Create the  configuration files for nginx
   template:
-      src=site.j2
-      dest="{{nginx_etc}}/sites-available/{{item.file_name}}.conf"
+    src=site.j2
+    dest="{{ nginx_etc }}/sites-available/{{ item.file_name }}.conf"
   with_items: nginx_site
-  when: nginx_site |lower != 'none'
+  when: nginx_site | lower != 'none'
   notify: 
-   - reload nginx
+   - check reload nginx
 
 ## TODO: Add conidition to disable/enable sites
 - name: Create the link for site enabled specific configurations
   file: 
-     path="{{nginx_etc}}/sites-enabled/{{item.file_name}}.conf"
+     path="{{ nginx_etc }}/sites-enabled/{{ item.file_name }}.conf"
      state=link
-     src="{{nginx_etc}}/sites-available/{{item.file_name}}.conf"
+     src="{{ nginx_etc }}/sites-available/{{ item.file_name }}.conf"
   with_items: nginx_site   
   notify: 
-   - reload nginx
+   - check reload nginx
 
 - name: common | Copy the nginx main configuration file 
   template: 
-      src=nginx.conf.j2
-      dest="{{nginx_etc}}/nginx.conf"
-      validate='nginx -t -c %s'
+    src=nginx.conf.j2
+    dest="{{ nginx_etc }}/nginx.conf"
+    validate='nginx -t -c %s'
   notify: 
-   - restart nginx   
+   - check restart nginx   
 
 - name: common | start the nginx service
   service: 
-      name=nginx
-      state=started
-      enabled=yes
+    name=nginx
+    state=started
+    enabled=yes

tasks/nginx_smartos.yml

@@ -1,19 +1,19 @@
 ---
 
 - name: nginx_smartos | Set etc nginx
-  set_fact:
-    nginx_etc              : "/opt/local/etc/nginx"
+  set_fact :
+    nginx_etc : "/opt/local/etc/nginx"
 
 - name: nginx_smartos | Install the nginx packages 
   pkgin: 
-      name="{{item}}"
-      state=present 
+      name="{{ item }}"
+      state=present
   with_items: solaris_pkg
 
 - name: common | Create the conf.d
   file: 
-      path="{{nginx_etc}}/conf.d"
-      state=directory 
-      owner=root 
-      group=root 
+      path="{{ nginx_etc }}/conf.d"
+      state=directory
+      owner=root
+      group=root
       mode=0755

templates/nginx.conf.j2

@@ -1,14 +1,14 @@
 #{{ ansible_managed }}
 {% if ansible_os_family == 'RedHat' %} 
-user              nginx;
+user    nginx;
 {% elif ansible_os_family == 'Debian' %} 
-user              www-data;
+user    www-data;
 {% elif ansible_os_family == 'Solaris' %} 
-user   www  www;
+user    www  www;
 {% endif %}
 
 worker_processes  {{ ansible_processor_count }};
-pid        /var/run/nginx.pid;
+pid  /var/run/nginx.pid;
 
 {% if nginx_extra_global_vars is defined %}
 # Extra global vars for Nginx
@@ -22,15 +22,15 @@ events {
 }
 
 http {
-        include {{nginx_etc}}/mime.types;
-        default_type application/octet-stream;
+    include {{ nginx_etc }}/mime.types;
+    default_type application/octet-stream;
 {% for k,v in nginx_http_params.iteritems() %}
-        {{ k }}  {{ v }};
+    {{ k }}  {{ v }};
 {% endfor %}
-		#sendfile        on;
-        gzip on;
-        gzip_disable "msie6";
+	#sendfile        on;
+    gzip on;
+    gzip_disable "msie6";
 
-        include {{nginx_etc}}/conf.d/*.conf;
-        include {{nginx_etc}}/sites-enabled/*;
+    include {{ nginx_etc }}/conf.d/*.conf;
+    include {{ nginx_etc }}/sites-enabled/*;
 }

templates/site.j2

@@ -1,4 +1,4 @@
-##{{ansible_managed}}
+##{{ ansible_managed }}
 {% for block in item.blocks %}
 {# First level block #}
 {{block.type}} {{ block.name if block.name is defined else "" }} {

vars/main.yml

@@ -4,12 +4,11 @@ env:
  RUNLEVEL: 1
 
 redhat_pkg:
+  - python-selinux
   - nginx
 
 ubuntu_pkg:
-  - python-selinux
   - nginx
 
 solaris_pkg:
    - nginx
-