From 700457660c9119cbc8738f101ef993b44271c749 Mon Sep 17 00:00:00 2001
From: phil <phil@systemausfall.org>
Date: Fri, 14 Jan 2022 23:32:15 +0100
Subject: [PATCH] Erstelle php-playbook, Passe Rolle an

---
 defaults/main.yml                       |  3 +--
 handlers/main.yml                       |  3 +--
 meta/main.yml                           |  4 ++--
 tasks/main.yml                          | 29 ++++++++++++++++++++-----
 templates/{30-sao.ini.j2 => sao.ini.j2} |  4 ++--
 5 files changed, 30 insertions(+), 13 deletions(-)
 rename templates/{30-sao.ini.j2 => sao.ini.j2} (96%)

diff --git a/defaults/main.yml b/defaults/main.yml
index a91c7f7..73b314f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1 @@
----
-php_version: 7.3
+---
\ No newline at end of file
diff --git a/handlers/main.yml b/handlers/main.yml
index c4cdb57..0b83974 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,6 +1,5 @@
 ---
-
 - name: reload apache2
   service:
     name: apache2
-    state: reloaded
+    state: reloaded
\ No newline at end of file
diff --git a/meta/main.yml b/meta/main.yml
index aa117b2..95150cb 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -3,8 +3,8 @@ galaxy_info:
   description: Role to install PHP
   company: Sense.Lab e.V.
   license: GPLv3
-  min_ansible_version: 2.1
+  min_ansible_version: 2.9
   platforms:
     - name: Debian
       versions:
-      - Buster
+      - Bullseye
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index 9982865..e8f0bb4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,13 +6,32 @@
 - name: "Installiere Pakete"
   apt:
     pkg:
+      - php
       - php-apcu
       - php-fpm
       - php-zip
 
-- name: "Kopiere Konfiguration"
+- 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: 30-sao.ini.j2
-    dest: "/etc/php/{{ php_version }}/apache2/conf.d/30-sao.ini"
-  when: "'apache2' in ansible_facts.packages"
-  notify: reload apache2
+    src: sao.ini.j2
+    dest: "/etc/php/{{ php_version.stdout }}/mods-available/sao.ini"
+
+- 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
\ No newline at end of file
diff --git a/templates/30-sao.ini.j2 b/templates/sao.ini.j2
similarity index 96%
rename from templates/30-sao.ini.j2
rename to templates/sao.ini.j2
index abcd7db..fd22fb3 100644
--- a/templates/30-sao.ini.j2
+++ b/templates/sao.ini.j2
@@ -22,7 +22,7 @@ apc.rfc1867 = 1
 disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_exec,passthru,system,proc_get_status,proc_close,proc_nice,proc_terminate,proc_open,curl_ini,parse_ini_file,show_source,dl,symlink,mail,system_exec,exec,shell_exec,phpinfo
 {% elif inventory_hostname == "wwwusers-ng.sao" %}
 disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_exec,passthru,system,proc_get_status,proc_close,proc_nice,proc_terminate,proc_open,curl_ini,show_source,dl,symlink,system_exec,exec,shell_exec,phpinfo
-{% else %}
+{% elif inventory_hostname == "kameradisten.ramus" %}
 disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_exec,passthru,system,proc_get_status,proc_close,proc_nice,proc_terminate,proc_open,curl_ini,parse_ini_file,show_source,dl,symlink,system_exec,exec,shell_exec,phpinfo
 {% endif %}
 
@@ -33,4 +33,4 @@ display_errors = Off
 allow_url_fopen = Off
 assert.active = Off
 mail.add_x_header = Off
-session.use_strict_mode = 1
+session.use_strict_mode = 1
\ No newline at end of file