Fix bug default template is deployed twice. This will break smartos and redhat default template (not a big deal)

Author: ahelal

defaults/main.yml

@@ -1,5 +1,6 @@
 ---
 nginx_etc              : "/etc/nginx/"
+nginx_default_root     : "/usr/share/nginx/html" # Will  only work for ubuntu
 nginx_max_clients      : 512
 nginx_install_repo     : "ubuntu" # Options: ["nginx", "ubuntu"]
 nginx_apt_state        : "present" # Options: ["latest", "present"]
@@ -13,19 +14,18 @@ nginx_http_params:
   error_log: "/var/log/nginx/error.log"
 
 nginx_site                            :
-   - file_name                        : "default"
+   - file_name                        : "test"
      blocks                           :
        - type                         : "server"
-         root                         : "/usr/share/nginx/www"
          index                        : "index.html index.htm"
          server_name                  : localhost
          listen                       : 80
          ## Use josn
-         location1                    : { 
-                                          name: /, 
+         location1                    : {
+                                          name: /,
                                           type: location,
                                           try_files: "$uri $uri/ /index.html",
-                                          root: /usr/share/nginx/www
+                                          root: "{{ nginx_default_root }}"
                                         }
          ## Use yaml
          location2                    : 
@@ -35,4 +35,4 @@ nginx_site                            :
                           autoindex   : "on" 
                           allow       : "127.0.0.1"
                           deny        : "all" 
-                                        
+

tasks/common.yml

@@ -3,9 +3,9 @@
 - name: common | Create the directories for site specific configurations
   file: 
       path="{{nginx_etc}}/{{item}}"
-      state=directory 
-      owner=root 
-      group=root 
+      state=directory
+      owner=root
+      group=root
       mode=0755
   with_items:
     - "sites-available"
@@ -14,7 +14,7 @@
 - name: common | Copy the nginx default configuration file 
   template: 
       src=default.j2
-      dest="{{nginx_etc}}/sites-available/default.conf"
+      dest="{{ nginx_etc }}/sites-available/default.conf"
 
 - name: common |Copy the nginx default site configuration file 
   template: 
@@ -24,12 +24,12 @@
 - name: common | Create the link for site enabled specific configurations
   file: 
       path="{{nginx_etc}}/sites-enabled/default"
-      state=link 
+      state=link
       src="{{nginx_etc}}/sites-available/default"
 
 - name: common | Create the  configuration files for nginx
-  template: 
-      src=site.j2 
+  template:
+      src=site.j2
       dest="{{nginx_etc}}/sites-available/{{item.file_name}}.conf"
   with_items: nginx_site
   when: nginx_site |lower != 'none'
@@ -39,9 +39,9 @@
 ## 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" 
-     state=link 
-     src="{{nginx_etc}}/sites-available/{{item.file_name}}.conf" 
+     path="{{nginx_etc}}/sites-enabled/{{item.file_name}}.conf"
+     state=link
+     src="{{nginx_etc}}/sites-available/{{item.file_name}}.conf"
   with_items: nginx_site   
   notify: 
    - reload nginx
@@ -56,6 +56,6 @@
 
 - name: common | start the nginx service
   service: 
-      name=nginx 
-      state=started 
+      name=nginx
+      state=started
       enabled=yes

tasks/nginx_redhat.yml

@@ -12,7 +12,7 @@
 
 - name: nginx_redhat | Copy the epel packages
   copy: 
-       src=epel.repo 
+       src=epel.repo
        dest=/etc/yum.repos.d/epel_ansible.repo
   when: epel_release_existed.rc != 0
 

tasks/nginx_smartos.yml

@@ -6,7 +6,7 @@
 
 - name: nginx_smartos | Install the nginx packages 
   pkgin: 
-      name="{{item}}" 
+      name="{{item}}"
       state=present 
   with_items: solaris_pkg