hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 23:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update authentication configuration

Browse Source
This commit is contained in:
Romain Neutron
2013-05-06 19:07:51 +02:00
parent 4dd46cd4e8
commit cbc3fd981f
7 changed files with 296 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/config.sample.yml
View File

@@ -32,7 +32,8 @@ dev:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
providers:
facebook: facebook:
enabled: false enabled: false
options: options:
@@ -92,7 +93,8 @@ prod:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
providers:
facebook: facebook:
enabled: false enabled: false
options: options:
@@ -152,7 +154,8 @@ test:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
providers:
facebook: facebook:
enabled: false enabled: false
options: options:

2
config/connexions.sample.yml
View File

@@ -2,7 +2,7 @@
#Please refer to Doctrine documentation abstraction layer for database connection configuration #Please refer to Doctrine documentation abstraction layer for database connection configuration
#DBAL connection : http://www.doctrine-project.org/docs/dbal/2.1/en/reference/configuration.html #DBAL connection : http://www.doctrine-project.org/docs/dbal/2.1/en/reference/configuration.html
#Define a connexion to MYSQL database named main_connexion #Defines a connexion to MYSQL database named main_connexion
main_connexion: main_connexion:
host: <HOSTNAME> host: <HOSTNAME>
port: <PORT> port: <PORT>

3
lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php
View File

@@ -53,7 +53,8 @@ class AuthenticationManagerServiceProvider implements ServiceProviderInterface
$providers = new ProvidersCollection(); $providers = new ProvidersCollection();
foreach ($app['phraseanet.configuration']->get('auth-providers') as $providerId => $data) { $authConf = $app['phraseanet.configuration']->get('authentication');
foreach ($authConf['providers'] as $providerId => $data) {
if (isset($data['enabled']) && false === $data['enabled']) { if (isset($data['enabled']) && false === $data['enabled']) {
continue; continue;
} }

9
lib/conf.d/config.yml
View File

@@ -31,7 +31,8 @@ dev:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
providers:
facebook: facebook:
enabled: false enabled: false
options: options:
@@ -91,7 +92,8 @@ prod:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
providers:
facebook: facebook:
enabled: false enabled: false
options: options:
@@ -151,7 +153,8 @@ test:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
providers:
facebook: facebook:
enabled: false enabled: false
options: options:

4
lib/conf.d/connexions.yml
View File

@@ -2,7 +2,7 @@
#Please refer to Doctrine documentation abstraction layer for database connection configuration #Please refer to Doctrine documentation abstraction layer for database connection configuration
#DBAL connection : http://www.doctrine-project.org/docs/dbal/2.1/en/reference/configuration.html #DBAL connection : http://www.doctrine-project.org/docs/dbal/2.1/en/reference/configuration.html
#Define a connexion to MYSQL database named main_connexion #Defines a connexion to MYSQL database named main_connexion
main_connexion: main_connexion:
host: <HOSTNAME> host: <HOSTNAME>
port: <PORT> port: <PORT>
@@ -12,7 +12,7 @@ main_connexion:
driver: pdo_mysql driver: pdo_mysql
charset: UTF8 charset: UTF8
#Define a connexion to a SQLite database named test_connexion #Defines a connexion to a SQLite database named test_connexion
test_connexion: test_connexion:
driver: pdo_sqlite driver: pdo_sqlite
path: '/tmp/db.sqlite' path: '/tmp/db.sqlite'