From ba0a279b4f772cf0d54b82e5f51af271e922fe38 Mon Sep 17 00:00:00 2001 From: phil Date: Wed, 16 Aug 2023 20:51:05 +0200 Subject: [PATCH] Add apache configuration tasks --- handlers/main.yml | 5 ++++- tasks/apache.yml | 14 ++++++++++++++ tasks/main.yml | 4 ++++ templates/apache.conf.j2 | 27 +++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 tasks/apache.yml create mode 100644 templates/apache.conf.j2 diff --git a/handlers/main.yml b/handlers/main.yml index 050cdd1..89879c5 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,2 +1,5 @@ --- -# handlers file for . +- name: Reload apache2 + ansible.builtin.service: + name: apache2 + state: reloaded diff --git a/tasks/apache.yml b/tasks/apache.yml new file mode 100644 index 0000000..8ca1771 --- /dev/null +++ b/tasks/apache.yml @@ -0,0 +1,14 @@ +--- +- name: "Apache | Copy virtualhost configuration" + ansible.builtin.template: + src: apache2.conf.j2 + dest: "/etc/apache2/sites-available/{{ dmarcsrg_domain }}.conf" + mode: "0644" + notify: Reload apache2 + +- name: "Apache | Enable virtualhost configuration" + ansible.builtin.file: + src: "/etc/apache2/sites-available/{{ dmarcsrg_domain }}.conf" + dest: "/etc/apache2/sites-enabled/{{ dmarcsrg_domain }}.conf" + state: link + notify: Reload apache2 diff --git a/tasks/main.yml b/tasks/main.yml index 7416f8b..13bb416 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -14,3 +14,7 @@ - name: Configure PHP-FPM ansible.builtin.import_tasks: phpfpm.yml tags: phpfpm + +- name: Apache + ansible.builtin.import_tasks: apache.yml + tags: apache diff --git a/templates/apache.conf.j2 b/templates/apache.conf.j2 new file mode 100644 index 0000000..3ec80a7 --- /dev/null +++ b/templates/apache.conf.j2 @@ -0,0 +1,27 @@ + + ServerName {{ dmarcsrg_domain }} + DocumentRoot {{ dmarcsrg_home }}/current + ErrorLog /var/log/apache2/{{ dmarcsrg_domain }}.error + + + SetHandler "proxy:unix:/run/php/php-fpm-{{ dmarcsrg_user}}.sock|fcgi://dmarcsrg" + + + Require all denied + + + Require all denied + + + + DirectoryIndex index.php + Options FollowSymLinks + AllowOverride All + Require all granted + + + + Options None + Require all denied + +