diff --git a/roles/dokuwiki/README.md b/roles/dokuwiki/README.md index ef6df5c..457dd45 100644 --- a/roles/dokuwiki/README.md +++ b/roles/dokuwiki/README.md @@ -10,6 +10,7 @@ Please download it from https://download.dokuwiki.org. The following distributions are supported: - Debian 11 +- Debian 12 ## Required Arguments @@ -18,7 +19,7 @@ None. ## Optional Argument - `dokuwiki__installpath`: Where your DokiWiki lives, default `/var/www/dokuwiki` -- `dokuwiki__php_version`: Your PHP version, default `7.4` +- `dokuwiki__php_version`: Your PHP version, default `7.4` for Debian 11 and `8.2` for Debian 12 - `dokuwiki__php_user`: User of your php-fpm process, default `www-data` - `dokuwiki__nginx_user`: User of your nginx process, default `nginx` diff --git a/roles/dokuwiki/defaults/main.yml b/roles/dokuwiki/defaults/main.yml index 6b970ee..3406115 100644 --- a/roles/dokuwiki/defaults/main.yml +++ b/roles/dokuwiki/defaults/main.yml @@ -1,5 +1,4 @@ --- dokuwiki__installpath: "/var/www/dokuwiki" -dokuwiki__php_version: "7.4" dokuwiki__php_user: "www-data" dokuwiki__nginx_user: "nginx" diff --git a/roles/dokuwiki/meta/main.yml b/roles/dokuwiki/meta/main.yml index 633049c..b4a1c6f 100644 --- a/roles/dokuwiki/meta/main.yml +++ b/roles/dokuwiki/meta/main.yml @@ -4,5 +4,6 @@ dependencies: vars: distribution_check__distribution_support_spec: - name: Debian - versions: + major_versions: - 11 + - 12 diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml index 664f159..cd1bfd0 100644 --- a/roles/dokuwiki/tasks/main.yml +++ b/roles/dokuwiki/tasks/main.yml @@ -1,3 +1,13 @@ +- 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: