From 458b03ad5b7de990f42d4f8b2fbfafa7070877a4 Mon Sep 17 00:00:00 2001 From: Domenic Santangelo Date: Fri, 8 Jul 2016 15:24:37 -0700 Subject: [PATCH 1/5] Updates default.config.yml for php-fpm user Updates default.config.yml to include a stub for defining the user that php-fpm runs as. See #781 --- default.config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/default.config.yml b/default.config.yml index 53d267c3a..18dbfcd32 100644 --- a/default.config.yml +++ b/default.config.yml @@ -230,6 +230,10 @@ php_max_input_vars: "4000" php_enable_php_fpm: true php_fpm_listen: "127.0.0.1:9000" +# If you want to run php-fpm as a user other than your OS's default user, +# uncomment this line and specify. For example, to run as the "nginx" user: +# php_fpm_pool_user: "nginx" + composer_path: /usr/bin/composer composer_home_path: "/home/{{ drupalvm_user }}/.composer" composer_home_owner: "{{ drupalvm_user }}" From 2b23c734a725b9f2e3c4239cbecfc379c83adaa4 Mon Sep 17 00:00:00 2001 From: Domenic Santangelo Date: Mon, 11 Jul 2016 10:18:31 -0700 Subject: [PATCH 2/5] Update default.config.yml Add group. --- default.config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/default.config.yml b/default.config.yml index 18dbfcd32..3f25e9bb0 100644 --- a/default.config.yml +++ b/default.config.yml @@ -230,9 +230,10 @@ php_max_input_vars: "4000" php_enable_php_fpm: true php_fpm_listen: "127.0.0.1:9000" -# If you want to run php-fpm as a user other than your OS's default user, -# uncomment this line and specify. For example, to run as the "nginx" user: +# If you want to run php-fpm as a user/group other than your OS's default user, +# uncomment this line and specify. For example, to run as the "nginx" user & group: # php_fpm_pool_user: "nginx" +# php_fpm_pool_group: "nginx" composer_path: /usr/bin/composer composer_home_path: "/home/{{ drupalvm_user }}/.composer" From 8502972e9564ba856dc34257da8d906f99cda97f Mon Sep 17 00:00:00 2001 From: Domenic Santangelo Date: Mon, 11 Jul 2016 10:28:23 -0700 Subject: [PATCH 3/5] Bump requirements for php role. Bump version for php role so that geerlingguy/ansible-role-php#128 gets in. --- provisioning/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml index 46b6d8136..17e8574b5 100644 --- a/provisioning/requirements.yml +++ b/provisioning/requirements.yml @@ -36,7 +36,7 @@ - src: geerlingguy.nodejs version: 3.2.0 - src: geerlingguy.php - version: 3.2.1 + version: 3.2.2 - src: geerlingguy.php-memcached version: 2.0.0 - src: geerlingguy.php-mysql From 90ff87304e7a214d4281d3061498a94cc304fd3e Mon Sep 17 00:00:00 2001 From: Domenic Santangelo Date: Mon, 11 Jul 2016 13:58:50 -0700 Subject: [PATCH 4/5] Restores default.config.yml. --- default.config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/default.config.yml b/default.config.yml index 3f25e9bb0..53d267c3a 100644 --- a/default.config.yml +++ b/default.config.yml @@ -230,11 +230,6 @@ php_max_input_vars: "4000" php_enable_php_fpm: true php_fpm_listen: "127.0.0.1:9000" -# If you want to run php-fpm as a user/group other than your OS's default user, -# uncomment this line and specify. For example, to run as the "nginx" user & group: -# php_fpm_pool_user: "nginx" -# php_fpm_pool_group: "nginx" - composer_path: /usr/bin/composer composer_home_path: "/home/{{ drupalvm_user }}/.composer" composer_home_owner: "{{ drupalvm_user }}" From 60cbf093b1f9cd12b92fa8e55baec3e0a185406f Mon Sep 17 00:00:00 2001 From: Domenic Santangelo Date: Mon, 11 Jul 2016 14:02:57 -0700 Subject: [PATCH 5/5] Update webservers.md Updates docs to reflect php-fpm user/group variables. --- docs/other/webservers.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/other/webservers.md b/docs/other/webservers.md index bd2b24245..b78744e28 100644 --- a/docs/other/webservers.md +++ b/docs/other/webservers.md @@ -14,4 +14,6 @@ See the examples included in the [`geerlingguy.apache` Ansible role's README](ht Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_hosts` configuration. A few simple examples are shown in `default.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information. -Also, see the examples included in the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme) for more info, as well as many other variables you can override to configure Nginx exactly how you like it. +Also, see the examples included in the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme) for more info, as well as many other variables you can override to configure Nginx exactly how you like it. + +Note: if you're using php-fpm, you may want to reflect your use of nginx by setting `php_fpm_pool_user` and `php_fpm_pool_group` in your `config.yml`.