From 8ebf75d8ab9af12a63da552d0babe5f3a90b5dcc Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 25 Feb 2021 10:31:29 -0500 Subject: [PATCH] Deploying haproxy vs setting up haproxy (reload vs restart) --- Makefile | 2 ++ ansible/deploy_www.yml | 21 +++++++++++++++++++++ ansible/roles/base/tasks/main.yml | 7 +++++++ ansible/roles/haproxy/handlers/main.yml | 5 +++++ ansible/roles/haproxy/tasks/main.yml | 6 ++++++ 5 files changed, 41 insertions(+) create mode 100644 ansible/deploy_www.yml diff --git a/Makefile b/Makefile index 94fd282af..d8df189ad 100644 --- a/Makefile +++ b/Makefile @@ -83,6 +83,8 @@ deploy_node: - ansible-playbook ansible/deploy_node.yml deploy_task: - ansible-playbook ansible/deploy_task.yml +deploy_www: + - ansible-playbook ansible/deploy_www.yml # Provision app: diff --git a/ansible/deploy_www.yml b/ansible/deploy_www.yml new file mode 100644 index 000000000..027be0411 --- /dev/null +++ b/ansible/deploy_www.yml @@ -0,0 +1,21 @@ +--- +- hosts: www + gather_facts: false + vars_files: + - env_vars/base.yml + - env_vars/dev.yml + - roles/letsencrypt/defaults/main.yml + handlers: + - include: roles/haproxy/handlers/main.yml + + tasks: + - name: Template haproxy.cfg file + template: + src: /srv/newsblur/docker/haproxy/haproxy.consul.cfg.j2 + dest: /srv/newsblur/docker/haproxy/haproxy.consul.cfg + + - name: Reload haproxy + debug: + msg: Gracefully reloading HAProxy + changed_when: yes + notify: reload haproxy diff --git a/ansible/roles/base/tasks/main.yml b/ansible/roles/base/tasks/main.yml index f7627dc97..01012cb3a 100644 --- a/ansible/roles/base/tasks/main.yml +++ b/ansible/roles/base/tasks/main.yml @@ -55,3 +55,10 @@ src: /srv/secrets-newsblur/configs/hosts dest: /etc/hosts tags: hosts + +- name: "Add inventory_hostname to /etc/hosts" + become: yes + lineinfile: + path: /etc/hosts + line: "127.0.0.1 {{ inventory_hostname }}" + tags: hosts diff --git a/ansible/roles/haproxy/handlers/main.yml b/ansible/roles/haproxy/handlers/main.yml index 5b0341014..ead761d2c 100644 --- a/ansible/roles/haproxy/handlers/main.yml +++ b/ansible/roles/haproxy/handlers/main.yml @@ -12,3 +12,8 @@ become: yes command: docker kill --signal HUP haproxy listen: reload haproxy + +- name: restart haproxy + become: yes + command: docker restart haproxy + listen: restart haproxy diff --git a/ansible/roles/haproxy/tasks/main.yml b/ansible/roles/haproxy/tasks/main.yml index bdcc71a5b..eb2d9fe84 100644 --- a/ansible/roles/haproxy/tasks/main.yml +++ b/ansible/roles/haproxy/tasks/main.yml @@ -45,3 +45,9 @@ notify: reload haproxy when: updated_config.changed changed_when: updated_config.changed + +- name: Restart HAProxy + debug: + msg: Restarting HAProxy + changed_when: yes + notify: restart haproxy