Skip to content
Snippets Groups Projects
Commit 434c01a6 authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg
Browse files

Tidy up configuration files, and removed logos... 

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2821 44740490-163a-0410-bde0-09ae8108e29a
parent 8a1912b6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 57 additions and 354 deletions
modules/discojuice/config-templates/discojuicecentral.php
+ 12
− 4
View file @ 434c01a6
<?php <?php
/** /**
* This is the configuration file for the Auth MemCookie example. * This is a DiscoJuice configuration file.
*
* This configuration is used for the standalone DiscoJuice instance, that will become available at:
* /simplesaml/module.php/discojuice/central.php
*
* For details about the configuration option visit the DiscoJuice documentation:
* http://discojuice.simplesamlphp.org/docs
*/ */
$config = array( $config = array(
// Which hostnames should be allowed to read user selections on entities chosen using DiscoJuice.
// You need to enable those hostnames that is configured to read data using the DiscoJuiceReadWrite protocol.
// http://discojuice.simplesamlphp.org/docs/1.0/discoreadwrite
'acl' => array( 'acl' => array(
'simplesamlphp.org', 'foodl.org', 'simplesamlphp.org', 'example.org',
), ),
// DiscoJuice opitions for the central DiscoJuice page.
'discojuice.options' => array( 'discojuice.options' => array(
"title"=> 'Sign in to <strong>this service</strong>', "title"=> 'Sign in to <strong>this service</strong>',
"subtitle"=> "Select your Provider", "subtitle"=> "Select your Provider",
...@@ -22,7 +32,5 @@ $config = array( ...@@ -22,7 +32,5 @@ $config = array(
"location"=> true, "location"=> true,
"debug.weight" => false, "debug.weight" => false,
), ),
); );
\ No newline at end of file
modules/discojuice/config-templates/discojuiceembed.php
+ 26
− 17
View file @ 434c01a6
<?php <?php
/** /**
* This is the configuration file for the Auth MemCookie example. * This is a DiscoJuice configuration file.
*
* This configuration is used for the embedded DiscoJuice instance.
*
* For details about the configuration option visit the DiscoJuice documentation:
* http://discojuice.simplesamlphp.org/docs
*/ */
$config = array( $config = array(
...@@ -10,6 +15,21 @@ $config = array( ...@@ -10,6 +15,21 @@ $config = array(
"title"=> 'Sign in to <strong>Foodle</strong>', "title"=> 'Sign in to <strong>Foodle</strong>',
"subtitle"=> "Select your Provider", "subtitle"=> "Select your Provider",
// Want to override the inline help texts in DiscoJuice, uncomment the following section:
/*
'textSearch' => 'søk etter noe...',
'textHelp' => 'Finner du ikke en innnloggsingstjener du kjenner?',
'textHelpMore' => 'Let mer...',
*/
// Where to fetch metadata from. DiscoJuiceJSON format..
// You may provide a 'callback=?' querystring parameter in ordert to support JSONP.
// By default this feed endpoint is automatically configured to be correct for the
// DiscoJuice simpleSAMLphp module (which has a built-in feed generator).
// "metadata" => 'http://example.org/discojuicejson/index.php?callback=?',
"always"=> false, "always"=> false,
"overlay"=> true, "overlay"=> true,
"cookie"=> true, "cookie"=> true,
...@@ -23,23 +43,12 @@ $config = array( ...@@ -23,23 +43,12 @@ $config = array(
function(e) { function(e) {
console.log(e); // The auth parameter is indicating which authentication method is being used.
var auth = e.auth || null; var auth = e.auth || null;
var returnto = window.location.href || 'https://foodl.org'; var returnto = window.location.href || 'https://example.org';
switch(auth) {
window.location = 'https://foodl.org/simplesaml/module.php/core/as_login.php?AuthId=saml&ReturnTo=' + escape(returnto) + '&saml:idp=' + escape(e.entityID);
case 'twitter':
window.location = 'https://foodl.org/simplesaml/module.php/core/as_login.php?AuthId=twitter&ReturnTo=' + escape(returnto);
break;
case 'saml':
default:
window.location = 'https://foodl.org/simplesaml/module.php/core/as_login.php?AuthId=saml&ReturnTo=' + escape(returnto) + '&saml:idp=' + escape(e.entityID);
break;
}
} }
" "
......
modules/discojuice/config-templates/discojuicefeed.php
+ 19
− 333
View file @ 434c01a6
<?php <?php
/** /**
* This is the configuration file for the Auth MemCookie example. * This is a DiscoJuice configuration file.
*
* This configuration is used for the DiscoJuiceJSON metadata feed, that will become available at:
* /simplesaml/module.php/discojuice/feed.php
*
* For details about the configuration option visit the DiscoJuice documentation:
* http://discojuice.simplesamlphp.org/docs
*/ */
$config = array( $config = array(
// Provides a list of IdPs that has already successfully logged in at least one user.
// Will give these IdPs extra weight in the UI.
// 'idplistapi' => 'https://foodl.org/api/idplist',
// Merge DiscoJuiceJSON with a additional sources.
// 'mergeEndpoints' => array(
// ),
// Include a set of extra entities, that is not present in metadata (DiscoJuiceJSON)
'insert' => array( 'insert' => array(
'https://twitter.com' => array(
'icon' => 'twitter.png',
// 'descr' => 'Login with your Twitter account',
'title' => 'Twitter',
'weight' => -1,
'auth' => 'twitter',
'country' => '_all_',
'distance' => null,
// 'keywords' => array(
// 'Organizations' => array('Twitter'),
// ),
),
), ),
// Exclude a set of entity IDs to not show in the Discovery Service
'exclude' => array( 'exclude' => array(
'https://testidp.wayf.dk',
'https://betawayf.wayf.dk',
), ),
// Allows you to override DiscoJuiceJSON metadata.
// May be useful if an external party offers a DiscoJuiceJSON feed, and you would like to do some customization.
'overrides' => array( 'overrides' => array(
'https://twitter.com' => array(
'icon' => 'twitter.png',
'weight' => -1,
'auth' => 'twitter',
'country' => '_all_',
),
'https://idp.feide.no' => array(
'icon' => 'feide2.png',
'descr' => 'Brukere i norske utdanningsinstitusjoner [beta]',
'weight' => -10,
'keywords' => array(
'Organizations' => array('UNINETT', 'Feide', 'UiO', 'NTNU', 'UiB', 'UiT'),
'Places' => array('Norway', 'Norge', 'Trondheim', 'Oslo', 'Bergen', 'Tromsø', 'Stavanger'),
),
),
'https://idp-test.feide.no' => array(
'icon' => 'feide2.png',
'weight' => 10,
'country' => 'XX',
),
'https://betawayf.wayf.dk' => array(
'icon' => 'wayf2.png',
'weight' => 10,
'country' => 'XX',
),
'https://www.rediris.es/sir/redirisidp' => array(
'icon' => 'rediris.png',
'weight' => -1,
),
'https://idp.nordu.net/idp/shibboleth' => array(
'icon' => 'nordunet.png',
'weight' => -3,
),
'https://openidp.feide.no' => array(
'icon' => 'openidp.png',
'title' => 'Feide OpenIdP',
'descr' => 'If you do not have an institutional account, register here.',
'country' => '_all_',
'weight' => -5,
'keywords' => array(
'Keyword' => array('Guest', 'OpenIdP', 'Orphanage', 'Homeless', 'Create Account', 'Register'),
),
),
'https://idp.protectnetwork.org/protectnetwork-idp' => array(
'icon' => 'protectnetwork.png',
'title' => 'Protect Network',
'descr' => 'If you do not have an institutional account, register here.',
'country' => '_all_',
'weight' => -6,
'geo' => null,
'keywords' => array(
'Keyword' => array('Guest', 'OpenIdP', 'Orphanage', 'Homeless', 'Create Account', 'Register'),
),
),
'https://login.terena.org/idp/saml2/idp/metadata.php' => array(
'icon' => 'terena2.png',
'descr' => 'Terena offices Netherlands',
'country' => 'NL',
'weight' => -3,
),
'https://idp.csc.fi/idp/shibboleth' => array(
'icon' => 'csc.png',
'weight' => -2,
),
'https://wayf.wayf.dk' => array(
'weight' => -3,
'icon' => 'wayf2.png',
),
'https://www.rediris.es/sir/umaidp' => array(
'weight' => -2,
'icon' => 'uma.png',
),
'https://idp.uma.es/simplesaml/saml2/idp/metadata.php' => array(
'weight' => -2,
'icon' => 'uma.png',
),
'https://idpguest.fccn.pt/idp/shibboleth' => array(
'weight' => -2,
'icon' => 'fccn.png',
),
'https://whoami.cesnet.cz/idp/shibboleth' => array(
'weight' => -2,
'icon' => 'cesnet.png',
'country' => 'CZ',
),
'https://login.ntua.gr/idp/shibboleth' => array(
'weight' => -2,
'icon' => 'ntua.png',
'country' => 'GR',
),
'https://idp.umu.se/saml2/idp/metadata.php' => array(
'title' => 'Umeå Universitet',
'weight' => -3,
'icon' => 'umeaa.png',
# 'country' => 'sweden',
),
'SURFnet%20BV' => array(
'icon' => 'surfnet.png',
'weight' => -2
),
'gidp.geant.net' => array(
'country' => '_all_',
'icon' => 'geant.png',
),
'urn:mace:cru.fr:federation:sac' => array(
'icon' => 'cru.png',
),
'https://stc-test16.cis.brown.edu/idp/shibboleth' => array(
'icon' => 'brown.png',
'title' => 'Brown University',
),
'https://www.rediris.es/sir/uvigoidp' => array(
'geo' => array('lat' => 42.169185 , 'lon' => -8.683609)
),
'https://www.rediris.es/sir/uahidp' => array(
'geo' => array('lat' => 40.510597 , 'lon' => -3.343858)
),
'https://www.rediris.es/sir/bcblidp' => array(
'geo' => array('lat' => 43.294269, 'lon' => -1.9861)
),
'https://www.rediris.es/sir/ullidp' => array(
'geo' => array('lat' => 28.4816, 'lon' => -16.3168)
),
'https://www.rediris.es/sir/ubuidp' => array(
'geo' => array('lat' => 42.340197, 'lon' => -3.7277)
),
'https://www.rediris.es/sir/upctidp' => array(
'geo' => array('lat' => 37.6018, 'lon' => -0.9794)
),
'https://www.rediris.es/sir/umidp' => array(
'geo' => array('lat' => 38.022, 'lon' => -1.174)
),
'https://www.rediris.es/sir/uclmidp' => array(
'geo' => array('lat' => 38.986096 , 'lon' => -3.927262)
),
'https://www.rediris.es/sir/upmidp' => array(
'geo' => array('lat' => 40.449, 'lon' => 3.7191)
),
'https://www.rediris.es/sir/boeidp' => array(
'geo' => array('lat' => 40.4867, 'lon' => -3.6604)
),
'https://www.rediris.es/sir/usidp' => array(
'geo' => array('lat' => 37.382, 'lon' => -5.99158)
),
'https://www.rediris.es/sir/usalidp'=> array(
'geo' => array('lat' => 40.790887, 'lon' => -5.539856)
),
'https://www.rediris.es/sir/deustoidp' => array(
'geo' => array('lat' => 43.270891, 'lon' => -2.938769)
),
'https://www.rediris.es/sir/uaidp' => array(
'geo' => array('lat' => 38.385975, 'lon' => -0.514267)
),
'https://www.rediris.es/sir/ucoidp' => array(
'geo' => array('lat' => 37.9157009, 'lon' => -4.721796)
),
'https://www.rediris.es/sir/dipcidp' => array(
'geo' => array('lat' => 43.1819, 'lon' => -2.0039)
),
'https://www.rediris.es/sir/uaxidp' => array(
'geo' => array('lat' => 40.452, 'lon' => -3.984)
),
'https://www.rediris.es/sir/iacidp' => array(
'geo' => array('lat' => 28.47468, 'lon' => -16.308303)
),
'https://www.rediris.es/sir/redirisidp' => array(
'geo' => array('lat' => 40.447636, 'lon' => -3.694236)
),
'https://www.rediris.es/sir/ujaenidp' => array(
'geo' => array('lat' => 37.789800, 'lon' => -3.77795)
),
'https://www.rediris.es/sir/uabidp' => array(
'geo' => array('lat' => 41.500742, 'lon' => 2.110714)
),
'https://www.rediris.es/sir/uscidp' => array(
'geo' => array('lat' => 42.876, 'lon' => -8.554)
),
'https://www.rediris.es/sir/uhuidp' => array(
'geo' => array('lat' => 37.266847 , 'lon' => -6.921586)
),
'https://www.rediris.es/sir/iteidp' => array(
'geo' => array('lat' => 40.445684, 'lon' => -3.655001)
),
'https://www.rediris.es/sir/uniriojaidp' => array(
'geo' => array('lat' => 42.463, 'lon' => -2.427)
),
'https://www.rediris.es/sir/upcomillasidp' => array(
'geo' => array('lat' => 40.43000, 'lon' => -3.71127)
),
'https://www.rediris.es/sir/unedidp' => array(
'geo' => array('lat' => 40.4381, 'lon' => -3.7041)
),
'https://www.rediris.es/sir/udcidp' => array(
'geo' => array( 'lat' => 43.33127, 'lon' => -8.412184)
),
'https://www.rediris.es/sir/funepidp' => array(
'geo' => array('lat' => 40.4287, 'lon' => -3.7156)
),
'https://www.rediris.es/sir/cemfiidp' => array(
'geo' => array('lat' => 40.4140, 'lon' => -3.6896)
),
'https://www.rediris.es/sir/cesgaidp' => array(
'geo' => array('lat' => 42.875, 'lon' => -8.553)
),
'https://www.rediris.es/sir/upnaidp' => array(
'geo' => array('lat' => 42.8000, 'lon' => -1.6361)
),
'https://www.rediris.es/sir/ehuidp' => array(
'geo' => array('lat' => 43.331611, 'lon' => -2.971557)
),
'https://www.rediris.es/sir/unizaridp' => array(
'geo' => array('lat' => 41.643, 'lon' => -0.899)
),
'https://www.rediris.es/sir/unicanidp' => array(
'geo' => array('lat' => 43.471111, 'lon' => 3.805)
),
'https://www.rediris.es/sir/ufvidp' => array(
'geo' => array('lat' => 40.262, 'lon' => -3.500)
),
'https://www.rediris.es/sir/cicaidp' => array(
'geo' => array('lat' => 37.359058, 'lon' => -5.988909)
),
'https://www.rediris.es/sir/ciematidp' => array(
'geo' => array('lat' => 40.4553, 'lon' => -3.7246)
),
'https://www.rediris.es/sir/i2catidp' => array(
'geo' => array('lat' => 41.386984, 'lon' => 2.111435)
),
'https://www.rediris.es/sir/ivieidp' => array(
'geo' => array('lat' => 39.490507, 'lon' => -0.355907)
),
'https://www.rediris.es/sir/uamidp' => array(
'geo' => array('lat' => 40.547220, 'lon' => -3.692075)
),
'https://www.rediris.es/sir/uc3midp' => array(
'geo' => array('lat' => 40.332488, 'lon' => -3.765700)
),
'https://www.rediris.es/sir/umaidp' => array(
'geo' => array('lat' => 36.719645, 'lon' => -4.420018)
),
'https://www.rediris.es/sir/esaidp' => array (
'geo' => array('lat' => 40.445259, 'lon' => -3.953927)
),
'https://www.rediris.es/sir/ubidp' => array(
'geo' => array('lat' => 41.386843, 'lon' => 2.163652)
),
'https://www.rediris.es/sir/ucaidp' => array(
'geo' => array('lat' => 36.53388, 'lon' => -6.298031 )
),
'https://www.rediris.es/sir/unileonidp' => array(
'geo' => array('lat' => 42.612, 'lon' => -5.559)
)
), ),
); );
\ No newline at end of file
modules/discojuice/www/discojuice/logos/arcada.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/arcada.png

2.92 KiB

modules/discojuice/www/discojuice/logos/bibsys.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/bibsys.png

4.9 KiB

modules/discojuice/www/discojuice/logos/brown.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/brown.png

3.17 KiB

modules/discojuice/www/discojuice/logos/cesnet.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/cesnet.png

3.85 KiB

modules/discojuice/www/discojuice/logos/cru.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/cru.png

2.53 KiB

modules/discojuice/www/discojuice/logos/csc.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/csc.png

2.41 KiB

modules/discojuice/www/discojuice/logos/fccn.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/fccn.png

3.51 KiB

modules/discojuice/www/discojuice/logos/feide-s.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/feide-s.png

3.08 KiB

modules/discojuice/www/discojuice/logos/feide.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/feide.png

5.04 KiB

modules/discojuice/www/discojuice/logos/feide2.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/feide2.png

4.92 KiB

modules/discojuice/www/discojuice/logos/geant.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/geant.png

4.95 KiB

modules/discojuice/www/discojuice/logos/google.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/google.png

4.45 KiB

modules/discojuice/www/discojuice/logos/haka.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/haka.png

7.19 KiB

modules/discojuice/www/discojuice/logos/helsinki.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/helsinki.png

2.64 KiB

modules/discojuice/www/discojuice/logos/himolde.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/himolde.png

3.25 KiB

modules/discojuice/www/discojuice/logos/hint.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/hint.png

5.76 KiB

modules/discojuice/www/discojuice/logos/hist.png deleted 100644 → 0
+ 0
− 0
View file @ 8a1912b6
modules/discojuice/www/discojuice/logos/hist.png

4.66 KiB

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