From 9a96f487f651a6ea3a836bf62b1b7054669f2603 Mon Sep 17 00:00:00 2001
From: NaomiLin <wdrdres3qew5ts21@gmail.com>
Date: Sun, 7 Jun 2020 23:48:37 +0700
Subject: [PATCH] =?UTF-8?q?[FIX]=20ansible=20module=20uri=20setup=20passwo?=
 =?UTF-8?q?rd=20=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=81=E0=B8=B1=E0=B8=9A=20k?=
 =?UTF-8?q?ibana=20=E0=B8=9C=E0=B9=88=E0=B8=B2=E0=B8=99=20role=20elk=5Fssl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roles/elk_ssl/tasks/main.yml              | 37 +++++++++----------
 Ansible-ELK-Stack/setup-ssl-stack.yml         |  2 +-
 Ansible-ELK-Stack/setupKibanaPassword.sh      | 17 ++++++---
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/Ansible-ELK-Stack/roles/elk_ssl/tasks/main.yml b/Ansible-ELK-Stack/roles/elk_ssl/tasks/main.yml
index 40be447..994e5a4 100644
--- a/Ansible-ELK-Stack/roles/elk_ssl/tasks/main.yml
+++ b/Ansible-ELK-Stack/roles/elk_ssl/tasks/main.yml
@@ -34,26 +34,23 @@
     state: present
     remove_orphans: true 
 
-- name: "Change password for Kibana"
-  become: no
-  shell:
-    cmd: >
-      bash -c "
-        while true
-        do
-          curl  --fail -u elastic:PleaseChangeMe \
-            'https://localhost:9200/_cluster/health?wait_for_status=yellow' \
-            && break
-          sleep 5
-        done
-
-        curl -X POST -v -k  --cacert /usr/share/elasticsearch/config/certificates/ca/ca.crt \
-        'https://localhost:9200/_security/user/kibana/_password?pretty' \
-        -u elastic:PleaseChangeMe   -H 'Content-Type: application/json' \
-        -d ' { \"password\" : \"PleaseChangeMe\" } '  && echo 'success change password success'
-      "
-
-  
+
+- name: Pause play until a URL is reachable from this host
+  uri:
+    url: "https://localhost:9200/_security/user/kibana/_password?pretty"
+    follow_redirects: none
+    method: POST
+    user: elastic
+    password: PleaseChangeMe
+    validate_certs: no
+    force_basic_auth: yes
+    body_format: json
+    body: >
+      { "password" : "PleaseChangeMe" }   
+  register: _result
+  until: _result.status == 200
+  retries: 20 
+  delay: 5 
 
 
      
\ No newline at end of file
diff --git a/Ansible-ELK-Stack/setup-ssl-stack.yml b/Ansible-ELK-Stack/setup-ssl-stack.yml
index cb7a24e..d744c22 100644
--- a/Ansible-ELK-Stack/setup-ssl-stack.yml
+++ b/Ansible-ELK-Stack/setup-ssl-stack.yml
@@ -3,4 +3,4 @@
   become_method: sudo
   roles: # ทำให้ ansible รันเฉพาะ tag ได้ถ้าไม่ระบุแท๊กก็จะรันทั้งมด ansible-playbook setup.yml -t docker 
     - {role: docker, tags: "docker"} 
-    - {role: elk, tags: "elk_ssl"} 
+    - {role: elk_ssl, tags: "elk_ssl"} 
diff --git a/Ansible-ELK-Stack/setupKibanaPassword.sh b/Ansible-ELK-Stack/setupKibanaPassword.sh
index 7002787..eeb6c2f 100644
--- a/Ansible-ELK-Stack/setupKibanaPassword.sh
+++ b/Ansible-ELK-Stack/setupKibanaPassword.sh
@@ -1,12 +1,17 @@
 #!/bin/bash
+# while true
+# do
+#   curl  --fail -k -u elastic:PleaseChangeMe \
+#     "https://localhost:9200/_cluster/health?wait_for_status=yellow" &&  break
+#   sleep 5
+# done
+
 while true
 do
-  curl  --fail -u elastic:PleaseChangeMe \
-    "http://localhost:9200/_cluster/health?wait_for_status=yellow" \
-    && break
+  curl  --fail -k -u elastic:PleaseChangeMe \
+    curl -X POST -v -k  "https://localhost:9200/_security/user/kibana/_password?pretty"  -u elastic:PleaseChangeMe   -H 'Content-Type: application/json' -d ' { "password" : "PleaseChangeMe" } ' &&  break
   sleep 5
 done
 
-curl -X POST -v -k "http://localhost:9200/_security/user/kibana/_password?pretty" -u elastic:PleaseChangeMe   -H 'Content-Type: application/json' -d ' { "password" : "PleaseChangeMe" } '  && echo "success change password success"
-    
-  
\ No newline at end of file
+echo "fuckkkkkkkkkkkkkkkkkkk"
+curl -X POST -v -k  "https://localhost:9200/_security/user/kibana/_password?pretty"  -u elastic:PleaseChangeMe   -H 'Content-Type: application/json' -d ' { "password" : "PleaseChangeMe" } '