From e5a65b550c719f427e0bb46f2e3149092b9e6285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Gon=C3=A7alves?= Date: Mon, 1 Jan 2024 13:26:11 +0100 Subject: refactor(roles/httpd): merge httpd roles --- roles/httpd_site_healthcheck/defaults/main.yml | 8 ----- roles/httpd_site_healthcheck/meta/main.yml | 5 ---- roles/httpd_site_healthcheck/tasks/main.yml | 25 ---------------- .../httpd_site_healthcheck/templates/httpd.conf.j2 | 6 ---- .../httpd_site_healthcheck/templates/index.html.j2 | 34 ---------------------- 5 files changed, 78 deletions(-) delete mode 100644 roles/httpd_site_healthcheck/defaults/main.yml delete mode 100644 roles/httpd_site_healthcheck/meta/main.yml delete mode 100644 roles/httpd_site_healthcheck/tasks/main.yml delete mode 100644 roles/httpd_site_healthcheck/templates/httpd.conf.j2 delete mode 100644 roles/httpd_site_healthcheck/templates/index.html.j2 (limited to 'roles/httpd_site_healthcheck') diff --git a/roles/httpd_site_healthcheck/defaults/main.yml b/roles/httpd_site_healthcheck/defaults/main.yml deleted file mode 100644 index 3b0acd0..0000000 --- a/roles/httpd_site_healthcheck/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- - -httpd_configuration_file: /etc/httpd.conf -httpd_configuration_dir: /etc/httpd.d -httpd_chroot: /var/www - -httpd_user: www -httpd_group: www diff --git a/roles/httpd_site_healthcheck/meta/main.yml b/roles/httpd_site_healthcheck/meta/main.yml deleted file mode 100644 index dd93239..0000000 --- a/roles/httpd_site_healthcheck/meta/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -dependencies: - - role: httpd_pre - tags: dependency diff --git a/roles/httpd_site_healthcheck/tasks/main.yml b/roles/httpd_site_healthcheck/tasks/main.yml deleted file mode 100644 index 7cb2edb..0000000 --- a/roles/httpd_site_healthcheck/tasks/main.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- - -- name: create httpd healthcheck directory - ansible.builtin.file: - path: "{{ httpd_chroot }}/htdocs/healthcheck" - owner: "{{ httpd_user }}" - group: "{{ httpd_group }}" - mode: "0550" - state: directory - -- name: generate generate httpd healthcheck html index - ansible.builtin.template: - src: index.html.j2 - dest: "{{ httpd_chroot }}/htdocs/healthcheck/index.html" - owner: "{{ httpd_user }}" - group: "{{ httpd_group }}" - mode: "0440" - -- name: generate httpd healthcheck configuration - ansible.builtin.template: - src: httpd.conf.j2 - dest: "{{ httpd_configuration_dir }}/healthcheck.conf" - owner: 0 - group: 0 - mode: "0644" diff --git a/roles/httpd_site_healthcheck/templates/httpd.conf.j2 b/roles/httpd_site_healthcheck/templates/httpd.conf.j2 deleted file mode 100644 index 17ffd04..0000000 --- a/roles/httpd_site_healthcheck/templates/httpd.conf.j2 +++ /dev/null @@ -1,6 +0,0 @@ -# managed by Ansible - -server "healthcheck" { - listen on * port 8000 - root "/htdocs/healthcheck" -} diff --git a/roles/httpd_site_healthcheck/templates/index.html.j2 b/roles/httpd_site_healthcheck/templates/index.html.j2 deleted file mode 100644 index c52ff41..0000000 --- a/roles/httpd_site_healthcheck/templates/index.html.j2 +++ /dev/null @@ -1,34 +0,0 @@ - - - -{{ inventory_hostname }} - healtcheck - - - -

{{ inventory_hostname }} - healtcheck

Thank you for using {{ inventory_hostname }}.

- - -- cgit v1.2.3