Merge branch 'release/1.0.10'

nystudio107 · Sep 12, 2017 · bbd3526 · bbd3526
2 parents 89ec3cd + d001226
commit bbd3526
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Nginx-Craft Changelog
 
+## 1.0.10 - 2017.09.12
+### Changed
+* Updated the config to use php7.1 by default
+* Added comments for the CME config
+
 ## 1.0.9 - 2017.09.01
 ### Changed
 * Added OCSP stapling

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ The following are assumptions made in this configuration:
 * The canonical domain is SOMEDOMAIN.com (no www.)
 * Nginx is version 1.9.5 or later (and thus supports http2)
 * Paths are standard Ubuntu, change as needed
-* You're using php7 via php-fpm
+* You're using php7.1 via php-fpm
 * You have `'omitScriptNameInUrls' => true,` in your `craft/general.php`
 
 If any of these assumptions are invalid, make the appropriate changes.

diff --git a/forge-example/NginxConfiguration.conf b/forge-example/NginxConfiguration.conf
@@ -97,13 +97,15 @@ server {
         location ~ [^/]\.php(/|$) {
         try_files $uri $uri/ /index.php?$query_string;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
+        # Change this to whatever version of php you are using
+        fastcgi_pass unix:/var/run/php/php7.1-fpm.sock;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
         fastcgi_param HTTP_PROXY "";
 
+        # See https://github.com/nystudio107/craft-multi-environment or https://github.com/nystudio107/craft3-multi-environment
         fastcgi_param CRAFTENV_CRAFT_ENVIRONMENT "REPLACE_ME";
         fastcgi_param CRAFTENV_DB_HOST "REPLACE_ME";
         fastcgi_param CRAFTENV_DB_NAME "REPLACE_ME";

diff --git a/sites-available/somedomain.com.conf b/sites-available/somedomain.com.conf
@@ -105,13 +105,24 @@ server {
     location ~ [^/]\.php(/|$) {
         try_files $uri $uri/ /index.php?$query_string;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
+        # Change this to whatever version of php you are using
+        fastcgi_pass unix:/var/run/php/php7.1-fpm.sock;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
         fastcgi_param HTTP_PROXY "";
 
+        # See https://github.com/nystudio107/craft-multi-environment or https://github.com/nystudio107/craft3-multi-environment
+        fastcgi_param CRAFTENV_CRAFT_ENVIRONMENT "REPLACE_ME";
+        fastcgi_param CRAFTENV_DB_HOST "REPLACE_ME";
+        fastcgi_param CRAFTENV_DB_NAME "REPLACE_ME";
+        fastcgi_param CRAFTENV_DB_USER "REPLACE_ME";
+        fastcgi_param CRAFTENV_DB_PASS "REPLACE_ME";
+        fastcgi_param CRAFTENV_SITE_URL "REPLACE_ME";
+        fastcgi_param CRAFTENV_BASE_URL "REPLACE_ME";
+        fastcgi_param CRAFTENV_BASE_PATH "REPLACE_ME";
+
         fastcgi_intercept_errors off;
         fastcgi_buffer_size 16k;
         fastcgi_buffers 4 16k;