From dad4f9cb4b6d0b56fa95044883b29b2a9f2503d7 Mon Sep 17 00:00:00 2001 From: Clay Freeman Date: Mon, 26 Nov 2018 09:41:03 -0600 Subject: [PATCH] prepare for deprecation of PHP 7.0 --- CHANGELOG.md | 5 +++++ README.md | 1 - man/create-site.8 | 1 - nginx/templates/general.conf | 2 +- nginx/templates/generic-php7.0-common.conf | 11 ----------- nginx/templates/generic-php7.0-http.conf | 2 -- nginx/templates/generic-php7.0-https.conf | 2 -- 7 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 nginx/templates/generic-php7.0-common.conf delete mode 100644 nginx/templates/generic-php7.0-http.conf delete mode 100644 nginx/templates/generic-php7.0-https.conf diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c14ff4..5d01778 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 1.6.2 + +- Preemptively replace all occurrences of PHP 7.0 with 7.1 and drop support for + Ubuntu `xenial`. + ## 1.6.1 - Add per-site includes to HTTPS too (I accidentally missed the HTTPS template diff --git a/README.md b/README.md index c43285d..f5d1e3c 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,6 @@ following templates are available for site creation: | Drupal 6.x | `drupal6` | 5.6 | | Drupal 7+ | `drupal7` | 7.1 | | Generic (PHP 5.6) | `generic-php5.6` | 5.6 | -| Generic (PHP 7.0) | `generic-php7.0` | 7.0 | | Generic (PHP 7.1) | `generic-php7.1` | 7.1 | | Generic (PHP 7.2) | `generic-php7.2` | 7.2 | | Joomla 2.x | `joomla2.x` | 5.6 | diff --git a/man/create-site.8 b/man/create-site.8 index c627414..43d0665 100644 --- a/man/create-site.8 +++ b/man/create-site.8 @@ -79,7 +79,6 @@ lll. Drupal 6.x@\fLdrupal6\fP@5.6 Drupal 7+@\fLdrupal7\fP@7.1 Generic (PHP 5.6)@\fLgeneric-php5.6\fP@5.6 -Generic (PHP 7.0)@\fLgeneric-php7.0\fP@7.0 Generic (PHP 7.1)@\fLgeneric-php7.1\fP@7.1 Generic (PHP 7.2)@\fLgeneric-php7.2\fP@7.2 Joomla! 2.x to 3.4.x@\fLjoomla2.x\fP@5.6 diff --git a/nginx/templates/general.conf b/nginx/templates/general.conf index 5073b10..3f43eb4 100644 --- a/nginx/templates/general.conf +++ b/nginx/templates/general.conf @@ -29,6 +29,6 @@ location /phpmyadmin { location ~ \.php$ { include snippets/fastcgi-php.conf; fastcgi_param HTTP_PROXY ""; - fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; + fastcgi_pass unix:/var/run/php/php7.2-fpm.sock; } } diff --git a/nginx/templates/generic-php7.0-common.conf b/nginx/templates/generic-php7.0-common.conf deleted file mode 100644 index 757c000..0000000 --- a/nginx/templates/generic-php7.0-common.conf +++ /dev/null @@ -1,11 +0,0 @@ -location / { - try_files $uri $uri/ $uri.php; - include templates/cache.conf; -} - -location ~ \.php(/|$) { - include snippets/fastcgi-php.conf; - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param HTTP_PROXY ""; - fastcgi_pass unix:/run/php/php7.0-$SITEUSER.sock; -} diff --git a/nginx/templates/generic-php7.0-http.conf b/nginx/templates/generic-php7.0-http.conf deleted file mode 100644 index 580397a..0000000 --- a/nginx/templates/generic-php7.0-http.conf +++ /dev/null @@ -1,2 +0,0 @@ -include templates/http.conf; -include templates/generic-php7.0-common.conf; diff --git a/nginx/templates/generic-php7.0-https.conf b/nginx/templates/generic-php7.0-https.conf deleted file mode 100644 index 76e54da..0000000 --- a/nginx/templates/generic-php7.0-https.conf +++ /dev/null @@ -1,2 +0,0 @@ -include templates/https.conf; -include templates/generic-php7.0-common.conf;