From fe4889d316dfc83b32ba48e5a9dc8b14405ecf5b Mon Sep 17 00:00:00 2001 From: Neko Nekowazarashi Date: Sun, 28 May 2023 20:00:55 +0700 Subject: [PATCH] some update --- conf/LocalSettings.php | 2 +- manifest.toml | 41 +++++++++++++++++++++++------------------ scripts/upgrade | 2 -- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/conf/LocalSettings.php b/conf/LocalSettings.php index ef48408..cde5fe7 100644 --- a/conf/LocalSettings.php +++ b/conf/LocalSettings.php @@ -79,7 +79,7 @@ $wgUseInstantCommons = false; # 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; +$wgPingback = false; ## If you use ImageMagick (or any other shell command) on a ## Linux server, this will need to be set to the name of an diff --git a/manifest.toml b/manifest.toml index 3b67a5f..2699a7a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "MediaWiki" description.en = "Wiki package originally for use on Wikipedia" description.fr = "Wiki développé à l’origine pour Wikipédia" -version = "1.39.1~ynh1" +version = "1.39.3~ynh1" maintainers = ["Salamandar"] @@ -64,34 +64,39 @@ ram.runtime = "50M" [resources] [resources.sources] + [resources.sources.main] + url = "https://releases.wikimedia.org/mediawiki/1.39/mediawiki-1.39.3.tar.gz" + sha256 = "e35769343876af42496da43ae2f47224fb8c779b8f45705c4147c6ff3522cc1d" + [resources.sources.ldap_groups] - url = "https://extdist.wmflabs.org/dist/extensions/LDAPGroups-REL1_39-baba47d.tar.gz" - sha256 = "2f266fb60a87aacdb251293538794165b783665045b109689a4db7752c23ceff" + url = "https://github.com/wikimedia/mediawiki-extensions-LDAPGroups/archive/refs/tags/1.0.5.tar.gz" + sha256 = "26f91deb271f9062181019fb41a3bc1646e7e1f4d894a7e03bc688f3b974d234" + in_subdir = true [resources.sources.ldap_authorization] - url = "https://extdist.wmflabs.org/dist/extensions/LDAPAuthorization-REL1_39-a8f336e.tar.gz" - sha256 = "9dede03066bfdddb5cb203af3fef97543a0956ff1a4508ac21bbd78cdf8599fe" + url = "https://github.com/wikimedia/mediawiki-extensions-LDAPAuthorization/archive/refs/tags/1.1.2.tar.gz" + sha256 = "fa25468492e39fd6a308468ab81fbcf65dc856c64a5723c00c3b85a84409f1c8" + in_subdir = true [resources.sources.pluggable_auth] - url = "https://extdist.wmflabs.org/dist/extensions/PluggableAuth-REL1_39-1210fc3.tar.gz" - sha256 = "d383750fe0abfe2d73fc99ba4af3ea647d87a6c577a2813093e460a04718efab" + url = "https://github.com/wikimedia/mediawiki-extensions-PluggableAuth/archive/refs/tags/6.3.tar.gz" + sha256 = "d22ee584c6616a585d3453989f2ca6e03d1447ec378c4e76b5ccb08f0d09fc05" + in_subdir = true [resources.sources.ldap_authentication2] - url = "https://extdist.wmflabs.org/dist/extensions/LDAPAuthentication2-REL1_39-35908c0.tar.gz" - sha256 = "c58761249e3ea47fb8c9cf4b63ba66ceab5907e4dbd90633f95da37c7df32278" - - [resources.sources.main] - url = "https://releases.wikimedia.org/mediawiki/1.39/mediawiki-1.39.1.tar.gz" - sha256 = "ddec3f90e1e7b1ac66819178ca81037d3f8084dc577d4ab7732a4b8f980d85f9" - in_subdir = false + url = "https://github.com/wikimedia/mediawiki-extensions-LDAPAuthentication2/archive/refs/tags/1.0.5.tar.gz" + sha256 = "d2465d0bf78371cdf0fbb0a0271e05441bd2c5668235f4d8998299b66279c28a" + in_subdir = true [resources.sources.ldap_userinfo] - url = "https://extdist.wmflabs.org/dist/extensions/LDAPUserInfo-REL1_39-85fbec0.tar.gz" - sha256 = "3609f76e6d462d6e9d2f2123edf7560577b2050040c33e8416bc7105906db9f4" + url = "https://github.com/wikimedia/mediawiki-extensions-LDAPUserInfo/archive/refs/tags/1.0.2.tar.gz" + sha256 = "e59560535395947fe2b2c673efd94445425795527c852534a02af0c9506a51cd" + in_subdir = true [resources.sources.ldap_provider] - url = "https://extdist.wmflabs.org/dist/extensions/LDAPProvider-REL1_39-1b79e16.tar.gz" - sha256 = "60dbf4b975111773c0ca47bb047db01baee58131429a5ac2f8aa00b986873acc" + url = "https://github.com/wikimedia/mediawiki-extensions-LDAPProvider/archive/refs/tags/1.0.7.tar.gz" + sha256 = "1bee8a7a94a18b1e9980487335dbc5152051e2d269be160bb18714893fa8ec91" + in_subdir = true [resources.system_user] diff --git a/scripts/upgrade b/scripts/upgrade index 45800ed..9f24c06 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -97,8 +97,6 @@ else mediawiki_path="$path" fi -ynh_add_config --template="../conf/LocalSettings.php" --destination="$install_dir/LocalSettings.php" - # Check for admin password being too short for the new mediawiki requirements password_length=$(ynh_app_setting_get --app=$app --key=password | awk '{print length}') if (( password_length < 10 )); then