From 4a7f8f212c8abdded139a4fd4239be88c7d565bc Mon Sep 17 00:00:00 2001
From: phil <phil@systemausfall.org>
Date: Thu, 9 Jun 2022 15:15:49 +0200
Subject: [PATCH] php: Teile Tasks in einzelne Dateien auf

---
 tasks/main.yml     | 41 ++++-------------------------------------
 tasks/packages.yml | 12 ++++++++++++
 tasks/php.yml      | 30 ++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 37 deletions(-)
 create mode 100644 tasks/packages.yml
 create mode 100644 tasks/php.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index 409abfa..5ec03fe 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,45 +1,12 @@
 ---
-- name: "Sammle Package Fakten"
-  package_facts:
-    manager: apt
-
-- name: "Installiere Pakete"
-  apt:
-    pkg:
-      - php
-      - php-apcu
-      - php-fpm
-      - php-zip
-
 - name: "Ermmittle PHP-Version"
   shell:
     cmd: php -v | grep -Po '(?<=PHP )([0-9.]{3})'
   register: php_version
   changed_when: false
 
-- name: "Kopiere angepasste Konfiguration"
-  template:
-    src: sao.ini.j2
-    dest: "/etc/php/{{ php_version.stdout }}/mods-available/sao.ini"
+- import_tasks: packages.yml
+  tags: packages
 
-- name: "Verlinke cli Konfiguration"
-  file:
-    src: "/etc/php/{{ php_version.stdout }}/mods-available/sao.ini"
-    dest: "/etc/php/{{ php_version.stdout }}/cli/conf.d/30-sao.ini"
-    state: link
-
-- name: "Verlinke Apache Konfiguration"
-  file:
-    src: "/etc/php/{{ php_version.stdout }}/mods-available/sao.ini"
-    dest: "/etc/php/{{ php_version.stdout }}/apache2/conf.d/30-sao.ini"
-    state: link
-  when: "'libapache2-mod-php{{ php_version.stdout }}' in ansible_facts.packages"
-  notify: reload apache2
-
-- name: "Verlinke FPM-Konfiguration"
-  file:
-    src: "/etc/php/{{ php_version.stdout }}/mods-available/sao.ini"
-    dest: "/etc/php/{{ php_version.stdout }}/fpm/conf.d/30-sao.ini"
-    state: link
-  when: "'php-fpm' in ansible_facts.packages"
-  notify: reload php-fpm
\ No newline at end of file
+- import_tasks: php.yml
+  tags: php
diff --git a/tasks/packages.yml b/tasks/packages.yml
new file mode 100644
index 0000000..5b5a5f4
--- /dev/null
+++ b/tasks/packages.yml
@@ -0,0 +1,12 @@
+---
+- name: "packages | Sammle Package Fakten"
+  package_facts:
+    manager: apt
+
+- name: "packages | Installiere Pakete"
+  apt:
+    pkg:
+      - php
+      - php-apcu
+      - php-fpm
+      - php-zip
diff --git a/tasks/php.yml b/tasks/php.yml
new file mode 100644
index 0000000..6c68a14
--- /dev/null
+++ b/tasks/php.yml
@@ -0,0 +1,30 @@
+---
+- name: "php | Kopiere angepasste Konfigurationsdateien"
+  template:
+    src: "{{ item }}.j2"
+    dest: "/etc/php/{{ php_version.stdout }}/mods-available/{{ item }}"
+  loop:
+    - sao.ini
+    - sao-fpm.ini
+
+- name: "php | Verlinke Apache Konfiguration"
+  file:
+    src: "/etc/php/{{ php_version.stdout }}/mods-available/sao.ini"
+    dest: "/etc/php/{{ php_version.stdout }}/apache2/conf.d/30-sao.ini"
+    state: link
+  when: "'libapache2-mod-php{{ php_version.stdout }}' in ansible_facts.packages"
+  notify: reload apache2
+
+- name: "php | Verlinke cli Konfiguration"
+  file:
+    src: "/etc/php/{{ php_version.stdout }}/mods-available/sao.ini"
+    dest: "/etc/php/{{ php_version.stdout }}/cli/conf.d/30-sao.ini"
+    state: link
+
+- name: "php | Verlinke FPM-Konfiguration"
+  file:
+    src: "/etc/php/{{ php_version.stdout }}/mods-available/sao-fpm.ini"
+    dest: "/etc/php/{{ php_version.stdout }}/fpm/conf.d/30-sao-fpm.ini"
+    state: link
+  when: "'php-fpm' in ansible_facts.packages"
+  notify: reload php-fpm