From b2b19d8810dd335809cf1cc0e74fb03328060630 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Thu, 23 May 2019 12:57:23 +0200 Subject: [PATCH 1/5] Update user_external example for nextcloud --- docs/faq.rst | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/docs/faq.rst b/docs/faq.rst index 8d6b283f..6a8a9953 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -257,12 +257,31 @@ First of all you have to install dependencies required to authenticate users via Next, you have to enable External user support from Nextcloud Apps interface -In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax: +In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax if you use at least Nextcloud 15. .. code-block:: bash array( + array( + 'class' => 'OC_User_IMAP', + 'arguments' => array( + '127.0.0.1', 993, 'ssl', 'example.com' + ), + ), + ), + + +For Nextcloud 14 and below use the following syntax: + + +.. code-block:: bash + + array( array( 'class' => 'OC_User_IMAP', From 04a66187b52f4ee87acf517369749c104ff457e2 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sat, 15 Jun 2019 16:15:49 +0200 Subject: [PATCH 2/5] Add information about stripDomain --- docs/faq.rst | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index 6a8a9953..03c7eb87 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -242,7 +242,34 @@ correct syntax. The following file names will be taken as override configuration *Issue reference:* `206`_. -I want to integrate Nextcloud with Mailu +I want to integrate Nextcloud 15 (and newer) with Mailu +```````````````````````````````````````` + +First of all you have to enable External user support from Nextcloud Apps interface + +In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax if you use at least Nextcloud 15. + +.. code-block:: bash + + array( + array( + 'class' => 'OC_User_IMAP', + 'arguments' => array( + '127.0.0.1', 993, 'ssl', 'example.com', true, false + ), + ), + ), + + +If a domain name (e.g. example.com) is specified, then this makes sure that only users from this domain will be allowed to login. +After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud. You can disable this behaviour by changing true (the fifth parameter) to false. + +*Issue reference:* `575`_. + +I want to integrate Nextcloud 14 (and older) with Mailu ```````````````````````````````````````` First of all you have to install dependencies required to authenticate users via imap in Nextcloud @@ -257,25 +284,7 @@ First of all you have to install dependencies required to authenticate users via Next, you have to enable External user support from Nextcloud Apps interface -In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax if you use at least Nextcloud 15. - -.. code-block:: bash - - array( - array( - 'class' => 'OC_User_IMAP', - 'arguments' => array( - '127.0.0.1', 993, 'ssl', 'example.com' - ), - ), - ), - - -For Nextcloud 14 and below use the following syntax: - +In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax for Nextcloud 14 (and below): .. code-block:: bash From 8088f2bd6d409b92ea966a027f9c3498b00809e9 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sat, 15 Jun 2019 16:20:05 +0200 Subject: [PATCH 3/5] Improve readability --- docs/faq.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index 03c7eb87..f0ed578f 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -245,9 +245,9 @@ correct syntax. The following file names will be taken as override configuration I want to integrate Nextcloud 15 (and newer) with Mailu ```````````````````````````````````````` -First of all you have to enable External user support from Nextcloud Apps interface +1. Enable External user support from Nextcloud Apps interface -In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax if you use at least Nextcloud 15. +2. Configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax if you use at least Nextcloud 15. .. code-block:: bash @@ -272,7 +272,7 @@ After successfull login the domain part will be striped and the rest used as use I want to integrate Nextcloud 14 (and older) with Mailu ```````````````````````````````````````` -First of all you have to install dependencies required to authenticate users via imap in Nextcloud +1. Install dependencies required to authenticate users via imap in Nextcloud .. code-block:: bash @@ -282,9 +282,9 @@ First of all you have to install dependencies required to authenticate users via && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install imap -Next, you have to enable External user support from Nextcloud Apps interface +2. Enable External user support from Nextcloud Apps interface -In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax for Nextcloud 14 (and below): +3. Configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax for Nextcloud 14 (and below): .. code-block:: bash From 6cad9f4839ba9d08e522b991fd914e0bb2a668da Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sat, 15 Jun 2019 16:21:04 +0200 Subject: [PATCH 4/5] Improve wording --- docs/faq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.rst b/docs/faq.rst index f0ed578f..d78223f5 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -265,7 +265,7 @@ I want to integrate Nextcloud 15 (and newer) with Mailu If a domain name (e.g. example.com) is specified, then this makes sure that only users from this domain will be allowed to login. -After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud. You can disable this behaviour by changing true (the fifth parameter) to false. +After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud. Disable this behaviour by changing true (the fifth parameter) to false. *Issue reference:* `575`_. From 591f00a71131f3687a2ed3592e3ea06c9d690aa6 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Mon, 17 Jun 2019 19:04:18 +0200 Subject: [PATCH 5/5] Change NextCloud to Nextcloud --- docs/faq.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index d78223f5..9292d57a 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -265,7 +265,7 @@ I want to integrate Nextcloud 15 (and newer) with Mailu If a domain name (e.g. example.com) is specified, then this makes sure that only users from this domain will be allowed to login. -After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud. Disable this behaviour by changing true (the fifth parameter) to false. +After successfull login the domain part will be striped and the rest used as username in Nextcloud. e.g. 'username@example.com' will be 'username' in Nextcloud. Disable this behaviour by changing true (the fifth parameter) to false. *Issue reference:* `575`_. @@ -301,7 +301,7 @@ I want to integrate Nextcloud 14 (and older) with Mailu ), If a domain name (e.g. example.com) is specified, then this makes sure that only users from this domain will be allowed to login. -After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud. +After successfull login the domain part will be striped and the rest used as username in Nextcloud. e.g. 'username@example.com' will be 'username' in Nextcloud. *Issue reference:* `575`_.