diff --git a/sources/patches/app-00-ldap-auth.patch b/sources/patches/app-00-ldap-auth.patch index f458191..5742009 100644 --- a/sources/patches/app-00-ldap-auth.patch +++ b/sources/patches/app-00-ldap-auth.patch @@ -1,17 +1,20 @@ --- a/app/config/services.yml 2016-05-25 18:09:56.374914445 +0200 +++ b/app/config/services.yml 2016-05-25 18:07:38.775042951 +0200 -@@ -36,3 +36,7 @@ - arguments: ["@session"] +@@ -43,6 +43,10 @@ tags: - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } -+ + + yunohost.ldap: + class: Symfony\Component\Ldap\LdapClient + arguments: ["localhost"] ++ + craue_config_cache_provider: + class: Symfony\Component\Cache\Adapter\FilesystemAdapter + public: false --- a/app/config/security.yml 2016-05-25 18:09:46.814645164 +0200 +++ b/app/config/security.yml 2016-05-25 18:07:38.775042951 +0200 -@@ -11,6 +11,14 @@ - entity: { class: WallabagUserBundle:User, property: username } +@@ -13,6 +13,14 @@ + property: username fos_userbundle: id: fos_user.user_provider.username + yunohost_users: @@ -22,11 +25,11 @@ + search_password: + filter: (&(uid={username})(objectClass=posixAccount)) + default_roles: ROLE_USER - + # the main part of the security, where you can set up firewalls # for specific sections of your app -@@ -36,6 +44,9 @@ - +@@ -38,6 +46,9 @@ + secured_area: pattern: ^/ + http_basic_ldap: diff --git a/sources/patches/app-01-logout-success-handler.patch b/sources/patches/app-01-logout-success-handler.patch index a3e75fc..0074cad 100644 --- a/sources/patches/app-01-logout-success-handler.patch +++ b/sources/patches/app-01-logout-success-handler.patch @@ -15,12 +15,13 @@ diff --git a/app/config/services.yml b/app/config/services.yml index 8a09fde..ee63e06 100644 --- a/app/config/services.yml +++ b/app/config/services.yml -@@ -37,6 +37,9 @@ services: +@@ -43,6 +43,9 @@ tags: - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - + + yunohost.logout_success_handler: + class: Wallabag\YunoHostBundle\Security\LogoutSuccessHandler ++ + yunohost.ldap: class: Symfony\Component\Ldap\LdapClient