From 1d3992beb8ff3325b7c7b50fe99653ed7bfce29b Mon Sep 17 00:00:00 2001 From: Danica Date: Fri, 18 Jul 2025 17:58:38 +0200 Subject: [PATCH 1/3] Update extensions and skins to their latest minor versions --- _resources/extensions/CategoryLockdown | 2 +- _resources/extensions/SemanticDependencyUpdater | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_resources/extensions/CategoryLockdown b/_resources/extensions/CategoryLockdown index f2caf39..e63430a 160000 --- a/_resources/extensions/CategoryLockdown +++ b/_resources/extensions/CategoryLockdown @@ -1 +1 @@ -Subproject commit f2caf39545f7038166af418af46454027947d96f +Subproject commit e63430afb1d017b3eaffc8c1600686e1fbfad25e diff --git a/_resources/extensions/SemanticDependencyUpdater b/_resources/extensions/SemanticDependencyUpdater index b2c4db8..f6f2bd5 160000 --- a/_resources/extensions/SemanticDependencyUpdater +++ b/_resources/extensions/SemanticDependencyUpdater @@ -1 +1 @@ -Subproject commit b2c4db817bfb31c2ad10d27aeebb955f938d7b4f +Subproject commit f6f2bd5e9df958790a56f831ae777bea124e4409 From 85eddd19314608b221da6296592643abcca723cf Mon Sep 17 00:00:00 2001 From: wikivisor Date: Sun, 20 Jul 2025 09:25:45 +0200 Subject: [PATCH 2/3] MBSD-279 Fixes environment variables --- .env.example | 4 +--- compose.yml | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index 759d01f..086fcba 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,6 @@ # Mandatory MYSQL_ROOT_PASSWORD= +MW_ADMIN_PASS= MATOMO_PASSWORD= # For production (optional for others) @@ -15,6 +16,3 @@ AWS_SECRET_ACCESS_KEY= BASIC_USERNAME=admin # Generate with `openssl passwd -apr1 MY_PASSWORD_RAW`, the password below is `admin` BASIC_PASSWORD='$apr1$Okb14nu5$bkgxEqp/ym0UFBFKCQTEH/' - -# Optional -MW_ADMIN_PASSWORD diff --git a/compose.yml b/compose.yml index 5fe5884..973e3fe 100644 --- a/compose.yml +++ b/compose.yml @@ -34,11 +34,12 @@ services: - MW_SITE_SERVER=https://bugsigdb.org - MW_DB_NAME=mediawiki - MW_DB_PASS=${MYSQL_ROOT_PASSWORD?Variable MYSQL_ROOT_PASSWORD not set} + - MW_DB_INSTALLDB_PASS=${MYSQL_ROOT_PASSWORD?Variable MYSQL_ROOT_PASSWORD not set} - MW_NCBI_TAXONOMY_API_KEY=${MW_NCBI_TAXONOMY_API_KEY:-} - MW_RECAPTCHA_SITE_KEY=${MW_RECAPTCHA_SITE_KEY:-} - MW_RECAPTCHA_SECRET_KEY=${MW_RECAPTCHA_SECRET_KEY:-} - MW_ADMIN_USER=admin - - MW_ADMIN_PASSWORD + - MW_ADMIN_PASS=${MW_ADMIN_PASS?Variable MW_ADMIN_PASS not set} - MW_SITE_NAME=BugSigDB - MW_SITE_LANG=en - MW_ENABLE_UPLOADS=1 From 449a5002c084dd90efb297aa57176eb83c827117 Mon Sep 17 00:00:00 2001 From: wikivisor Date: Sun, 20 Jul 2025 09:27:01 +0200 Subject: [PATCH 3/3] MBSD-279 Fixes submodule default branch --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6214ac0..7ffe600 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "_resources/extensions/SubpageWatchlist"] path = _resources/extensions/SubpageWatchlist url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SubpageWatchlist.git - branch = REL1_35 + branch = REL1_39 [submodule "_resources/extensions/SemanticScribunto"] path = _resources/extensions/SemanticScribunto url = https://github.com/SemanticMediaWiki/SemanticScribunto