From eacd512e147e77d22384e32bcc14402ed5edb660 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sat, 9 Sep 2023 14:51:45 +0200
Subject: [PATCH] Sync extension versions with MW, and trim abra.sh

---
 abra.sh            | 38 --------------------------------------
 entrypoint.sh.tmpl | 14 +++++++-------
 2 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/abra.sh b/abra.sh
index 005bc8a..9b40ecc 100644
--- a/abra.sh
+++ b/abra.sh
@@ -5,41 +5,3 @@ export COMPOSER_LOCAL_CONF_VERSION=v5
 export PHP_INI_VERSION=v4
 
 export SAML_ENTRYPOINT_CONF_VERSION=v3
-
-abra_backup_app() {
-  _abra_backup_dir "app:/var/www/html/images"
-}
-
-abra_backup_db() {
-  _abra_backup_mysql "db" "mediawiki"
-}
-
-abra_backup() {
-  abra_backup_app && abra_backup_db
-}
-
-abra_restore_app() {
-  # shellcheck disable=SC2034
-  {
-	abra__src_="-"
-	abra__dst_="app:/var/www/html/"
-  }
-
-  zcat "$@" | sub_app_cp
-
-  success "Restored 'app'"
-}
-
-abra_restore_db() {
-  # 3wc: unlike abra_backup_db, we can assume abra__service_ will be 'db' if we
-  # got this far..
-
-  # shellcheck disable=SC2034
-  abra___no_tty="true"
-
-  DB_ROOT_PASSWORD="$(sub_app_run cat /run/secrets/db_root_password)"
-
-  zcat "$@" | sub_app_run mysql -u root -p"$DB_ROOT_PASSWORD" wordpress
-
-  success "Restored 'db'"
-}
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index ed4b1d1..187b9ea 100755
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -48,14 +48,14 @@ init_db() {
 init_extensions() {
 
 	if [ ! -d /var/www/html/extensions/PluggableAuth ]; then
-		git clone --depth 1 -b REL1_39 \
+		git clone --depth 1 -b REL1_40 \
 			https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PluggableAuth \
 			/var/www/html/extensions/PluggableAuth
 	fi
 
 	if [ -n "${SAML_ENABLED-}" ]; then
 		if [ ! -d /var/www/html/extensions/SimpleSAMLphp ]; then
-			git clone --depth 1 -b REL1_39 \
+			git clone --depth 1 -b REL1_40 \
 				https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SimpleSAMLphp \
 				/var/www/html/extensions/SimpleSAMLphp
 		fi
@@ -63,7 +63,7 @@ init_extensions() {
 
 	if [ -n "${OPENID_ENABLED-}" ]; then
 		if [ ! -d /var/www/html/extensions/OpenIDConnect ]; then
-			git clone --depth 1 -b REL1_39 \
+			git clone --depth 1 -b REL1_40 \
 				https://gerrit.wikimedia.org/r/mediawiki/extensions/OpenIDConnect \
 				/var/www/html/extensions/OpenIDConnect
 		fi
@@ -71,7 +71,7 @@ init_extensions() {
 
 	if [ -n "${MOBILEFRONTEND_ENABLED-}" ]; then
 		if [ ! -d /var/www/html/extensions/MobileFrontend ]; then
-			git clone --depth 1 -b REL1_39 \
+			git clone --depth 1 -b REL1_40 \
 				https://github.com/wikimedia/mediawiki-extensions-MobileFrontend.git \
 				/var/www/html/extensions/MobileFrontend
 		fi
@@ -79,7 +79,7 @@ init_extensions() {
 
 	if [ -n "${MSU_ENABLED-}" ]; then
 		if [ ! -d /var/www/html/extensions/MsUpload ]; then
-			git clone --depth 1 -b REL1_39 \
+			git clone --depth 1 -b REL1_40 \
 				https://gerrit.wikimedia.org/r/mediawiki/extensions/MsUpload \
 				/var/www/html/extensions/MsUpload
 		fi
@@ -87,7 +87,7 @@ init_extensions() {
 
 	if [ -n "${PAGEFORMS_ENABLED-}" ]; then
 		if [ ! -d /var/www/html/extensions/PageForms ]; then
-			git clone --depth 1 -b REL1_39 \
+			git clone --depth 1 -b REL1_40 \
 				https://gerrit.wikimedia.org/r/mediawiki/extensions/PageForms \
 				/var/www/html/extensions/PageForms
 		fi
@@ -95,7 +95,7 @@ init_extensions() {
 
 	if [ -n "${PAGESCHEMAS_ENABLED-}" ]; then
 		if [ ! -d /var/www/html/extensions/PageSchemas ]; then
-			git clone --depth 1 -b REL1_39 \
+			git clone --depth 1 -b REL1_40 \
 				https://gerrit.wikimedia.org/r/mediawiki/extensions/PageSchemas \
 				/var/www/html/extensions/PageSchemas
 		fi