Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #794 from entendu/patch-1
Browse files Browse the repository at this point in the history
Adds optional defaults for php-fpm user & group.
  • Loading branch information
geerlingguy authored Jul 11, 2016
2 parents 20d4f61 + 60cbf09 commit 1b8f0fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion docs/other/webservers.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
2 changes: 1 addition & 1 deletion provisioning/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1b8f0fc

Please sign in to comment.