mirror of
https://github.com/YunoHost-Apps/wallabag2_ynh.git
synced 2024-10-01 13:35:06 +02:00
* Keep optional configuration lines in nginx.conf to allow changing URL from/to "/path" locations Rename comment prefixes fore more readability * Add change_url script * Require YNH 2.7.2, remove helpers and sudo prefixes * Use ynh_replace_string * Handle nginx conf file checksums * Fix indentation * Update source to 2.3 * Update version to 2.3 * Update readme version to 2.3 * Fix 20-app.ini in restore * Replace app checkurl by webpath_available * Adapt existing patches to 2.3 * Remove need to manage parameters.yml file; adapt to version 2.3 * Fix php5-redis dependency (redis-server is installed by YunoHost) * Manage new domain_name parameter in change_url * Upgrade to upstream version 2.3.1 * Upgrade to upstream version 2.3.2 * Remove obsolete calls to checkurl * Fix check_process for upgrade from previous commit * Fix Version number
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
--- 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
|
|
@@ -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
|
|
@@ -13,6 +13,14 @@
|
|
property: username
|
|
fos_userbundle:
|
|
id: fos_user.user_provider.username
|
|
+ yunohost_users:
|
|
+ ldap:
|
|
+ service: yunohost.ldap
|
|
+ base_dn: ou=users,dc=yunohost,dc=org
|
|
+ search_dn:
|
|
+ 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
|
|
@@ -38,6 +46,9 @@
|
|
|
|
secured_area:
|
|
pattern: ^/
|
|
+ http_basic_ldap:
|
|
+ service: yunohost.ldap
|
|
+ dn_string: "uid={username},ou=users,dc=yunohost,dc=org"
|
|
form_login:
|
|
provider: fos_userbundle
|
|
csrf_token_generator: security.csrf.token_manager
|