From 8330e3a0f31b7c4fee9882b9e9acc85e1a7a5a88 Mon Sep 17 00:00:00 2001
From: John Hsu <john.hsu@ubc.ca>
Date: Fri, 2 Aug 2024 13:11:21 -0700
Subject: [PATCH] ADD env var for blocked user redirect

AUTO_BLOCKED_USER_REDIRECT tells us where to send blocked users after
they login.
---
 mediawiki/Chart.yaml             | 2 +-
 mediawiki/templates/_helpers.tpl | 8 ++++++--
 mediawiki/values.yaml            | 5 ++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/mediawiki/Chart.yaml b/mediawiki/Chart.yaml
index 0f0a831..dd9ce84 100644
--- a/mediawiki/Chart.yaml
+++ b/mediawiki/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: mediawiki
-version: 0.7.0
+version: 0.7.1
 appVersion: 1.39.8
 description: Extremely powerful, scalable software and a feature-rich wiki implementation
   that uses PHP to process and display data stored in a database.
diff --git a/mediawiki/templates/_helpers.tpl b/mediawiki/templates/_helpers.tpl
index 3220e88..3f97240 100644
--- a/mediawiki/templates/_helpers.tpl
+++ b/mediawiki/templates/_helpers.tpl
@@ -247,9 +247,13 @@ env:
 - name: PARSOID_SKIP_DOAMIN_CHECK
   value: {{ .Values.parsoid.skipDomainCheck | quote }}
 {{- end }}
-{{- if .Values.ldap.autoCreatedUserRedirect }}
+{{- if .Values.mediawikiUserRedirect.created }}
 - name: AUTO_CREATED_USER_REDIRECT
-  value: {{ .Values.ldap.autoCreatedUserRedirect }}
+  value: {{ .Values.mediawikiUserRedirect.created }}
+{{- end }}
+{{- if .Values.mediawikiUserRedirect.blocked }}
+- name: AUTO_BLOCKED_USER_REDIRECT
+  value: {{ .Values.mediawikiUserRedirect.blocked }}
 {{- end }}
 {{- end }}
 - name: MEDIAWIKI_MAIN_CACHE
diff --git a/mediawiki/values.yaml b/mediawiki/values.yaml
index 0ff6664..b9a53ad 100644
--- a/mediawiki/values.yaml
+++ b/mediawiki/values.yaml
@@ -75,6 +75,10 @@ mediawikiUploadPath: //example.com/images
 # Enable bot password
 mediawikiEnableBotPasswords: true
 
+mediawikiUserRedirect:
+  created: Main_Page
+  blocked: Main_Page
+
 googleAnalytics:
   # Google Analytics Tracking Token
   id: G-XXXXXXXX-XX
@@ -242,7 +246,6 @@ ldap:
   realnameAttr: displayname
   emailAttr: mail
   ubcAuthEnabled: false
-  autoCreatedUserRedirect: Main_Page
 
 parsoid:
   skipDomainCheck: true