From 89d5c4f3a12778c07fc0620ae098690d5e40e553 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 22 Nov 2016 15:29:19 +0100
Subject: [PATCH] Kibana: extract kibana-proxy-nginx

---
 kibana-proxy-nginx/README.md                       | 14 ++++++++++++++
 kibana-proxy-nginx/defaults/main.yml               |  2 ++
 kibana-proxy-nginx/tasks/main.yml                  | 14 ++++++++++++++
 .../templates/nginx_proxy_kibana.j2                |  6 ++----
 kibana/tasks/main.yml                              | 12 ------------
 5 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 kibana-proxy-nginx/README.md
 create mode 100644 kibana-proxy-nginx/defaults/main.yml
 create mode 100644 kibana-proxy-nginx/tasks/main.yml
 rename {kibana => kibana-proxy-nginx}/templates/nginx_proxy_kibana.j2 (80%)

diff --git a/kibana-proxy-nginx/README.md b/kibana-proxy-nginx/README.md
new file mode 100644
index 00000000..feda6871
--- /dev/null
+++ b/kibana-proxy-nginx/README.md
@@ -0,0 +1,14 @@
+# kibana
+
+Install Kibana.
+
+## Tasks
+
+Everything is in the `tasks/main.yml` file.
+
+## Available variables
+
+The only variables are derived from gathered facts.
+
+By default, Kibana will bind to localhost:5601.
+If Nginx is installed, a typical proxy configuration is copied into `/etc/nginx/sites-available`. It can be tweeked and enabled by hand.
diff --git a/kibana-proxy-nginx/defaults/main.yml b/kibana-proxy-nginx/defaults/main.yml
new file mode 100644
index 00000000..f55b2d26
--- /dev/null
+++ b/kibana-proxy-nginx/defaults/main.yml
@@ -0,0 +1,2 @@
+kibana_proxy_bind: "{{ ansible_default_ipv4.address }}:80"
+kibana_proxy_domain: "kibana.{{ ansible_fqdn }}"
diff --git a/kibana-proxy-nginx/tasks/main.yml b/kibana-proxy-nginx/tasks/main.yml
new file mode 100644
index 00000000..81834594
--- /dev/null
+++ b/kibana-proxy-nginx/tasks/main.yml
@@ -0,0 +1,14 @@
+---
+
+- name: Example proxy for Kibana with Nginx
+  template:
+    src: nginx_proxy_kibana.j2
+    dest: /etc/nginx/sites-available/kibana.conf
+    force: no
+
+- name: Kibana host in Nginx is enabled
+  file:
+    src: /etc/nginx/sites-available/kibana.conf
+    dest: /etc/nginx/sites-enabled/kibana.conf
+    state: link
+  notify: reload nginx
diff --git a/kibana/templates/nginx_proxy_kibana.j2 b/kibana-proxy-nginx/templates/nginx_proxy_kibana.j2
similarity index 80%
rename from kibana/templates/nginx_proxy_kibana.j2
rename to kibana-proxy-nginx/templates/nginx_proxy_kibana.j2
index 3db2723b..1b942a0b 100644
--- a/kibana/templates/nginx_proxy_kibana.j2
+++ b/kibana-proxy-nginx/templates/nginx_proxy_kibana.j2
@@ -6,10 +6,8 @@ server {
 
   # ajouter les règles d'authentification
 
-{% for address in ansible_all_ipv4_addresses %}
-  listen {{ address }}:80;
-{% endfor %}
-  server_name    {{ ansible_hostname }};
+  listen      {{ kibana_proxy_bind }};
+  server_name {{ kibana_proxy_domain }};
 
   location / {
     proxy_redirect off;
diff --git a/kibana/tasks/main.yml b/kibana/tasks/main.yml
index 107850d1..6d501887 100644
--- a/kibana/tasks/main.yml
+++ b/kibana/tasks/main.yml
@@ -21,15 +21,3 @@
     mode: 0644
     owner: root
     group: root
-
-- name: Nginx installed?
-  stat:
-    path: /etc/nginx/sites-available/
-  register: nginx_installed
-
-- name: Example proxy for Kibana with Nginx
-  template:
-    src: nginx_proxy_kibana.j2
-    dest: /etc/nginx/sites-available/kibana.conf
-    force: no
-  when: nginx_installed.stat.exists