Skip to content
Snippets Groups Projects
Commit f871930f authored by bcweaver's avatar bcweaver
Browse files

Remove debug statements from simplesamlphp config

parent 2d38eb71
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
config/simplesamlphp/config/config.php
+ 6
− 8
View file @ f871930f
<?php
/*
/*
* The configuration of SimpleSAMLphp
*
*
*/
if (empty($_SERVER['PATH_INFO']) && !empty($_SERVER['DOCUMENT_URI'])) {
$index = strpos($_SERVER['DOCUMENT_URI'], '.php');
......@@ -22,9 +22,8 @@
$drop_id = $ps['conf']['pantheon_binding'];
$db = $ps['databases']['default']['default'];
//$metadata_folder = $_ENV['HOME'] .'/code/web/sites/default/files/private/simplesamlphp/metadata';
$metadata_folder = __DIR__ . '/../../../../web/sites/default/files/private/simplesamlphp/metadata';
error_log("config.php - metadata_folder: $metadata_folder");
//error_log("config.php - metadata_folder: $metadata_folder");
if(!is_dir($metadata_folder)) {
error_log("config.php - $metadata_folder isn't a directory");
......@@ -38,14 +37,13 @@
//error_log("_SERVER[FILEMOUNT]: " . $_SERVER['FILEMOUNT']);
//error_log("getenv(HOME): " . getenv('HOME'));
$metadata_folder = $_SERVER['HOME'] . '/' . $_SERVER['FILEMOUNT'] . '/private/simplesamlphp/metadata';
error_log("metadata_folder take 2: $metadata_folder");
//error_log("metadata_folder take 2: $metadata_folder");
if(!is_dir($metadata_folder)) {
error_log("metadata_folder take 2 doesn't exist: $metadata_folder");
}
}
$config = array(
/*******************************
| BASIC CONFIGURATION OPTIONS |
*******************************/
......@@ -100,7 +98,7 @@
* - 'temdir': Saving temporary files. SimpleSAMLphp will attempt to create
* this directory if it doesn't exist.
* When specified as a relative path, this is relative to the SimpleSAMLphp
* root directory.
* root directory.
*/
'certdir' => 'cert/',
'loggingdir' => 'log/',
......@@ -1072,7 +1070,7 @@
* The username and password to use when connecting to the database.
*/
'store.sql.username' => $db['username'],
'store.sql.password' => $db['password'],
'store.sql.password' => $db['password'],
/*
* The prefix we should use on our tables.
......
vendor/simplesamlphp/simplesamlphp/config/config.php
+ 6
− 8
View file @ f871930f
<?php
/*
/*
* The configuration of SimpleSAMLphp
*
*
*/
if (empty($_SERVER['PATH_INFO']) && !empty($_SERVER['DOCUMENT_URI'])) {
$index = strpos($_SERVER['DOCUMENT_URI'], '.php');
......@@ -22,9 +22,8 @@
$drop_id = $ps['conf']['pantheon_binding'];
$db = $ps['databases']['default']['default'];
//$metadata_folder = $_ENV['HOME'] .'/code/web/sites/default/files/private/simplesamlphp/metadata';
$metadata_folder = __DIR__ . '/../../../../web/sites/default/files/private/simplesamlphp/metadata';
error_log("config.php - metadata_folder: $metadata_folder");
//error_log("config.php - metadata_folder: $metadata_folder");
if(!is_dir($metadata_folder)) {
error_log("config.php - $metadata_folder isn't a directory");
......@@ -38,14 +37,13 @@
//error_log("_SERVER[FILEMOUNT]: " . $_SERVER['FILEMOUNT']);
//error_log("getenv(HOME): " . getenv('HOME'));
$metadata_folder = $_SERVER['HOME'] . '/' . $_SERVER['FILEMOUNT'] . '/private/simplesamlphp/metadata';
error_log("metadata_folder take 2: $metadata_folder");
//error_log("metadata_folder take 2: $metadata_folder");
if(!is_dir($metadata_folder)) {
error_log("metadata_folder take 2 doesn't exist: $metadata_folder");
}
}
$config = array(
/*******************************
| BASIC CONFIGURATION OPTIONS |
*******************************/
......@@ -100,7 +98,7 @@
* - 'temdir': Saving temporary files. SimpleSAMLphp will attempt to create
* this directory if it doesn't exist.
* When specified as a relative path, this is relative to the SimpleSAMLphp
* root directory.
* root directory.
*/
'certdir' => 'cert/',
'loggingdir' => 'log/',
......@@ -1072,7 +1070,7 @@
* The username and password to use when connecting to the database.
*/
'store.sql.username' => $db['username'],
'store.sql.password' => $db['password'],
'store.sql.password' => $db['password'],
/*
* The prefix we should use on our tables.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment