prepare for deprecation of PHP 7.0

clayfreeman · Nov 26, 2018 · dad4f9c · dad4f9c
1 parent 5c38cb9
commit dad4f9c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/nginx/templates/generic-php7.0-http.conf b/nginx/templates/generic-php7.0-http.conf
diff --git a/nginx/templates/generic-php7.0-https.conf b/nginx/templates/generic-php7.0-https.conf