diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml index 098a466..76e27cf 100644 --- a/.github/workflows/build_deploy.yml +++ b/.github/workflows/build_deploy.yml @@ -170,8 +170,8 @@ jobs: END ansible-vault decrypt --vault-password-file ~/fabrique-chatbot-back/ansible/fabrique/password_file ${{ steps.env_file.outputs.value }} mv ${{ steps.env_file.outputs.value }} ~/fabrique-chatbot-back/ansible/fabrique/.env - ansible-playbook ~/fabrique-chatbot-back/ansible/fabrique/backserver.yml --vault-password-file ~/fabrique-chatbot-back/ansible/fabrique/password_file --extra-vars 'DB_PASSWORD='${{ steps.db_password.outputs.value }}' USER_PASSWORD='${{ steps.user_password.outputs.value }}' DOMAIN='${{ steps.domain.outputs.value }}'' - ansible-playbook ~/fabrique-chatbot-back/ansible/fabrique/elastic.yml --vault-password-file ~/fabrique-chatbot-back/ansible/fabrique/password_file --extra-vars USER_PASSWORD='${{ steps.user_password.outputs.value }}' ELASTIC_HOST='${{ secrets.ELASTIC_HOST }}' ELASTIC_USERNAME='${{ secrets.ELASTIC_USERNAME }}' ELASTIC_PASSWORD='${{ secrets.ELASTIC_PASSWORD }}' ELASTIC_METRICBEAT_INDEX='${{ secrets.ELASTIC_METRICBEAT_INDEX }}'' + ansible-playbook ~/fabrique-chatbot-back/ansible/fabrique/backserver.yml --vault-password-file ~/fabrique-chatbot-back/ansible/fabrique/password_file --extra-vars 'DB_PASSWORD='"${{ steps.db_password.outputs.value }}"' USER_PASSWORD='"${{ steps.user_password.outputs.value }}"' DOMAIN='${{ steps.domain.outputs.value }}'' + ansible-playbook ~/fabrique-chatbot-back/ansible/logs/elastic.yml --vault-password-file ~/fabrique-chatbot-back/ansible/fabrique/password_file --extra-vars 'USER_PASSWORD='"${{ steps.user_password.outputs.value }}"' ELASTIC_HOST='${{ secrets.ELASTIC_HOST }}' ELASTIC_USERNAME='${{ secrets.ELASTIC_USERNAME }}' ELASTIC_PASSWORD='"${{ secrets.ELASTIC_PASSWORD }}"' ELASTIC_METRICBEAT_INDEX='${{ secrets.ELASTIC_METRICBEAT_INDEX }}'' - name: delete tmp dir uses: appleboy/ssh-action@master diff --git a/ansible/fabrique/backserver.yml b/ansible/fabrique/backserver.yml index 7ada293..31a82ba 100644 --- a/ansible/fabrique/backserver.yml +++ b/ansible/fabrique/backserver.yml @@ -65,7 +65,6 @@ - name: Ansible galaxy install elastic.beats role shell: 'ansible-galaxy install elastic.beats,v7.10.1' - become: yes - name: copy the nginx config file become: yes diff --git a/ansible/logs/elastic.yml b/ansible/logs/elastic.yml index 7f0a2d6..4de18ad 100644 --- a/ansible/logs/elastic.yml +++ b/ansible/logs/elastic.yml @@ -2,13 +2,13 @@ # Prerequisites: SSH access for user with password -- hosts: all +- hosts: localhost remote_user: fab_user vars: - - ansible_user: "fab_user" - - ansible_password: "{{ USER_PASSWORD }}" +# - ansible_user: "fab_user" +# - ansible_password: "{{ USER_PASSWORD }}" - ansible_become_pass: "{{ USER_PASSWORD }}" - name: install metricbeat diff --git a/ansible/logs/metricbeat.yml b/ansible/logs/metricbeat.yml index 0500142..6d74806 100644 --- a/ansible/logs/metricbeat.yml +++ b/ansible/logs/metricbeat.yml @@ -2,13 +2,13 @@ # Prerequisites: SSH access for user with password -- hosts: all +- hosts: localhost remote_user: fab_user vars: - ansible_user: "fab_user" - - ansible_password: "{{ USER_PASSWORD }}" +# - ansible_password: "{{ USER_PASSWORD }}" - ansible_become_pass: "{{ USER_PASSWORD }}" # BEATS - beats_version: 6.8.13 diff --git a/front/package.json b/front/package.json index bb8ed44..bcb2fb9 100644 --- a/front/package.json +++ b/front/package.json @@ -1,6 +1,6 @@ { "name": "fabrique-chatbot-front", - "version": "1.1.3", + "version": "1.1.5", "scripts": { "ng": "ng", "start": "ng serve",