From 0900fd29aae0d94441fe91b8e3157ebb966ad961 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 1 Apr 2015 08:59:38 +0100 Subject: [PATCH 1/2] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 244e4fed..9a9b4c08 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -sculpin-minimal -=============== +oliverdavies.co.uk +================== -A minimal installation of [Sculpin](http://sculpin.io). +The source code for . Built with [Sculpin](http://sculpin.io). Build ----- @@ -17,4 +17,4 @@ Your newly generated clone of the site is now accessible at `http://localhost:80 curl -O https://download.sculpin.io/sculpin.phar php sculpin.phar install - php sculpin.phar generate --watch --server \ No newline at end of file + php sculpin.phar generate --watch --server From 8211d8bb0bf7131c547a7ab6e29c0fa2e157fbf5 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 1 Apr 2015 13:21:03 +0100 Subject: [PATCH 2/2] Updated the code snippet --- source/_posts/2014-11-27-pantheon-settings-files.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/_posts/2014-11-27-pantheon-settings-files.md b/source/_posts/2014-11-27-pantheon-settings-files.md index cc453e61..1f13e0a3 100644 --- a/source/_posts/2014-11-27-pantheon-settings-files.md +++ b/source/_posts/2014-11-27-pantheon-settings-files.md @@ -42,9 +42,14 @@ My alternative solution to this is to include an environment-specific settings f To do this, add the following code to the bottom of settings.php: ~~~php -// If using Pantheon, include an environment-specific settings file, for example -// settings.dev.php, if one exists. if (isset($_SERVER['PANTHEON_ENVIRONMENT'])) { + if ($_SERVER['PANTHEON_ENVIRONMENT'] != 'live') { + // You can still add things here, for example to apply to all sites apart + // from production. Mail reroutes, caching settings etc. + } + + // Include an environment-specific settings file, for example + // settings.dev.php, if one exists. $environment_settings = __DIR__ . '/settings.' . $_SERVER['PANTHEON_ENVIRONMENT'] . '.php'; if (file_exists($environment_settings)) { include $environment_settings;