[bbb-greenlight] Add Dockerfile
- From: Bartłomiej Piotrowski <bpiotrowski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [bbb-greenlight] Add Dockerfile
- Date: Mon, 14 Jun 2021 13:34:00 +0000 (UTC)
commit 9a6ec9aeb882ea4c025b02de7e8edcb8cbea8873
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date: Mon Jun 14 15:31:24 2021 +0200
Add Dockerfile
Dockerfile | 5 +++++
ldap.patch | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
---
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c03f0da
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,5 @@
+FROM bigbluebutton/greenlight:v2
+RUN apk add -U patch && \
+ curl
https://gitlab.gnome.org/Infrastructure/bbb-greenlight/-/commit/513056419db72ca6083a8c44e73eb6a7d2a05025.patch
ldap.patch && \
+ patch -p1 -i ldap.patch && \
+ rm -f ldap.patch
diff --git a/ldap.patch b/ldap.patch
new file mode 100644
index 0000000..2e6dc5c
--- /dev/null
+++ b/ldap.patch
@@ -0,0 +1,35 @@
+From 513056419db72ca6083a8c44e73eb6a7d2a05025 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b bpiotrowski pl>
+Date: Mon, 3 Aug 2020 12:17:55 +0200
+Subject: [PATCH] Remove flawed logic for enabling LDAP
+
+We want to keep both LDAP and local accounts enabled. Enabling only
+LDAP causes the other to be disabled.
+---
+ app/controllers/sessions_controller.rb | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
+index eaa5e5e..2974c4e 100644
+--- a/app/controllers/sessions_controller.rb
++++ b/app/controllers/sessions_controller.rb
+@@ -31,16 +31,6 @@ class SessionsController < ApplicationController
+ check_if_twitter_account
+
+ @providers = configured_providers
+-
+- if one_provider
+- provider_path = if Rails.configuration.omniauth_ldap
+- ldap_signin_path
+- else
+- "#{Rails.configuration.relative_url_root}/auth/#{@providers.first}"
+- end
+-
+- redirect_to provider_path
+- end
+ end
+
+ # GET /ldap_signin
+--
+GitLab
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]