From e15f760f3670ebe74e7e58cb1dab78b6786b71ed Mon Sep 17 00:00:00 2001 From: memdmp Date: Fri, 22 Aug 2025 21:19:53 +0200 Subject: fix: remove test file, move pw to .env before anyone panically calls me, this is literally the example password used in .env.example (previously compose.yml) that was in the LocalSettings-old.php --- .env.example | 3 + .gitignore | 1 + compose.yml | 8 +- mediawiki/LocalSettings-old.php | 183 ---------------------------------------- 4 files changed, 7 insertions(+), 188 deletions(-) create mode 100644 .env.example delete mode 100644 mediawiki/LocalSettings-old.php diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..aefba35 --- /dev/null +++ b/.env.example @@ -0,0 +1,3 @@ +POSTGRES_USER=wikiuser +POSTGRES_PASSWORD=e27f67b73a1a59c25415506abf2b961c94b9c2c101b5ab1dc00ccb4090ed00e2 +POSTGRES_DB=my_wiki diff --git a/.gitignore b/.gitignore index 85adb6c..64518e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /mediawiki/LocalSettings.php /mediawiki/pg /mediawiki/user-uploads +.env diff --git a/compose.yml b/compose.yml index 50b3543..6599c69 100644 --- a/compose.yml +++ b/compose.yml @@ -24,10 +24,8 @@ services: image: postgres networks: - mediawiki - environment: - - POSTGRES_USER=wikiuser - - POSTGRES_PASSWORD=e27f67b73a1a59c25415506abf2b961c94b9c2c101b5ab1dc00ccb4090ed00e2 - - POSTGRES_DB=my_wiki + env_file: + - .env volumes: - ./mediawiki/pg:/var/lib/postgresql/data:rw # mariadb: @@ -42,4 +40,4 @@ services: # - MARIADB_ROOT_PASSWORD=example networks: - mediawiki: \ No newline at end of file + mediawiki: diff --git a/mediawiki/LocalSettings-old.php b/mediawiki/LocalSettings-old.php deleted file mode 100644 index 6848fe2..0000000 --- a/mediawiki/LocalSettings-old.php +++ /dev/null @@ -1,183 +0,0 @@ - "$wgResourceBasePath/resources/assets/change-your-logo.svg", - 'icon' => "$wgResourceBasePath/resources/assets/change-your-logo.svg", -]; - -## UPO means: this is also a user preference option - -$wgEnableEmail = true; -$wgEnableUserEmail = true; # UPO - -$wgEmergencyContact = ""; -$wgPasswordSender = ""; - -$wgEnotifUserTalk = false; # UPO -$wgEnotifWatchlist = false; # UPO -$wgEmailAuthentication = true; - -## Database settings -$wgDBtype = "postgres"; -$wgDBserver = "postgres"; -$wgDBname = "my_wiki"; -$wgDBuser = "wikiuser"; -$wgDBpassword = "e27f67b73a1a59c25415506abf2b961c94b9c2c101b5ab1dc00ccb4090ed00e2"; - -# Postgres specific settings -$wgDBport = "5432"; -$wgDBssl = false; -$wgDBmwschema = "mediawiki"; - -# Shared database table -# This has no effect unless $wgSharedDB is also set. -$wgSharedTables[] = "actor"; - -## Shared memory settings -$wgMainCacheType = CACHE_ACCEL; -$wgMemCachedServers = []; - -## To enable image uploads, make sure the 'images' directory -## is writable, then set this to true: -$wgEnableUploads = true; -$wgUseImageMagick = true; -$wgImageMagickConvertCommand = "/usr/bin/convert"; - -# InstantCommons allows wiki to use images from https://commons.wikimedia.org -$wgUseInstantCommons = true; - -# Periodically send a pingback to https://www.mediawiki.org/ with basic data -# about this MediaWiki instance. The Wikimedia Foundation shares this data -# with MediaWiki developers to help guide future development efforts. -$wgPingback = true; - -# Site language code, should be one of the list in ./includes/languages/data/Names.php -$wgLanguageCode = "en"; - -# Time zone -$wgLocaltimezone = "UTC"; - -## Set $wgCacheDirectory to a writable directory on the web server -## to make your wiki go slightly faster. The directory should not -## be publicly accessible from the web. -#$wgCacheDirectory = "$IP/cache"; - -$wgSecretKey = "585e270a7759a8c9dc989351268f8bc3011995be327bb367e41d116fd1a7473a"; - -# Changing this will log out all existing sessions. -$wgAuthenticationTokenVersion = "1"; - -# Site upgrade key. Must be set to a string (default provided) to turn on the -# web installer while LocalSettings.php is in place -$wgUpgradeKey = "d5fa04390d4df708"; - -## For attaching licensing metadata to pages, and displaying an -## appropriate copyright notice / icon. GNU Free Documentation -## License and Creative Commons licenses are supported so far. -$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright -$wgRightsUrl = ""; -$wgRightsText = ""; -$wgRightsIcon = ""; - -# Path to the GNU diff3 utility. Used for conflict resolution. -$wgDiff3 = ""; - -# The following permissions were set based on your choice in the installer -$wgGroupPermissions["*"]["createaccount"] = false; -$wgGroupPermissions["*"]["edit"] = false; - -## Default skin: you can change the default skin. Use the internal symbolic -## names, e.g. 'vector' or 'monobook': -$wgDefaultSkin = "vector-2022"; - -# Enabled skins. -# The following skins were automatically enabled: -wfLoadSkin( 'MinervaNeue' ); -wfLoadSkin( 'MonoBook' ); -wfLoadSkin( 'Timeless' ); -wfLoadSkin( 'Vector' ); - - -# Enabled extensions. Most of the extensions are enabled by adding -# wfLoadExtension( 'ExtensionName' ); -# to LocalSettings.php. Check specific extension documentation for more details. -# The following extensions were automatically enabled: -wfLoadExtension( 'AbuseFilter' ); -wfLoadExtension( 'CategoryTree' ); -wfLoadExtension( 'CheckUser' ); -wfLoadExtension( 'Cite' ); -wfLoadExtension( 'CiteThisPage' ); -wfLoadExtension( 'CodeEditor' ); -wfLoadExtension( 'ConfirmEdit' ); -wfLoadExtension( 'DiscussionTools' ); -wfLoadExtension( 'Echo' ); -wfLoadExtension( 'Gadgets' ); -wfLoadExtension( 'ImageMap' ); -wfLoadExtension( 'InputBox' ); -wfLoadExtension( 'Interwiki' ); -wfLoadExtension( 'Linter' ); -wfLoadExtension( 'LoginNotify' ); -wfLoadExtension( 'Math' ); -wfLoadExtension( 'MultimediaViewer' ); -wfLoadExtension( 'Nuke' ); -wfLoadExtension( 'OATHAuth' ); -wfLoadExtension( 'PageImages' ); -wfLoadExtension( 'ParserFunctions' ); -wfLoadExtension( 'Poem' ); -wfLoadExtension( 'ReplaceText' ); -wfLoadExtension( 'Scribunto' ); -wfLoadExtension( 'SecureLinkFixer' ); -wfLoadExtension( 'SpamBlacklist' ); -wfLoadExtension( 'SyntaxHighlight_GeSHi' ); -wfLoadExtension( 'TemplateData' ); -wfLoadExtension( 'TemplateStyles' ); -wfLoadExtension( 'TextExtracts' ); -wfLoadExtension( 'Thanks' ); -wfLoadExtension( 'TitleBlacklist' ); -wfLoadExtension( 'VisualEditor' ); -wfLoadExtension( 'WikiEditor' ); - - -# End of automatically generated settings. -# Add more configuration options below. - -wfLoadSkin('Citizen'); -- cgit v1.2.3