diff --git a/data/etc/apache2/conf-available/ikiwiki-plinth.conf b/data/etc/apache2/conf-available/ikiwiki-plinth.conf index 70150dc0f..220048f47 100644 --- a/data/etc/apache2/conf-available/ikiwiki-plinth.conf +++ b/data/etc/apache2/conf-available/ikiwiki-plinth.conf @@ -9,12 +9,7 @@ AddHandler cgi-script .cgi Options +ExecCGI - AuthType basic - AuthName "FreedomBox Login" - AuthBasicProvider ldap - AuthLDAPUrl "ldap:///ou=users,dc=thisbox?uid" - AuthLDAPGroupAttribute memberUid - AuthLDAPGroupAttributeIsDN off + Include includes/freedombox-auth-ldap.conf Require ldap-group cn=admin,ou=groups,dc=thisbox Require ldap-group cn=wiki,ou=groups,dc=thisbox diff --git a/data/etc/apache2/conf-available/radicale-plinth.conf b/data/etc/apache2/conf-available/radicale-plinth.conf index efa76c8de..ed6ba9f59 100644 --- a/data/etc/apache2/conf-available/radicale-plinth.conf +++ b/data/etc/apache2/conf-available/radicale-plinth.conf @@ -8,11 +8,6 @@ Redirect 301 /.well-known/caldav /radicale/.well-known/caldav ProxyPass http://localhost:5232 - AuthType basic - AuthName "FreedomBox Login" - AuthBasicProvider ldap - AuthLDAPUrl "ldap:///ou=users,dc=thisbox?uid" - AuthLDAPGroupAttribute memberUid - AuthLDAPGroupAttributeIsDN off + Include includes/freedombox-auth-ldap.conf Require valid-user diff --git a/data/etc/apache2/conf-available/repro-plinth.conf b/data/etc/apache2/conf-available/repro-plinth.conf index 6b8bc2e82..e1fa83b94 100644 --- a/data/etc/apache2/conf-available/repro-plinth.conf +++ b/data/etc/apache2/conf-available/repro-plinth.conf @@ -5,11 +5,6 @@ ProxyPass http://localhost:5080 - AuthType basic - AuthName "FreedomBox Login" - AuthBasicProvider ldap - AuthLDAPUrl "ldap:///ou=users,dc=thisbox?uid" - AuthLDAPGroupAttribute memberUid - AuthLDAPGroupAttributeIsDN off + Include includes/freedombox-auth-ldap.conf Require ldap-group cn=admin,ou=groups,dc=thisbox diff --git a/data/etc/apache2/conf-available/tt-rss-plinth.conf b/data/etc/apache2/conf-available/tt-rss-plinth.conf index 41e55d71d..685849830 100644 --- a/data/etc/apache2/conf-available/tt-rss-plinth.conf +++ b/data/etc/apache2/conf-available/tt-rss-plinth.conf @@ -5,11 +5,6 @@ Alias /tt-rss /usr/share/tt-rss/www - AuthType basic - AuthName "FreedomBox Login" - AuthBasicProvider ldap - AuthLDAPUrl "ldap:///ou=users,dc=thisbox?uid" - AuthLDAPGroupAttribute memberUid - AuthLDAPGroupAttributeIsDN off + Include includes/freedombox-auth-ldap.conf Require valid-user