Skip to content

Commit

Permalink
allowing for developers to override settings on developer machines
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Washburn committed Apr 16, 2015
1 parent 83295af commit 2e22580
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Ignore paths that contain user-generated content.
/sites/*/files
/sites/*/private
/sites/default/settings.local.php
/sites/default/local.settings.php
/files/*
/cache

Expand Down
32 changes: 32 additions & 0 deletions sites/default/default.local.settings.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php
/*
* Copy this file to local.settings.php in order to override configuration within settings.php
* local.settings.php is ignored by git and not deployed to Pantheon
*/
$databases['default']['default'] = array(
'driver' => 'mysql',
'database' => 'kalamuna_playbox',
'username' => 'root',
'password' => 'root',
'host' => 'localhost',
'port' => '8889',
'prefix' => '',
);

$update_free_access = TRUE;


$base_url = 'http://'.$_SERVER['HTTP_HOST'].'/kalamuna/playbox'; // NO trailing slash!
$cookie_domain = $_SERVER['HTTP_HOST'];

#disables Drupal Caching if desired
/*$conf = array(
'cache' => '0',
'preprocess_css' => '0',
'preprocess_js' => '0',
'block_cache' => '0',
'page_compression' => '0',
);*/

ini_set('memory_limit', '500M');
ini_set('max_execution_time', 300);
2 changes: 1 addition & 1 deletion sites/default/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@
/**
* Include a local settings file if it exists.
*/
$local_settings = dirname(__FILE__) . '/settings.local.php';
$local_settings = dirname(__FILE__) . '/local.settings.php';
if (file_exists($local_settings)) {
include $local_settings;
}

0 comments on commit 2e22580

Please sign in to comment.