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

Re-run composer install

parent 1cbca045
No related branches found
No related tags found
No related merge requests found
......@@ -15,12 +15,14 @@
// and Shibboleth 1.3 IdPs.
'default-sp' => array(
'saml:SP',
'privatekey' => 'sp-key.pem',
'certificate' => 'sp-cert.crt',
'privatekey' => 'sp-key-old.pem',
'certificate' => 'sp-cert-old.crt',
'new_privatekey' => 'sp-key.pem',
'new_certificate' => 'sp-cert.crt',
// The entity ID of this SP.
// Can be NULL/unset, in which case an entity ID is generated based on the metadata URL.
'entityID' => "https://" . $_SERVER['HTTP_HOST'] . "/simplesaml",
'entityID' => "https://" . $_SERVER['HTTP_HOST'] . "/simplesaml",
// The entity ID of the IdP this should SP should contact.
// Can be NULL/unset, in which case the user will be shown a list of available IdPs.
......
......@@ -16,20 +16,20 @@
//error_log('set home dir: ' . $_ENV['HOME']);
}
# Load necessary environmental data
// Load necessary environmental data
$ps = json_decode($_SERVER['PRESSFLOW_SETTINGS'], TRUE);
$host = $_SERVER['HTTP_HOST'];
$drop_id = $ps['conf']['pantheon_binding'];
$db = $ps['databases']['default']['default'];
// Set metadata path
$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");
}
if(!empty($_SERVER['FILEMOUNT']) && !is_dir($metadata_folder)) {
error_log("metadata_folder doesn't exist: $metadata_folder");
// error_log("_ENV[HOME]: " . $_ENV['HOME']);
......@@ -37,12 +37,35 @@
//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");
}
}
// Set cert/key path
$cert_folder = __DIR__ . '/../../../../web/sites/default/files/private/simplesamlphp/cert';
// error_log("config.php - cert_folder: $cert_folder");
if(!is_dir($cert_folder)) {
error_log("config.php - $cert_folder isn't a directory");
}
if(!empty($_SERVER['FILEMOUNT']) && !is_dir($cert_folder)) {
error_log("cert_folder doesn't exist: $cert_folder");
// error_log("_ENV[HOME]: " . $_ENV['HOME']);
// error_log("_SERVER[HOME]: " . $_SERVER['HOME']);
//error_log("_SERVER[FILEMOUNT]: " . $_SERVER['FILEMOUNT']);
//error_log("getenv(HOME): " . getenv('HOME'));
$cert_folder = $_SERVER['HOME'] . '/' . $_SERVER['FILEMOUNT'] . '/private/simplesamlphp/cert';
error_log("cert_folder take 2: $cert_folder");
if(!is_dir($cert_folder)) {
error_log("cert_folder take 2 doesn't exist: $cert_folder");
}
}
$config = array(
/*******************************
| BASIC CONFIGURATION OPTIONS |
......@@ -100,7 +123,7 @@
* When specified as a relative path, this is relative to the SimpleSAMLphp
* root directory.
*/
'certdir' => 'cert/',
'certdir' => $cert_folder,
'loggingdir' => 'log/',
'datadir' => 'data/',
'tempdir' => '/srv/bindings/' . $drop_id . '/tmp/simplesaml',
......
This diff is collapsed.
File deleted
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-03-01 14:40+0100\n"
"PO-Revision-Date: 2016-03-01 14:45+0100\n"
"Last-Translator: Hanne Moa <hanne.moa@uninett.no>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.4\n"
"X-Poedit-Basepath: .\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: nb\n"
"X-Poedit-SourceCharset: UTF-8\n"
msgid "Hello, Untranslated World!"
msgstr "Hallo, oversatte verden!"
msgid "Hello, %who%!"
msgstr "Hallo, %who%!"
msgid "World"
msgstr "Verden"
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-03-01 14:40+0100\n"
"PO-Revision-Date: 2016-03-01 14:45+0100\n"
"Last-Translator: Hanne Moa <hanne.moa@uninett.no>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.4\n"
"X-Poedit-Basepath: .\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: nb\n"
"X-Poedit-SourceCharset: UTF-8\n"
msgid "Hello, Untranslated World!"
msgstr "Hallo, oversatte verden!"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment