Merge pull request #3 from crushlovely/dev

updating variable
crushlovely · May 2, 2015 · 8744bdb · 8744bdb
2 parents 791f3f8 + 467cdcb
commit 8744bdb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -8,10 +8,14 @@ custom: 'true'
 nginx:
   version: 1.6.2
   upstream_port: 5000
-  user: ubuntu
-  group: ubuntu
+  ssl_cert:
+    crt: ""
+    key: ""
   passenger:
     version: 5.0.6
     prestart: http://test.com
+app:
+  user: ubuntu
+  group: ubuntu
 domains: test.com
 server_env: production
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -5,7 +5,7 @@
   ignore_errors: yes
 
 - name: Take Ownership of /opt
-  file: path=/opt/ owner={{ nginx.user }} group={{ nginx.group }} recurse=yes state=directory
+  file: path=/opt/ owner={{ app.user }} group={{ app.group }} recurse=yes state=directory
   sudo: yes
   when: result|failed
 
@@ -29,15 +29,15 @@
   when: result|failed
 
 - name: Unzip Nginx Tar
-  unarchive: src=/opt/nginx-{{ nginx.version }}.tar.gz dest=/opt copy=no group={{ nginx.group }} owner={{ nginx.user }}
+  unarchive: src=/opt/nginx-{{ nginx.version }}.tar.gz dest=/opt copy=no group={{ app.group }} owner={{ app.user }}
   when: result|failed
 
 - name: Download Third Party modules
   get_url: url=http://www.dropbox.com/s/e3n2lin6dvqlaos/modules.tar.gz?dl=1 dest=/opt/nginx-{{ nginx.version }}
   when: result|failed
 
 - name: Unzip Modules
-  unarchive: src=/opt/nginx-{{ nginx.version }}/modules.tar.gz dest=/opt/nginx-{{ nginx.version }} copy=no group={{ nginx.group }} owner={{ nginx.user }}
+  unarchive: src=/opt/nginx-{{ nginx.version }}/modules.tar.gz dest=/opt/nginx-{{ nginx.version }} copy=no group={{ app.group }} owner={{ app.user }}
   when: result|failed
 
 - include: passenger.yml

diff --git a/tasks/ssl.yml b/tasks/ssl.yml
@@ -9,21 +9,9 @@
   when: passenger == "true"
 
 - name: Copy SSL Certs to server
-  copy: src={{ item }} dest=/etc/nginx/ssl/ owner=root group=root force=yes
+  copy: src={{ nginx.ssl_cert.crt }} dest=/etc/nginx/ssl/ owner=root group=root force=yes
   sudo: yes
-  with_first_found:
-    - files:
-        - "server.crt"
-      paths:
-        - ../../../projects/{{ app_name }}/files/ssl
-        - ../files/ssl
 
 - name: Copy SSL Certs to server
-  copy: src={{ item }} dest=/etc/nginx/ssl/ owner=root group=root force=yes
+  copy: src={{ nginx.ssl_cert.key }} dest=/etc/nginx/ssl/ owner=root group=root force=yes
   sudo: yes
-  with_first_found:
-    - files:
-        - "server.key"
-      paths:
-        - ../../../projects/{{ app_name }}/files/ssl
-        - ../files/ssl