[00:17:03] RECOVERY - gielinorgames.wiki - LetsEncrypt on sslhost is OK: OK - Certificate 'gielinorgames.wiki' will expire on Sun 09 Mar 2025 10:35:49 PM GMT +0000. [01:16:04] [02RequestSSL] 07dependabot[bot] created 03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 (+1 new commit) 13https://github.com/miraheze/RequestSSL/commit/ed839436ccdf [01:16:04] 02RequestSSL/03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 07dependabot[bot] 03ed83943 Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0… [01:16:06] [02RequestSSL] 07dependabot[bot] opened pull request #61: Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0 (03master...03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0) 13https://github.com/miraheze/RequestSSL/pull/61 [01:16:06] [02RequestSSL] 07dependabot[bot] added the label 'dependencies' to pull request #61 (Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0) 13https://github.com/miraheze/RequestSSL/pull/61 [01:16:08] [02RequestSSL] 07dependabot[bot] added the label 'php' to pull request #61 (Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0) 13https://github.com/miraheze/RequestSSL/pull/61 [01:16:13] [02RequestSSL] 07coderabbitai[bot] commented on pull request #61: --- […] 13https://github.com/miraheze/RequestSSL/pull/61#issuecomment-2529963126 [01:22:54] [02ManageWiki] 07paladox merged pull request #519: ManageWikiInstaller: Add some logging for if sql fails to apply (03master...03paladox-patch-5) 13https://github.com/miraheze/ManageWiki/pull/519 [01:22:54] [02ManageWiki] 07paladox pushed 1 new commit to 03master 13https://github.com/miraheze/ManageWiki/commit/cff4f3cfc8cf0347e9a5c9d408509df067d82f3a [01:22:55] 02ManageWiki/03master 07paladox 03cff4f3c ManageWikiInstaller: Add some logging for if sql fails to apply (#519)… [01:22:56] [02ManageWiki] 07paladox 04deleted 03paladox-patch-5 at 031925291 13https://github.com/miraheze/ManageWiki/commit/1925291 [01:26:23] miraheze/RequestSSL - dependabot[bot] the build passed. [01:27:50] miraheze/ManageWiki - paladox the build passed. [01:29:03] [02TSPortal] 07dependabot[bot] created 03dependabot/composer/league/commonmark-2.6.0 (+1 new commit) 13https://github.com/miraheze/TSPortal/commit/318fca6d1692 [01:29:04] 02TSPortal/03dependabot/composer/league/commonmark-2.6.0 07dependabot[bot] 03318fca6 Bump league/commonmark from 2.5.3 to 2.6.0… [01:29:05] [02TSPortal] 07dependabot[bot] added the label 'dependencies' to pull request #25 (Bump league/commonmark from 2.5.3 to 2.6.0) 13https://github.com/miraheze/TSPortal/pull/25 [01:29:06] [02TSPortal] 07dependabot[bot] opened pull request #25: Bump league/commonmark from 2.5.3 to 2.6.0 (03master...03dependabot/composer/league/commonmark-2.6.0) 13https://github.com/miraheze/TSPortal/pull/25 [01:29:12] [02TSPortal] 07coderabbitai[bot] commented on pull request #25: --- […] 13https://github.com/miraheze/TSPortal/pull/25#issuecomment-2529988149 [04:57:21] [02MachineTranslation] 07dependabot[bot] created 03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 (+1 new commit) 13https://github.com/miraheze/MachineTranslation/commit/09d8066fa1ba [04:57:21] 02MachineTranslation/03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 07dependabot[bot] 0309d8066 Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0… [04:57:22] [02MachineTranslation] 07dependabot[bot] opened pull request #12: Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0 (03master...03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0) 13https://github.com/miraheze/MachineTranslation/pull/12 [04:57:24] [02MachineTranslation] 07dependabot[bot] added the label 'dependencies' to pull request #12 (Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0) 13https://github.com/miraheze/MachineTranslation/pull/12 [04:57:30] [02MachineTranslation] 07coderabbitai[bot] commented on pull request #12: --- […] 13https://github.com/miraheze/MachineTranslation/pull/12#issuecomment-2530392886 [05:02:16] miraheze/MachineTranslation - dependabot[bot] the build passed. [05:50:28] [02RemovePII] 07dependabot[bot] created 03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 (+1 new commit) 13https://github.com/miraheze/RemovePII/commit/2cf2e0cd8eca [05:50:28] 02RemovePII/03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 07dependabot[bot] 032cf2e0c Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0… [05:50:29] [02RemovePII] 07dependabot[bot] added the label 'php' to pull request #101 (Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0) 13https://github.com/miraheze/RemovePII/pull/101 [05:50:31] [02RemovePII] 07dependabot[bot] added the label 'dependencies' to pull request #101 (Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0) 13https://github.com/miraheze/RemovePII/pull/101 [05:50:33] [02RemovePII] 07dependabot[bot] opened pull request #101: Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0 (03master...03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0) 13https://github.com/miraheze/RemovePII/pull/101 [05:50:35] [02RemovePII] 07coderabbitai[bot] commented on pull request #101: --- […] 13https://github.com/miraheze/RemovePII/pull/101#issuecomment-2530492780 [05:55:16] miraheze/RemovePII - dependabot[bot] the build passed. [08:22:05] [02mw-config] 07Reception123 pushed 1 new commit to 03master 13https://github.com/miraheze/mw-config/commit/e29aba727c0951befc1759d47a320f6fa30a4ab1 [08:22:07] 02mw-config/03master 07Reception123 03e29aba7 testwiki in readonly [08:22:20] !log [reception@mwtask181] starting deploy of {'pull': 'config', 'config': True} to all [08:22:25] Logged the message at https://meta.miraheze.org/wiki/Tech:Server_admin_log [08:22:45] !log [reception@mwtask181] finished deploy of {'pull': 'config', 'config': True} to all - SUCCESS in 24s [08:22:49] Logged the message at https://meta.miraheze.org/wiki/Tech:Server_admin_log [08:25:56] [02mw-config] 07Reception123 pushed 1 new commit to 03master 13https://github.com/miraheze/mw-config/commit/1d4078dd1321236d5e651b6774a0939fba109122 [08:25:56] 02mw-config/03master 07Reception123 031d4078d rm readonly from testwiki [08:26:40] !log [reception@mwtask181] starting deploy of {'pull': 'config', 'config': True} to all [08:26:45] Logged the message at https://meta.miraheze.org/wiki/Tech:Server_admin_log [08:26:51] miraheze/mw-config - Reception123 the build passed. [08:27:01] !log [reception@mwtask181] finished deploy of {'pull': 'config', 'config': True} to all - SUCCESS in 20s [08:27:05] Logged the message at https://meta.miraheze.org/wiki/Tech:Server_admin_log [08:52:36] PROBLEM - hastursnotebook.org - LetsEncrypt on sslhost is WARNING: WARNING - Certificate 'hastursnotebook.org' expires in 14 day(s) (Wed 25 Dec 2024 08:26:18 AM GMT +0000). [08:52:47] [02ssl] 07WikiTideSSLBot pushed 1 new commit to 03master 13https://github.com/miraheze/ssl/commit/8c1e15dee28ccc4162c878c70dec23577292a8a5 [08:52:47] 02ssl/03master 07WikiTideSSLBot 038c1e15d Bot: Update SSL cert for hastursnotebook.org [09:05:57] [02puppet] 07The-Voidwalker created 03The-Voidwalker-patch-1 (+1 new commit) 13https://github.com/miraheze/puppet/commit/e1b9d8e3f926 [09:05:57] 02puppet/03The-Voidwalker-patch-1 07The-Voidwalker 03e1b9d8e T12621 - restrict what is considered a php file [09:06:05] [02puppet] 07The-Voidwalker opened pull request #4112: T12621 - restrict what is considered a php file (03master...03The-Voidwalker-patch-1) 13https://github.com/miraheze/puppet/pull/4112 [09:06:13] [02puppet] 07coderabbitai[bot] commented on pull request #4112: --- […] 13https://github.com/miraheze/puppet/pull/4112#issuecomment-2530883819 [09:22:11] RECOVERY - hastursnotebook.org - LetsEncrypt on sslhost is OK: OK - Certificate 'hastursnotebook.org' will expire on Mon 10 Mar 2025 07:54:11 AM GMT +0000. [10:44:00] [02puppet] 07BlankEclair left a file comment in pull request #4112 03e1b9d8e: What scripts are we loading from the document root? 13https://github.com/miraheze/puppet/pull/4112#discussion_r1877852806 [12:26:44] [02puppet] 07BlankEclair opened pull request #4113: Set autocommit to 0 (07miraheze:03master...07BlankEclair:03autocommit-0) 13https://github.com/miraheze/puppet/pull/4113 [12:26:51] [02puppet] 07coderabbitai[bot] commented on pull request #4113: --- […] 13https://github.com/miraheze/puppet/pull/4113#issuecomment-2531500068 [13:19:48] [02ImportDump] 07dependabot[bot] created 03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 (+1 new commit) 13https://github.com/miraheze/ImportDump/commit/6e74fad082a0 [13:19:50] 02ImportDump/03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 07dependabot[bot] 036e74fad Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0… [13:19:52] [02ImportDump] 07dependabot[bot] added the label 'dependencies' to pull request #124 (Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0) 13https://github.com/miraheze/ImportDump/pull/124 [13:19:54] [02ImportDump] 07dependabot[bot] added the label 'php' to pull request #124 (Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0) 13https://github.com/miraheze/ImportDump/pull/124 [13:19:56] [02ImportDump] 07dependabot[bot] opened pull request #124: Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0 (03master...03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0) 13https://github.com/miraheze/ImportDump/pull/124 [13:19:58] [02ImportDump] 07coderabbitai[bot] commented on pull request #124: --- […] 13https://github.com/miraheze/ImportDump/pull/124#issuecomment-2531619705 [13:30:38] miraheze/ImportDump - dependabot[bot] the build passed. [13:47:03] [02puppet] 07BlankEclair commented on pull request #4113: So it looks like that this isn't the magic bullet that it is. From #wikimedia-data-persistence: […] 13https://github.com/miraheze/puppet/pull/4113#issuecomment-2531683558 [14:06:09] [02puppet] 07paladox commented on pull request #4113: You can use START TRANSACTION; and if necessary then type ROLLBACK. 13https://github.com/miraheze/puppet/pull/4113#issuecomment-2531733020 [14:06:43] [02puppet] 07BlankEclair commented on pull request #4113: Yeah, but I'm kinda worried in case if someone forgot 13https://github.com/miraheze/puppet/pull/4113#issuecomment-2531734420 [14:13:38] [02PDFEmbed] 07dependabot[bot] created 03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 (+1 new commit) 13https://github.com/miraheze/PDFEmbed/commit/1cfa820d4b79 [14:13:40] 02PDFEmbed/03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 07dependabot[bot] 031cfa820 Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0… [14:13:42] [02PDFEmbed] 07dependabot[bot] added the label 'dependencies' to pull request #24 (Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0) 13https://github.com/miraheze/PDFEmbed/pull/24 [14:13:44] [02PDFEmbed] 07dependabot[bot] opened pull request #24: Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0 (03master...03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0) 13https://github.com/miraheze/PDFEmbed/pull/24 [14:13:48] [02PDFEmbed] 07coderabbitai[bot] commented on pull request #24: --- […] 13https://github.com/miraheze/PDFEmbed/pull/24#issuecomment-2531752961 [14:18:22] miraheze/PDFEmbed - dependabot[bot] the build passed. [14:25:43] [02puppet] 07paladox merged 07The-Voidwalker's pull request #4112: T12621 - restrict what is considered a php file (03master...03The-Voidwalker-patch-1) 13https://github.com/miraheze/puppet/pull/4112 [14:25:44] [02puppet] 07paladox pushed 1 new commit to 03master 13https://github.com/miraheze/puppet/commit/12351de9d6578e71d810e411b7d43d1ac65cb4f5 [14:25:45] 02puppet/03master 07The-Voidwalker 0312351de T12621 - restrict what is considered a php file (#4112) [14:25:47] [02puppet] 07paladox 04deleted 03The-Voidwalker-patch-1 at 03e1b9d8e 13https://github.com/miraheze/puppet/commit/e1b9d8e [14:29:47] PROBLEM - mw151 HTTPS on mw151 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:29:54] PROBLEM - mw173 HTTPS on mw173 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:29:58] PROBLEM - mw183 HTTPS on mw183 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:29:58] PROBLEM - mw161 HTTPS on mw161 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:29:59] [02puppet] 07paladox closed pull request #4061: mediawiki: add 1.43 (03master...031.43) 13https://github.com/miraheze/puppet/pull/4061 [14:30:02] PROBLEM - cp37 HTTPS on cp37 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:07] PROBLEM - mw172 HTTPS on mw172 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:14] [02puppet] 07paladox commented on pull request #4061: This was done already https://github.com/miraheze/puppet/commit/6f679fd 13https://github.com/miraheze/puppet/pull/4061#issuecomment-2531796755 [14:30:15] [02puppet] 07paladox 04deleted 031.43 at 033db1fc0 13https://github.com/miraheze/puppet/commit/3db1fc0 [14:30:17] PROBLEM - cp36 HTTPS on cp36 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:19] PROBLEM - mw162 HTTPS on mw162 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:19] chat, this is the most devastating response,,, [14:30:23] PROBLEM - mw181 HTTPS on mw181 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:25] the server is responding correctly,,, [14:30:28] PROBLEM - mw184 HTTPS on mw184 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:46] PROBLEM - mw164 HTTPS on mw164 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:50] PROBLEM - mwtask161 HTTPS on mwtask161 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:50] PROBLEM - mw182 HTTPS on mw182 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:51] PROBLEM - mwtask181 HTTPS on mwtask181 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:51] PROBLEM - mw174 HTTPS on mw174 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:56] PROBLEM - mw154 HTTPS on mw154 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:30:58] okay wtf are y'all whining about [14:31:00] PROBLEM - mw153 HTTPS on mw153 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:31:01] PROBLEM - mwtask171 HTTPS on mwtask171 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:31:05] oh [14:31:07] PROBLEM - mwtask151 HTTPS on mwtask151 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:31:09] PROBLEM - mw171 HTTPS on mw171 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:31:14] oh [14:31:16] oh yep [14:31:28] PROBLEM - mw163 HTTPS on mw163 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:31:30] we are now getting the response of the php file [14:31:33] paladox: ^ [14:31:35] PROBLEM - mw152 HTTPS on mw152 is CRITICAL: HTTP CRITICAL - Invalid HTTP response received from host on port 443: HTTP/2 200 [14:31:51] oh huh [14:32:13] BlankEclair do i change the HTTPS check or do i just revert? [14:32:24] revert wtf we want to solve this asap [14:32:36] meta.miraheze.org just gave me the contents of index.php [14:32:40] like, the literal contents [14:32:54] [02puppet] 07paladox created 03revert-4112-The-Voidwalker-patch-1 (+1 new commit) 13https://github.com/miraheze/puppet/commit/9bc8d16d420e [14:32:56] 02puppet/03revert-4112-The-Voidwalker-patch-1 07paladox 039bc8d16 Revert "T12621 - restrict what is considered a php file (#4112)"… [14:32:59] [02puppet] 07paladox opened pull request #4114: Revert "T12621 - restrict what is considered a php file" (03master...03revert-4112-The-Voidwalker-patch-1) 13https://github.com/miraheze/puppet/pull/4114 [14:33:05] [02puppet] 07paladox merged pull request #4114: Revert "T12621 - restrict what is considered a php file" (03master...03revert-4112-The-Voidwalker-patch-1) 13https://github.com/miraheze/puppet/pull/4114 [14:33:07] [02puppet] 07paladox pushed 1 new commit to 03master 13https://github.com/miraheze/puppet/commit/69ba0b718a740d9751ab29a240718e22d3ce33d2 [14:33:09] 02puppet/03master 07paladox 0369ba0b7 Revert "T12621 - restrict what is considered a php file" (#4114)… [14:33:11] [02puppet] 07coderabbitai[bot] commented on pull request #4114: --- […] 13https://github.com/miraheze/puppet/pull/4114#issuecomment-2531803906 [14:33:13] [02puppet] 07paladox 04deleted 03revert-4112-The-Voidwalker-patch-1 at 039bc8d16 13https://github.com/miraheze/puppet/commit/9bc8d16 [14:33:17] done. [14:34:37] I had tested it although i guess it broke /? [14:34:42] RECOVERY - mw164 HTTPS on mw164 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.062 second response time [14:34:50] RECOVERY - mw182 HTTPS on mw182 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.059 second response time [14:34:50] RECOVERY - mwtask161 HTTPS on mwtask161 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3949 bytes in 0.061 second response time [14:34:51] RECOVERY - mw174 HTTPS on mw174 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.056 second response time [14:34:56] RECOVERY - mw154 HTTPS on mw154 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.055 second response time [14:34:59] seemingly yeah [14:35:00] RECOVERY - mw153 HTTPS on mw153 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.053 second response time [14:35:01] RECOVERY - mwtask171 HTTPS on mwtask171 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3949 bytes in 0.056 second response time [14:35:07] RECOVERY - mwtask151 HTTPS on mwtask151 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3949 bytes in 0.071 second response time [14:35:09] RECOVERY - mw171 HTTPS on mw171 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.055 second response time [14:35:23] huh, til that /index.php is valid [14:35:28] RECOVERY - mw163 HTTPS on mw163 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.047 second response time [14:35:35] RECOVERY - mw152 HTTPS on mw152 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.052 second response time [14:35:47] RECOVERY - mw151 HTTPS on mw151 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.052 second response time [14:35:54] RECOVERY - mw173 HTTPS on mw173 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.053 second response time [14:35:58] RECOVERY - mw183 HTTPS on mw183 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.064 second response time [14:35:58] RECOVERY - mw161 HTTPS on mw161 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.097 second response time [14:36:03] RECOVERY - cp37 HTTPS on cp37 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 4141 bytes in 0.060 second response time [14:36:07] RECOVERY - mw172 HTTPS on mw172 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.052 second response time [14:36:17] RECOVERY - cp36 HTTPS on cp36 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 4141 bytes in 0.064 second response time [14:36:19] RECOVERY - mw162 HTTPS on mw162 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.059 second response time [14:36:23] RECOVERY - mw181 HTTPS on mw181 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.058 second response time [14:36:28] RECOVERY - mw184 HTTPS on mw184 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3945 bytes in 0.053 second response time [14:36:32] i believe i see the problem [14:36:43] the regex is ^(/w/)?\w+\.php [14:36:51] that does not include /index.php [14:36:51] RECOVERY - mwtask181 HTTPS on mwtask181 is OK: HTTP OK: HTTP/2 404 - Status line output matched "HTTP/2 404" - 3949 bytes in 0.065 second response time [14:36:56] ngl i missed that in my review [14:42:20] ah BlankEclair could you re-do it or tell me what the regex is? i'm looking at wikimedias apache config and they do \.php. [14:42:33] not sure why there's work [14:42:38] matches /w/AWAWA.php or AWAWA.php [14:42:48] https://github.com/wikimedia/operations-puppet/blob/13b0d26140df8a31521f01c0e8320cb3e1180b64/modules/mediawiki/templates/apache/mediawiki-vhost.conf.erb#L97 is their config [14:42:48] [GitHub] [wikimedia/operations-puppet] modules/mediawiki/templates/apache/mediawiki-vhost.conf.erb @ 13b0d26140df8a31521f01c0e8320cb3e1180b64 | L97: RewriteRule ^/w/extensions/.*\.php - [F,L] [14:42:59] i think void meant /(w/)?\w+\.php, which'd be /w/AWAWA.php or /AWAWA.php [14:43:07] but what are we loading from /? (aside from index.php) [14:43:48] ah i see. [14:43:54] i can give it ago [14:44:29] what a coincidence: https://fox.nexus/@theresnotime/113629033603272216 [14:45:30] [02puppet] 07paladox created 03paladox-patch-1 (+1 new commit) 13https://github.com/miraheze/puppet/commit/fac565b1a9f9 [14:45:30] 02puppet/03paladox-patch-1 07paladox 03fac565b T12621 - restrict what is considered a php file… [14:45:36] [02puppet] 07paladox opened pull request #4115: T12621 - restrict what is considered a php file (03master...03paladox-patch-1) 13https://github.com/miraheze/puppet/pull/4115 [14:45:45] [02puppet] 07coderabbitai[bot] commented on pull request #4115: --- […] 13https://github.com/miraheze/puppet/pull/4115#issuecomment-2531843583 [14:46:00] BlankEclair ^ look ok? [14:46:33] by void's intention, yes [14:46:39] what are we loading from / though [14:47:26] i would imagine nothing. We only load from /w/ [14:47:31] [02puppet] 07BlankEclair left a file comment in pull request #4115 03fac565b: To copy my former review: What scripts are we loading from the document root? 13https://github.com/miraheze/puppet/pull/4115#discussion_r1878237733 [14:47:39] and /index.php i suppose [14:47:51] but then why not scope it to /(w/\w+|index)\.php [14:47:53] we don't have index.php outside /w/ [14:48:36] > > curl --no-progress-meter -I https://meta.miraheze.org/index.php | grep -e HTTP/ -e location: [14:48:37] > HTTP/2 301 [14:48:39] > location: https://meta.miraheze.org/w/index.php [14:48:52] oh [14:48:53] actually [14:49:14] [1/22] ``` [14:49:14] [2/22] [root@mw151:/srv/mediawiki]# ls -lah [14:49:15] [3/22] total 2.4M [14:49:15] [4/22] drwxr-xr-x 11 www-data www-data 4.0K Nov 21 04:04 . [14:49:15] [5/22] drwxr-xr-x 4 root root 4.0K Jan 16 2024 .. [14:49:15] [6/22] drwxr-xr-x 14 www-data www-data 80K Dec 9 13:26 1.42 [14:49:16] [7/22] drwxr-xr-x 14 www-data www-data 4.0K Dec 8 20:26 1.43 [14:49:16] [8/22] drwxr-xr-x 4 www-data www-data 2.2M Dec 10 14:48 cache [14:49:16] [9/22] drwxr-xr-x 6 www-data www-data 4.0K Dec 10 08:26 config [14:49:17] [10/22] drwxr-xr-x 4 www-data www-data 4.0K Oct 15 07:01 ErrorPages [14:49:17] [11/22] -rw-r--r-- 1 root root 1.5K Aug 30 21:33 favicon.php [14:49:17] [12/22] drwxr-xr-x 2 www-data www-data 4.0K Jan 16 2024 favicons [14:49:18] [13/22] drwxr-xr-x 6 www-data www-data 4.0K Nov 21 04:04 femiwiki-deploy [14:49:18] [14/22] -rw-r--r-- 1 root root 128 May 14 2024 healthcheck.php [14:49:19] [15/22] lrwxrwxrwx 1 www-data www-data 54 Jan 16 2024 index.php -> /srv/mediawiki/config/initialise/entrypoints/index.php [14:49:19] [16/22] drwxr-xr-x 10 www-data www-data 4.0K Dec 1 22:28 landing [14:49:20] [17/22] -rw-r--r-- 1 root root 1.5K May 14 2024 robots.php [14:49:20] [18/22] -rw-r--r-- 1 root root 1.1K Aug 30 21:33 sitemap.php [14:49:21] [19/22] drwxr-xr-x 2 www-data www-data 4.0K Dec 9 23:04 stopforumspam [14:49:21] [20/22] -rw-r--r-- 1 root root 1.6K Aug 30 21:33 touch.php [14:49:22] [21/22] lrwxrwxrwx 1 www-data www-data 44 Jan 16 2024 w -> /srv/mediawiki/config/initialise/entrypoints [14:49:22] [22/22] ``` [14:49:28] oh okay, that's... a couple [14:49:37] https://issue-tracker.miraheze.org/P532 [14:50:09] i love the response i got from https://rainverse.wiki/touch.php [14:51:03] pretty weird [14:51:22] oh is that why /apple-touch-icon.png didn't work [14:51:28] ok that's a bug that needs fixing [14:51:37] l- [14:51:44] let me guess, it's the whole move to static.wikitide.net thing [14:52:30] i wouldn't think so [14:52:38] like we don't redirect touch.php [14:53:08] we stream touch [14:53:11] but do we follow redirects? [14:54:21] https://meta.miraheze.org/sitemap.php works tho [14:54:54] [02puppet] 07BlankEclair left a file comment in pull request #4115 03fac565b: Plenty actually: https://issue-tracker.miraheze.org/P532 13https://github.com/miraheze/puppet/pull/4115#discussion_r1878251518 [14:54:57] yeh looks like we stream it [14:55:28] [02puppet] 07BlankEclair approved pull request #4115: Fingers crossed... 13https://github.com/miraheze/puppet/pull/4115#pullrequestreview-2492595748 [14:58:22] oh we can set followRedirects [14:58:56] [02puppet] 07paladox created 03paladox-patch-2 (+1 new commit) 13https://github.com/miraheze/puppet/commit/5a28bc6288f1 [14:58:56] 02puppet/03paladox-patch-2 07paladox 035a28bc6 touch.php: Follow redirects [14:59:00] [02puppet] 07paladox opened pull request #4116: touch.php: Follow redirects (03master...03paladox-patch-2) 13https://github.com/miraheze/puppet/pull/4116 [14:59:07] [02puppet] 07coderabbitai[bot] commented on pull request #4116: --- […] 13https://github.com/miraheze/puppet/pull/4116#issuecomment-2531900902 [14:59:25] BlankEclair ^? [14:59:52] I guess we only want to do that if it's static.miraheze.org or static.wikitide [15:01:29] [02puppet] 07BlankEclair approved pull request #4116: While the docs do say "this should only be used when the target URL is trusted, to avoid attacks on intranet services accessible by HTTP", we already have plenty of SSRFs, so I don't think it matters much? […] 13https://github.com/miraheze/puppet/pull/4116#pullrequestreview-2492623022 [15:06:35] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/eb373ee5b7611b308f40f448322402049817ad70 [15:06:35] 02puppet/03paladox-patch-2 07paladox 03eb373ee Update touch.php [15:06:54] BlankEclair added a check ^ [15:07:21] w [15:07:40] should i comment on the regex, or should i provide a better solution [15:10:12] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/6cc648fbec02d1089b643026827fb85114b34fa6 [15:10:13] 02puppet/03paladox-patch-2 07paladox 036cc648f Update touch.php [15:10:25] BlankEclair can you provide a better solution pls [15:12:34] [02puppet] 07BlankEclair left a review on pull request #4116: Instead of following redirects when it's static.{miraheze.org,wikitide.net}, we can instead parse the URL (ideally with UrlUtils), check if it's static.miraheze.org, and if so, recreate the URL but with the domain as static.wikitide.net […] 13https://github.com/miraheze/puppet/pull/4116#pullrequestreview-2492657470 [15:13:16] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/eb768e6c003e1e14904283dfd8e493e631c0ad65 [15:13:16] 02puppet/03paladox-patch-2 07paladox 03eb768e6 Update favicon.php [15:14:05] [02puppet] 07BlankEclair commented on pull request #4113: ``` […] 13https://github.com/miraheze/puppet/pull/4113#issuecomment-2531969321 [15:24:19] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/db8ceb2c8357fcd3838178b7b422bec34f2e926d [15:24:19] 02puppet/03paladox-patch-2 07paladox 03db8ceb2 Update touch.php [15:24:34] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/151de3ed36d0231500223290ae292da12987fd94 [15:24:35] 02puppet/03paladox-patch-2 07paladox 03151de3e Update favicon.php [15:24:36] BlankEclair done [15:25:05] oh [15:25:24] yeah i was about to mention that [15:25:29] it's better than before though [15:25:39] [02GlobalNewFiles] 07dependabot[bot] created 03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 (+1 new commit) 13https://github.com/miraheze/GlobalNewFiles/commit/2e10041d129b [15:25:39] 02GlobalNewFiles/03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 07dependabot[bot] 032e10041 Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0… [15:25:41] [02GlobalNewFiles] 07dependabot[bot] added the label 'dependencies' to pull request #84 (Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0) 13https://github.com/miraheze/GlobalNewFiles/pull/84 [15:25:41] [02GlobalNewFiles] 07dependabot[bot] added the label 'php' to pull request #84 (Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0) 13https://github.com/miraheze/GlobalNewFiles/pull/84 [15:25:43] [02GlobalNewFiles] 07dependabot[bot] opened pull request #84: Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0 (03master...03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0) 13https://github.com/miraheze/GlobalNewFiles/pull/84 [15:25:47] [02GlobalNewFiles] 07coderabbitai[bot] commented on pull request #84: --- […] 13https://github.com/miraheze/GlobalNewFiles/pull/84#issuecomment-2532036618 [15:28:14] can i go sleep now [15:28:39] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/9b1f4d62e008ef7f5f7405f3b8f9731611010f30 [15:28:40] 02puppet/03paladox-patch-2 07paladox 039b1f4d6 Update touch.php [15:29:20] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/abb30dc7854570c2f4412f8481bd5759435502ec [15:29:21] 02puppet/03paladox-patch-2 07paladox 03abb30dc Update favicon.php [15:29:43] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/aaebee61d7b8b184fca71a6fda1be4b64e069370 [15:29:43] 02puppet/03paladox-patch-2 07paladox 03aaebee6 Update touch.php [15:29:49] BlankEclair done [15:30:20] [02puppet] 07BlankEclair left a file comment in pull request #4116 03aaebee6: paladox no... […] 13https://github.com/miraheze/puppet/pull/4116#discussion_r1878318801 [15:30:28] miraheze/GlobalNewFiles - dependabot[bot] the build passed. [15:33:27] oh, you want me to do something like `$parsedBaseUrl['host'] = 'static.wikitide.net'; $url = $urlUtils->assemble( $parsedBaseUrl );` [15:33:31] BlankEclair ^? [15:33:41] yeah [15:35:30] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/836903ed4a2ad5a2a99164521310531d275b33bf [15:35:31] 02puppet/03paladox-patch-2 07paladox 03836903e Update favicon.php [15:35:40] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/a417e105608ba9acc3b82816e37efab449616329 [15:35:41] 02puppet/03paladox-patch-2 07paladox 03a417e10 Update touch.php [15:35:47] BlankEclair done [15:35:54] [02puppet] 07paladox left a file comment in pull request #4116 03a417e10: Thanks, done. 13https://github.com/miraheze/puppet/pull/4116#discussion_r1878328308 [15:36:38] [02puppet] 07BlankEclair left a file comment in pull request #4116 03a417e10: ```suggestion […] 13https://github.com/miraheze/puppet/pull/4116#discussion_r1878329108 [15:36:40] [02puppet] 07BlankEclair left a file comment in pull request #4116 03a417e10: ```suggestion […] 13https://github.com/miraheze/puppet/pull/4116#discussion_r1878328802 [15:36:55] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/c9cafecfb345e6244fac92eba1b09497eaaab488 [15:36:55] 02puppet/03paladox-patch-2 07paladox 03c9cafec Update modules/mediawiki/files/favicon.php… [15:37:03] [02puppet] 07paladox pushed 1 new commit to 03paladox-patch-2 13https://github.com/miraheze/puppet/commit/71ec4f87c7cb47fa17c14cc24f56b7b63bc19767 [15:37:03] 02puppet/03paladox-patch-2 07paladox 0371ec4f8 Update modules/mediawiki/files/touch.php… [15:37:21] [02puppet] 07paladox retitled PR #4116: "touch.php: Follow redirects" ➜ "touch.php|favicon.php: Follow redirects" 13https://github.com/miraheze/puppet/pull/4116 [15:37:39] [02puppet] 07paladox retitled PR #4116: "touch.php|favicon.php: Follow redirects" ➜ "touch.php and favicon.php: Follow redirects" 13https://github.com/miraheze/puppet/pull/4116 [15:37:45] [02puppet] 07BlankEclair approved pull request #4116 13https://github.com/miraheze/puppet/pull/4116#pullrequestreview-2492733568 [15:37:55] [02puppet] 07paladox merged pull request #4116: touch.php and favicon.php: Follow redirects (03master...03paladox-patch-2) 13https://github.com/miraheze/puppet/pull/4116 [15:37:57] [02puppet] 07paladox pushed 1 new commit to 03master 13https://github.com/miraheze/puppet/commit/eb6163d8427623f189aebdf94d8a8b724618093b [15:37:58] [02puppet] 07paladox 04deleted 03paladox-patch-2 at 0371ec4f8 13https://github.com/miraheze/puppet/commit/71ec4f8 [15:38:00] 02puppet/03master 07paladox 03eb6163d touch.php and favicon.php: Follow redirects (#4116)… [15:39:39] BlankEclair just realised i should have probably changed the title to replace host in url if static.miraheze.org [15:39:40] oh well [15:39:53] oop [15:40:14] it doesn't seem to work still [15:40:15] https://rainverse.wiki/touch.php [15:40:16] well, you see, you can always do a git commit --ame- *dies* [15:40:23] alright, i'm heading off to bed [15:46:08] ok must be cache [15:46:10] works on betas [16:04:31] ok it was the cache [16:04:33] fixed [16:04:55] [02puppet] 07paladox merged pull request #4115: T12621 - restrict what is considered a php file (03master...03paladox-patch-1) 13https://github.com/miraheze/puppet/pull/4115 [16:04:55] [02puppet] 07paladox pushed 1 new commit to 03master 13https://github.com/miraheze/puppet/commit/6fe79b1603867a83d4dac4c70252958c000aeb4e [16:04:55] 02puppet/03master 07paladox 036fe79b1 T12621 - restrict what is considered a php file (#4115)… [16:04:57] [02puppet] 07paladox 04deleted 03paladox-patch-1 at 03fac565b 13https://github.com/miraheze/puppet/commit/fac565b [16:10:27] [02ManageWiki] 07paladox created 03paladox-patch-5 (+1 new commit) 13https://github.com/miraheze/ManageWiki/commit/bd0f9806a0cc [16:10:28] 02ManageWiki/03paladox-patch-5 07paladox 03bd0f980 ManageWikiTypes: Remove isset check for $value… [16:10:34] [02ManageWiki] 07paladox opened pull request #521: ManageWikiTypes: Remove isset check for $value (03master...03paladox-patch-5) 13https://github.com/miraheze/ManageWiki/pull/521 [16:10:42] [02ManageWiki] 07coderabbitai[bot] commented on pull request #521: --- […] 13https://github.com/miraheze/ManageWiki/pull/521#issuecomment-2532173000 [16:11:11] [02ManageWiki] 07paladox pushed 1 new commit to 03master 13https://github.com/miraheze/ManageWiki/commit/e47c44dd389a072e6e38fc593d6d7ce2e69f210c [16:11:11] 02ManageWiki/03master 07paladox 03e47c44d ManageWikiTypes: Remove isset check for $value (#521)… [16:11:12] [02ManageWiki] 07paladox merged pull request #521: ManageWikiTypes: Remove isset check for $value (03master...03paladox-patch-5) 13https://github.com/miraheze/ManageWiki/pull/521 [16:11:13] [02ManageWiki] 07paladox 04deleted 03paladox-patch-5 at 03bd0f980 13https://github.com/miraheze/ManageWiki/commit/bd0f980 [16:14:23] miraheze/ManageWiki - dependabot[bot] the build has errored. [16:15:23] miraheze/ManageWiki - paladox the build passed. [16:16:14] miraheze/ManageWiki - paladox the build passed. [16:18:22] [02ManageWiki] 07paladox 04force-pushed 03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 from 03a558421 to 03a2ee06b 13https://github.com/miraheze/ManageWiki/commits/dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 [16:18:22] 02ManageWiki/03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 07dependabot[bot] 03a2ee06b Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0… [16:23:53] miraheze/ManageWiki - paladox the build passed. [16:24:27] [02ManageWiki] 07paladox merged 07dependabot[bot]'s pull request #520: Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0 (03master...03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0) 13https://github.com/miraheze/ManageWiki/pull/520 [16:24:27] [02ManageWiki] 07paladox pushed 1 new commit to 03master 13https://github.com/miraheze/ManageWiki/commit/f2921746e2f3366f88f62d89615a247d5e0c46ed [16:24:28] !log [paladox@mwtask181] starting deploy of {'l10n': True, 'versions': ['1.42', '1.43'], 'upgrade_extensions': 'ManageWiki'} to all [16:24:29] 02ManageWiki/03master 07dependabot[bot] 03f292174 Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0 (#520)… [16:24:31] [02ManageWiki] 07paladox 04deleted 03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 at 03a2ee06b 13https://github.com/miraheze/ManageWiki/commit/a2ee06b [16:24:33] Logged the message at https://meta.miraheze.org/wiki/Tech:Server_admin_log [16:24:46] [02GlobalNewFiles] 07paladox merged 07dependabot[bot]'s pull request #84: Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0 (03master...03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0) 13https://github.com/miraheze/GlobalNewFiles/pull/84 [16:24:46] [02GlobalNewFiles] 07paladox pushed 1 new commit to 03master 13https://github.com/miraheze/GlobalNewFiles/commit/fd97ce045214a370cf01c6b3c76f1997dd234bd8 [16:24:46] 02GlobalNewFiles/03master 07dependabot[bot] 03fd97ce0 Update mediawiki/mediawiki-phan-config requirement from 0.14.0 to 0.15.0 (#84)… [16:24:47] [02GlobalNewFiles] 07paladox 04deleted 03dependabot/composer/mediawiki/mediawiki-phan-config-0.15.0 at 032e10041 13https://github.com/miraheze/GlobalNewFiles/commit/2e10041 [16:25:29] [02ManageWiki] 07dependabot[bot] created 03dependabot/npm_and_yarn/nanoid-3.3.8 (+1 new commit) 13https://github.com/miraheze/ManageWiki/commit/f853f7f9113d [16:25:29] 02ManageWiki/03dependabot/npm_and_yarn/nanoid-3.3.8 07dependabot[bot] 03f853f7f Bump nanoid from 3.3.7 to 3.3.8… [16:25:30] [02ManageWiki] 07dependabot[bot] added the label 'dependencies' to pull request #522 (Bump nanoid from 3.3.7 to 3.3.8) 13https://github.com/miraheze/ManageWiki/pull/522 [16:25:31] [02ManageWiki] 07dependabot[bot] added the label 'javascript' to pull request #522 (Bump nanoid from 3.3.7 to 3.3.8) 13https://github.com/miraheze/ManageWiki/pull/522 [16:25:32] [02ManageWiki] 07dependabot[bot] opened pull request #522: Bump nanoid from 3.3.7 to 3.3.8 (03master...03dependabot/npm_and_yarn/nanoid-3.3.8) 13https://github.com/miraheze/ManageWiki/pull/522 [16:25:37] [02ManageWiki] 07coderabbitai[bot] commented on pull request #522: --- […] 13https://github.com/miraheze/ManageWiki/pull/522#issuecomment-2532211420 [16:27:57] !log [paladox@mwtask181] finished deploy of {'l10n': True, 'versions': ['1.42', '1.43'], 'upgrade_extensions': 'ManageWiki'} to all - SUCCESS in 209s [16:28:02] Logged the message at https://meta.miraheze.org/wiki/Tech:Server_admin_log [16:29:13] miraheze/ManageWiki - paladox the build passed. [16:29:21] miraheze/GlobalNewFiles - paladox the build passed. [16:29:29] [02GlobalNewFiles] 07paladox pushed 1 new commit to 03paladox-patch-3 13https://github.com/miraheze/GlobalNewFiles/commit/92138f1296d1b964ef55ec66be25b4ead1eaa933 [16:29:29] 02GlobalNewFiles/03paladox-patch-3 07paladox 0392138f1 Update GlobalNewFilesHooks.php [16:31:03] miraheze/ManageWiki - dependabot[bot] the build passed. [16:31:26] [02GlobalNewFiles] 07paladox pushed 1 new commit to 03paladox-patch-3 13https://github.com/miraheze/GlobalNewFiles/commit/6fd83d5c227784e851c4b4022a291c3e2968cd95 [16:31:27] 02GlobalNewFiles/03paladox-patch-3 07paladox 036fd83d5 Merge branch 'master' into paladox-patch-3 [16:34:18]