From 8bb5ff1ccab978cb66d74dba3f3c4f15dc9bad44 Mon Sep 17 00:00:00 2001
From: Mauro Torrez <mauro@qom>
Date: Mon, 26 Aug 2019 01:11:14 -0300
Subject: [PATCH] nombres por defecto de imagen y container, arreglo vols

---
 defaults/main.yml |  6 ++++++
 tasks/main.yml    | 24 +++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 56db510..3a9c1b4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,10 @@
 ---
+# nombre del container
+nginx_container_name: nginx
+
+# nombre de la imagen
+nginx_image_name: my_nginx
+
 # nombre del volumen de configuracion
 nginx_config_volume: nginx_config
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 266fedd..75a30ca 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -19,19 +19,20 @@
 - name: Crear imagen my_nginx
   docker_image:
     state: present
-    name: my_nginx
+    name: "{{ nginx_image_name }}"
     path: /root/.nginx-docker-image
   tags: skip_me
 
 - name: Activar container nginx
   docker_container:
-    name: nginx
+    name: "{{ nginx_container_name }}"
     state: started
     restart_policy: unless-stopped
-    image: my_nginx
+    image: "{{ nginx_image_name }}"
     volumes:
       - "{{ nginx_ssl_volume }}:/etc/nginx/ssl/"
       - "{{ nginx_config_volume }}:/etc/nginx/conf.d/"
+      - "{{ nginx_location_volume }}:/etc/nginx/location/"
       - "{{ nginx_webroot_volume }}:/usr/share/nginx/html/"
     networks:
       - name: "{{ docker_network_name }}"
@@ -59,13 +60,14 @@
     name: "{{ nginx_location_volume }}"
   register: res_loc
 
-# exportar punto de montaje del volumen
-- set_fact:
-    nginx_config_mountpoint: "{{ res_cnf.volume.Mountpoint }}"
-    nginx_location_mountpoint: "{{ res_loc.volume.Mountpoint }}"
-    nginx_webroot_mountpoint: "{{ res_web.volume.Mountpoint }}"
-    nginx_ssl_mountpoint: "{{ res_ssl.volume.Mountpoint }}"
+- name: Exportar informacion de volumenes
+  set_fact:
+    nginx_container_name: "{{ lookup('vars','nginx_container_name') }}"
     nginx_config_volume: "{{ lookup('vars','nginx_config_volume') }}"
-    nginx_webroot_volume: "{{ lookup('vars','nginx_webroot_volume') }}"
-    nginx_ssl_volume: "{{ lookup('vars','nginx_ssl_volume') }}"
+    nginx_config_mountpoint: "{{ res_cnf.volume.Mountpoint }}"
     nginx_location_volume: "{{ lookup('vars','nginx_location_volume') }}"
+    nginx_location_mountpoint: "{{ res_loc.volume.Mountpoint }}"
+    nginx_webroot_volume: "{{ lookup('vars','nginx_webroot_volume') }}"
+    nginx_webroot_mountpoint: "{{ res_web.volume.Mountpoint }}"
+    nginx_ssl_volume: "{{ lookup('vars','nginx_ssl_volume') }}"
+    nginx_ssl_mountpoint: "{{ res_ssl.volume.Mountpoint }}"