diff --git a/roles/nginx/templates/vhost.conf.j2 b/roles/nginx/templates/vhost.conf.j2 index b2278ac..a8b208b 100644 --- a/roles/nginx/templates/vhost.conf.j2 +++ b/roles/nginx/templates/vhost.conf.j2 @@ -70,6 +70,8 @@ server { fastcgi_pass unix:/run/php/php7.2-fpm-{{ domain_name }}.sock; {% elif ansible_distribution == 'Debian' and ansible_distribution_version is version('10', '==') %} fastcgi_pass unix:/run/php/php7.3-fpm-{{ domain_name }}.sock; + {% elif ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '==') %} + fastcgi_pass unix:/run/php/php7.4-fpm-{{ domain_name }}.sock; {% else %} fastcgi_pass unix:/var/run/php5-fpm-{{ domain_name }}.sock; {% endif %} diff --git a/roles/php-fpm/handlers/main.yml b/roles/php-fpm/handlers/main.yml index 987f38a..420b1d7 100644 --- a/roles/php-fpm/handlers/main.yml +++ b/roles/php-fpm/handlers/main.yml @@ -11,4 +11,8 @@ - name: reload php7.3-fpm systemd: name=php7.3-fpm state=reloaded +# For Ubuntu 20.04 +- name: reload php7.4-fpm + systemd: name=php7.4-fpm state=reloaded + # vim: set ts=2 sw=2: diff --git a/roles/php-fpm/tasks/main.yml b/roles/php-fpm/tasks/main.yml index fa44bf9..0d1cfe4 100644 --- a/roles/php-fpm/tasks/main.yml +++ b/roles/php-fpm/tasks/main.yml @@ -1,7 +1,7 @@ --- # Note: Debian 9's php-fpm config is identical to Ubuntu 16.04's, so for now we # can capitalize on that and use the same tasks. Ubuntu 18.04 uses php-fpm 7.2. -# Debian 10 uses php-fpm 7.3. +# Debian 10 uses php-fpm 7.3. Ubuntu 20.04 uses PHP 7.4. - name: Configure php-fpm on Ubuntu 16.04 and Debian 9 include_tasks: Ubuntu.yml @@ -18,4 +18,9 @@ when: ansible_distribution == 'Debian' and ansible_distribution_version is version('10', '==') tags: php-fpm +- name: Configure php-fpm on Ubuntu 20.04 + include_tasks: Ubuntu_20.04.yml + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '==') + tags: php-fpm + # vim: set ts=2 sw=2: