Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Mandatory
MYSQL_ROOT_PASSWORD=
MW_ADMIN_PASS=
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MW_ADMIN_PASS is only mandatory for fresh installs, but is optional for existing database. Let's keep it in the Optional section with that note

MATOMO_PASSWORD=

# For production (optional for others)
Expand All @@ -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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

@vedmaka vedmaka Jul 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should remove the branch completely, as the only scenario where this takes effect is when the --remote flag is supplied to the git submodule update command. The default behavior for submodules is to checkout the commit that's fixed by the parent repo, and that's how we use submodules, thus the branch property is ignored https://git-scm.com/docs/gitmodules#Documentation/gitmodules.txt-submodulenamebranch

[submodule "_resources/extensions/SemanticScribunto"]
path = _resources/extensions/SemanticScribunto
url = https://github.com/SemanticMediaWiki/SemanticScribunto
Expand Down
3 changes: 2 additions & 1 deletion compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down