From b885ce17056ead3d9046caa51f6241ebcc8a760a Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Fri, 10 Jun 2016 10:19:43 +0200
Subject: [PATCH] Remove config templates that are no longer used. They are
creating confusion and serve no purpose after all.
---
config-templates/cas-ldap.php | 38 ---------------
config-templates/config-login-auto.php | 63 -------------------------
config-templates/config-login-feide.php | 37 ---------------
config-templates/ldap.php | 42 -----------------
config-templates/ldapmulti.php | 31 ------------
config-templates/translation.php | 14 ------
6 files changed, 225 deletions(-)
delete mode 100644 config-templates/cas-ldap.php
delete mode 100644 config-templates/config-login-auto.php
delete mode 100644 config-templates/config-login-feide.php
delete mode 100644 config-templates/ldap.php
delete mode 100644 config-templates/ldapmulti.php
delete mode 100644 config-templates/translation.php
diff --git a/config-templates/cas-ldap.php b/config-templates/cas-ldap.php
deleted file mode 100644
index 255b7784b..000000000
--- a/config-templates/cas-ldap.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- * The configuration of SimpleSAMLphp
- *
- *
- */
-
-$casldapconfig = array (
- 'idpentityid.example.org' => array(
- 'cas' => array(
- 'login' => 'https://idpentityid.example.org/cas/login',
- 'validate' => 'https://idpentityid.example.org/cas/validate',
- ),
- 'ldap' => array(
- 'servers' => 'idpentityid.example.org',
- 'enable_tls' => true,
- 'searchbase' => 'dc=example,dc=org',
- 'searchattributes' => 'uid',
- 'attributes' => array('cn', 'mail'),
- ),
- ),
- 'idpentityid2.example.org' => array(
- 'cas' => array(
- 'login' => 'https://idpentityid2.example.org/login',
- 'validate' => 'https://idpentityid2.example.org/validate',
- ),
- 'ldap' => array(
- 'servers' => 'ldap://idpentityid2.example.org',
- 'enable_tls' => true,
- 'searchbase' => 'ou=users,dc=example,dc=org',
- 'searchattributes' => array('uid', 'mail'), # array for being able to login with either uid or mail.
- 'attributes' => null,
- 'priv_user_dn' => 'uid=admin,ou=users,dc=example,dc=org',
- 'priv_user_pw' => 'xxxxx',
- ),
- ),
-
-);
diff --git a/config-templates/config-login-auto.php b/config-templates/config-login-auto.php
deleted file mode 100644
index 2412882f1..000000000
--- a/config-templates/config-login-auto.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/*
- * The configuration of the login-auto authentication module.
- */
-
-$config = array (
-
- /*
- * This option enables or disables the login-auto authentication
- * handler. This handler is implemented in 'www/auth/login-auto.php'.
- *
- * When this option is set to true, a user can go to the
- * 'auth/login-auto.php' web page to be authenticated as an example
- * user. The user will receive the attributes set in the
- * 'auth.auto.attributes' option.
- *
- * WARNING: setting this option to true will make it possible to use
- * this authenticator for all users, irrespectively of the 'auth'
- * setting in the IdP's metadata. They can always use it by opening the
- * 'auth/login-auto.php' webpage manually.
- */
- 'auth.auto.enable' => true,
-
- /*
- * This option configures which attributes the login-auto
- * authentication handler will set for the user. It is an array of
- * arrays. The name of the attribute is the index in the first array,
- * and all the values for the attribute is given in the array
- * referenced to by the name.
- *
- * Example:
- * 'auth.auto.attributes' => array(
- * 'edupersonaffiliation' => array('student', 'member'),
- * 'uid' => array('example_uid'),
- * 'mail' => array('example@example.com'),
- * ),
- */
- 'auth.auto.attributes' => array(
- 'edupersonaffiliation' => array('student', 'member'),
- 'title' => array('Example user title'),
- 'uid' => array('example_uid'),
- 'mail' => array('example@example.com'),
- 'cn' => array('Example user commonname'),
- 'givenname' => array('Example user givenname'),
- 'sn' => array("Example surname"),
- ),
-
- /*
- * When this option is set to true, the login-auto authentication
- * handler will ask for a username and a password. This can be used to
- * test the IdP. The username and password isn't verified, and the
- * user/script can enter anything.
- */
- 'auth.auto.ask_login' => false,
-
- /*
- * This option configures a delay in the login-auto authentication
- * handler. The script will wait for the given number of milliseconds
- * before authenticating the user. This can, for example, be used in
- * a simple simulation of a slow LDAP server.
- */
- 'auth.auto.delay_login' => 0,
-);
diff --git a/config-templates/config-login-feide.php b/config-templates/config-login-feide.php
deleted file mode 100644
index 9625323ba..000000000
--- a/config-templates/config-login-feide.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- * Configuration for the auth/login-feide.php login module.
- *
- * The configuration file is an array with multiple organizations. The user
- * can select which organization he/she wants to log in with, with a drop-down
- * menu in the user interface.
- *
- */
-
-$config = array (
-
- 'orgldapconfig' => array(
-
- 'example1.com' => array(
- 'description' => 'Example Org 1',
- 'searchbase' => 'cn=people,dc=example1,dc=com',
- 'hostname' => 'ldaps://ldap.example1.com',
- 'attributes' => null,
-
- 'contactMail' => 'admin@example1.com',
- 'contactURL' => 'http://admin.example1.com',
-
- // System user to bind() before we do a search for eduPersonPrincipalName
- 'adminUser' => 'uid=admin,dc=example1,dc=com',
- 'adminPassword' => 'xxx',
-
- ),
- 'example1.com' => array(
- 'description' => 'Example Org 1',
- 'searchbase' => 'cn=people,dc=example1,dc=com',
- 'hostname' => 'ldaps://ldap.example1.com',
-
- 'attributes' => array('mail', 'street'),
- ),
- ),
-);
diff --git a/config-templates/ldap.php b/config-templates/ldap.php
deleted file mode 100644
index 799f58428..000000000
--- a/config-templates/ldap.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
- * Configuration for the LDAP authentication module.
- */
-
-$config = array (
-
- /**
- * LDAP configuration. This is only relevant if you use the LDAP authentication plugin.
- *
- * The attributes parameter is a list of attributes that should be retrieved.
- * If the attributes parameter is set to null, all attributes will be retrieved.
- */
- 'auth.ldap.dnpattern' => 'uid=%username%,dc=feide,dc=no,ou=feide,dc=uninett,dc=no',
- 'auth.ldap.hostname' => 'ldap.uninett.no',
- 'auth.ldap.attributes' => null,
- 'auth.ldap.enable_tls' => true,
-
- /*
- * Searching the DN of the user.
- */
-
- // Set this to TRUE to enable searching.
- 'auth.ldap.search.enable' => FALSE,
-
- // The base DN for the search.
- 'auth.ldap.search.base' => NULL,
-
- /* The attribute(s) to search for.
- *
- * This may be a single string, or an array of string. If this is an array, then any of the attributes
- * in the array may match the value the user supplied as the username.
- */
- 'auth.ldap.search.attributes' => NULL,
-
- /* The username & password the SimpleSAMLphp should bind as before searching. If this is left
- * as NULL, no bind will be performed before searching.
- */
- 'auth.ldap.search.username' => NULL,
- 'auth.ldap.search.password' => NULL,
-
-);
diff --git a/config-templates/ldapmulti.php b/config-templates/ldapmulti.php
deleted file mode 100644
index ce16cdee8..000000000
--- a/config-templates/ldapmulti.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * Configuration for the multi-DN LDAP authentication module.
- *
- */
-
-$ldapmulti = array (
-
- 'feide.no' => array(
- 'description' => 'Feide',
- // for a description of options see equivalent options in ldap.php starting with auth.ldap.
- 'dnpattern' => 'uid=%username%,dc=feide,dc=no,ou=feide,dc=uninett,dc=no',
- 'hostname' => 'ldap.uninett.no',
- 'attributes' => NULL,
- 'enable_tls' => TRUE,
- 'search.enable' => FALSE,
- 'search.base' => NULL,
- 'search.attributes' => NULL,
- 'search.username' => NULL,
- 'search.password' => NULL,
- ),
-
- 'uninett.no' => array(
- 'description' => 'UNINETT',
- 'dnpattern' => 'uid=%username%,ou=people,dc=uninett,dc=no',
- 'hostname' => 'ldap.uninett.no',
- 'attributes' => NULL,
- )
-
-);
diff --git a/config-templates/translation.php b/config-templates/translation.php
deleted file mode 100644
index 8149aacf6..000000000
--- a/config-templates/translation.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/*
- * Configuration
- *
- */
-
-$config = array (
-
- 'application' => 'simplesamlphp',
- 'baseurl' => 'https://translation.rnd.feide.no/simplesaml',
- 'key' => '_e7224d54cda84434e25ef087e5c22c1fa5f6ae87cc',
- 'secret' => '_0e29f782d295bc9782112981f654f1db58174d19d7',
-
-);
--
GitLab