Description: Debian-specific paths and defaults
Forwarded: not-needed
Author: Thijs Kinkhorst <thijs@debian.org>

Index: simplesamlphp-1.6.0-rc1/config/config.php
===================================================================
--- simplesamlphp-1.6.0-rc1.orig/config/config.php	2010-05-27 17:16:28.610163455 +0200
+++ simplesamlphp-1.6.0-rc1/config/config.php	2010-05-27 17:17:29.661425155 +0200
@@ -12,9 +12,10 @@
 	 * See the user manual for more details.
 	 */
 	'baseurlpath'           => 'simplesaml/',
-	'certdir'               => 'cert/',
-	'loggingdir'            => 'log/',
-	'datadir'               => 'data/',
+	'certdir'               => '/etc/ssl/certs/',
+	'loggingdir'            => '/var/log/simplesamlphp/',
+	'datadir'               => '/var/lib/simplesamlphp/data/',
+	'metadatadir'		=> '/etc/simplesamlphp/metadata/',
 
 	/*
 	 * A directory where simpleSAMLphp can save temporary files.
@@ -43,7 +44,8 @@
 	 * This password will give access to the installation page of simpleSAMLphp with
 	 * metadata listing and diagnostics pages.
 	 */
-	'auth.adminpassword'		=> '123',
+	// Debian: this password is in /var/lib/simplesamlphp/secrets.inc.php
+	//'auth.adminpassword'		=> '123',
 	'admin.protectindexpage'	=> false,
 	'admin.protectmetadata'		=> false,
 
@@ -55,7 +57,8 @@
 	 * A possible way to generate a random salt is by running the following command from a unix shell:
 	 * tr -c -d '0123456789abcdefghijklmnopqrstuvwxyz' </dev/urandom | dd bs=32 count=1 2>/dev/null;echo
 	 */
-	'secretsalt' => 'defaultsecretsalt',
+	// Debian: this secret is in /var/lib/simplesamlphp/secrets.inc.php
+	//'secretsalt' => 'defaultsecretsalt',
 	
 	/*
 	 * Some information about the technical persons running this installation.
@@ -469,5 +472,5 @@
 
 );
 
+require_once('/var/lib/simplesamlphp/secrets.inc.php');
 
-?>
\ No newline at end of file