From 4fff0a9d0d84881bc7f85bde767f75dfc3a1ec88 Mon Sep 17 00:00:00 2001 From: jtbx Date: Sun, 8 Dec 2024 19:27:26 +0100 Subject: [PATCH] dokuwiki: Refactor support for multiple OS versions --- roles/dokuwiki/defaults/main.yml | 1 + roles/dokuwiki/tasks/main.yml | 10 ---------- roles/dokuwiki/vars/main.yml | 4 ++++ 3 files changed, 5 insertions(+), 10 deletions(-) create mode 100644 roles/dokuwiki/vars/main.yml diff --git a/roles/dokuwiki/defaults/main.yml b/roles/dokuwiki/defaults/main.yml index 3406115..8358114 100644 --- a/roles/dokuwiki/defaults/main.yml +++ b/roles/dokuwiki/defaults/main.yml @@ -1,4 +1,5 @@ --- dokuwiki__installpath: "/var/www/dokuwiki" +dokuwiki__php_version: "{{ dokuwiki__php_versions[ansible_distribution + '-' + ansible_distribution_major_version] }}" dokuwiki__php_user: "www-data" dokuwiki__nginx_user: "nginx" diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml index cd1bfd0..664f159 100644 --- a/roles/dokuwiki/tasks/main.yml +++ b/roles/dokuwiki/tasks/main.yml @@ -1,13 +1,3 @@ -- name: set php version to target - ansible.builtin.set_fact: - dokuwiki__php_version: '7.4' - when: dokuwiki__php_version is undefined and ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "11" - -- name: set php version to target - ansible.builtin.set_fact: - dokuwiki__php_version: '8.2' - when: dokuwiki__php_version is undefined and ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "12" - - name: Install php-fpm become: true ansible.builtin.apt: diff --git a/roles/dokuwiki/vars/main.yml b/roles/dokuwiki/vars/main.yml new file mode 100644 index 0000000..df94cfd --- /dev/null +++ b/roles/dokuwiki/vars/main.yml @@ -0,0 +1,4 @@ +--- +dokuwiki__php_versions: + Debian-11: "7.4" + Debian-12: "8.2" -- 2.47.0