From cd77b088e96d9a5bfa5350b70f24d66c10d0e9c3 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Mon, 25 Apr 2016 12:33:12 +0300 Subject: [PATCH] Fix a few references to php5-fpm Unless we really mean php5-fpm, let's just say php-fpm. --- roles/nginx/templates/wordpress.j2 | 2 +- roles/php-fpm/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nginx/templates/wordpress.j2 b/roles/nginx/templates/wordpress.j2 index 1f327bb..fdc151c 100644 --- a/roles/nginx/templates/wordpress.j2 +++ b/roles/nginx/templates/wordpress.j2 @@ -1,6 +1,6 @@ # try for WordPress index.php in / - # fall back to index.php + args (passed to php5-fpm later) + # fall back to index.php + args (passed to php-fpm later) # also serves static files from the disk instead of passing to interpreter, location / { try_files $uri $uri/ /index.php?$args; diff --git a/roles/php-fpm/defaults/main.yml b/roles/php-fpm/defaults/main.yml index 0cc7a47..c7aa808 100644 --- a/roles/php-fpm/defaults/main.yml +++ b/roles/php-fpm/defaults/main.yml @@ -1,5 +1,5 @@ --- -# file: roles/php5-fpm/defaults/main.yml +# file: roles/php-fpm/defaults/main.yml # default is on, but turn it off because of protection in nginx vhosts cgi_fix_pathinfo: 0