From 22c24235ce5fe5372d73a86c6b2edb301783e491 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 11 Sep 2020 14:26:42 +0200 Subject: [PATCH 1/2] libcurl4-openssl-dev -> libcurl4-dev We're trying to fix some weird cross-apps conflicts because of stupid dependency conflicts ... in particular various app require different versions of libcurl4-*-dev conflicting with each other, but it should be fine to just request libcurl4-dev --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b1c3267..f474c78 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -pkg_dependencies="g++ libjemalloc1|libjemalloc2 libjemalloc-dev zlib1g-dev libreadline-dev libpq-dev libssl-dev libyaml-dev libcurl4-openssl-dev libapr1-dev libxslt1-dev libxml2-dev vim imagemagick postgresql postgresql-server-dev-all postgresql-contrib optipng jhead jpegoptim gifsicle brotli" +pkg_dependencies="g++ libjemalloc1|libjemalloc2 libjemalloc-dev zlib1g-dev libreadline-dev libpq-dev libssl-dev libyaml-dev libcurl4-dev libapr1-dev libxslt1-dev libxml2-dev vim imagemagick postgresql postgresql-server-dev-all postgresql-contrib optipng jhead jpegoptim gifsicle brotli" RUBY_VERSION="2.6.5" From 70c8053cd7400774e2bcc3f59f8630bfbbf4b3cd Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Mon, 23 Nov 2020 10:54:52 +0100 Subject: [PATCH 2/2] [fix] no SSO --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9be4c9e..addd414 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ Discourse can now receive mail from `foo@theirexternalmail.com` and give it to t #### Multi-user support -Supported, with LDAP and SSO. +Supported, with LDAP (no SSO). ![Login Popup](https://raw.githubusercontent.com/jonmbake/screenshots/master/discourse-ldap-auth/login.png)