1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/wallabag2_ynh.git synced 2024-10-01 13:35:06 +02:00

Update custom patches

This commit is contained in:
Jimmy Monin 2019-05-05 10:40:56 +02:00
parent aa5c04ccf7
commit 3e03081c19
2 changed files with 109 additions and 101 deletions

View file

@ -1,22 +1,11 @@
--- a/app/config/services.yml 2016-05-25 18:09:56.374914445 +0200 diff --git a/app/config/security.yml b/app/config/security.yml
+++ b/app/config/services.yml 2016-05-25 18:07:38.775042951 +0200 index 02afc9ea..5a3f7a34 100644
@@ -43,6 +43,10 @@ --- a/app/config/security.yml
tags: +++ b/app/config/security.yml
- { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } @@ -13,6 +13,14 @@ security:
+ 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
@@ -13,6 +13,14 @@
property: username property: username
fos_userbundle: fos_userbundle:
id: fos_user.user_provider.username id: fos_user.user_provider.username_email
+ yunohost_users: + yunohost_users:
+ ldap: + ldap:
+ service: yunohost.ldap + service: yunohost.ldap
@ -28,7 +17,7 @@
# the main part of the security, where you can set up firewalls # the main part of the security, where you can set up firewalls
# for specific sections of your app # for specific sections of your app
@@ -38,6 +46,9 @@ @@ -38,6 +46,9 @@ security:
secured_area: secured_area:
pattern: ^/ pattern: ^/
@ -38,3 +27,20 @@
form_login: form_login:
provider: fos_userbundle provider: fos_userbundle
csrf_token_generator: security.csrf.token_manager csrf_token_generator: security.csrf.token_manager
diff --git a/app/config/services.yml b/app/config/services.yml
index 7b85d846..f23961c5 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -43,6 +43,10 @@ services:
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
--
2.17.1

View file

@ -1,8 +1,8 @@
diff --git a/app/config/security.yml b/app/config/security.yml diff --git a/app/config/security.yml b/app/config/security.yml
index b07b509..62f2550 100644 index 5a3f7a34..1720e741 100644
--- a/app/config/security.yml --- a/app/config/security.yml
+++ b/app/config/security.yml +++ b/app/config/security.yml
@@ -60,7 +60,7 @@ security: @@ -62,7 +62,7 @@ security:
logout: logout:
path: /logout path: /logout
@ -12,10 +12,10 @@ index b07b509..62f2550 100644
access_control: access_control:
- { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
diff --git a/app/config/services.yml b/app/config/services.yml diff --git a/app/config/services.yml b/app/config/services.yml
index 8a09fde..ee63e06 100644 index f23961c5..f266e6d1 100644
--- a/app/config/services.yml --- a/app/config/services.yml
+++ b/app/config/services.yml +++ b/app/config/services.yml
@@ -43,6 +43,10 @@ @@ -43,6 +43,10 @@ services:
tags: tags:
- { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
@ -28,7 +28,7 @@ index 8a09fde..ee63e06 100644
arguments: ["localhost"] arguments: ["localhost"]
diff --git a/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php diff --git a/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php
new file mode 100644 new file mode 100644
index 0000000..b326824 index 00000000..b3268243
--- /dev/null --- /dev/null
+++ b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php +++ b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -59,3 +59,5 @@ index 0000000..b326824
+ return new RedirectResponse($url); + return new RedirectResponse($url);
+ } + }
+} +}
--
2.17.1