From 04434716eb6fa635984cd51dd7bf81d576447717 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 11 Aug 2021 16:48:27 +0200 Subject: [PATCH] Fix the nginx socket configuration. --- defaults/main.yml | 3 ++- templates/nginx-virthost.conf.j2 | 7 +++++-- vars/main.yml | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index dc959fc..52802ea 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -33,4 +33,5 @@ nextcloud_ldap_auth: False nextcloud_phpfpm_default_memory_limit: "512M" php_global_settings: '{{ nextcloud_php_global_settings }}' -phpfpm_pools: '{{ nextcloud_phpfpm_pools }}' \ No newline at end of file +phpfpm_pools: '{{ nextcloud_phpfpm_pools }}' +nextcloud_phpfpm_listen_on_socket: True \ No newline at end of file diff --git a/templates/nginx-virthost.conf.j2 b/templates/nginx-virthost.conf.j2 index d31bb0f..86ee5e1 100644 --- a/templates/nginx-virthost.conf.j2 +++ b/templates/nginx-virthost.conf.j2 @@ -1,6 +1,9 @@ upstream php-handler { - server {{ item.listen }}; - #server unix:/var/run/php5-fpm.sock; +{% if nextcloud_phpfpm_listen_on_socket %} + server unix:{{ item.listen }}; +{% else %} + server {{ item.listen }}; +{% endif %} } server { diff --git a/vars/main.yml b/vars/main.yml index dcc3beb..f00a989 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -28,6 +28,7 @@ nextcloud_php_required_packages: - 'php-apcu' phpfpm_default_memory_limit: '{{ nextcloud_phpfpm_default_memory_limit }}' +phpfpm_listen_on_socket: '{{ nextcloud_phpfpm_listen_on_socket }}' nextcloud_php_global_settings: - { option: 'always_populate_raw_post_data', value: '-1' } - { option: 'allow_url_fopen', value: 'on' }