YunoHost-Apps/mediawiki_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mediawiki_ynh.git synced 2024-09-03 19:46:05 +02:00
Code Issues Activity Actions 1

Upgrade upstream to 1.35 LTS

Browse source
This commit is contained in:
Salamandar 2020-06-10 17:28:54 +02:00
parent cef49c89c6
commit abb2aa09ad
13 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -17,15 +17,15 @@
MediaWiki is a free and open source software wiki package written in PHP, originally for use on Wikipedia.
**Shipped version:** 1.32.0
**Shipped version:** 1.35.0
**Shipped extension versions:**
* [LDAPProvider](https://www.mediawiki.org/wiki/Extension:LDAPProvider): 1.31 Stable
* [PluggableAuth](https://www.mediawiki.org/wiki/Extension:PluggableAuth): 1.31 Stable
* [LDAPAuthentication2](https://www.mediawiki.org/wiki/Extension:LDAPAuthentication2): 1.31 Stable
* [LDAPGroups](https://www.mediawiki.org/wiki/Extension:LDAPGroups): 1.31 Stable (**disabled and unused for now**)
* [LDAPUserInfo](https://www.mediawiki.org/wiki/Extension:LDAPUserInfo): 1.31 Stable (**disabled and unused for now**)
* [LDAPAuthorization](https://www.mediawiki.org/wiki/Extension:LDAPAuthorization): 1.31 Stable (**disabled and unused for now**)
* [LDAPAuthentication2](https://www.mediawiki.org/wiki/Extension:LDAPAuthentication2)
* [LDAPAuthorization](https://www.mediawiki.org/wiki/Extension:LDAPAuthorization) (**disabled and unused for now**)
* [LDAPGroups](https://www.mediawiki.org/wiki/Extension:LDAPGroups) (**disabled and unused for now**)
* [LDAPUserInfo](https://www.mediawiki.org/wiki/Extension:LDAPUserInfo) (**disabled and unused for now**)
* [LDAPProvider](https://www.mediawiki.org/wiki/Extension:LDAPProvider)
* [PluggableAuth](https://www.mediawiki.org/wiki/Extension:PluggableAuth)
Some of the extensions are marked as "disabled and unused" because they are not immediately required but are part of the MediaWiki "LDAP Stack" which may be needed in future versions.

8
conf/LocalSettings.php
View file

@ -1,5 +1,5 @@
<?php
# This file was automatically generated by the MediaWiki 1.33.0
# This file was automatically generated by the MediaWiki 1.35.0
# installer. If you make manual changes, please keep track in case you
# need to recreate them later.
#
@ -12,7 +12,7 @@
# Protect against web entry
if ( !defined( 'MEDIAWIKI' ) ) {
exit;
exit;
}
@ -34,9 +34,9 @@ $wgServer = "https://__DOMAIN__";
## The URL path to static resources (images, scripts, etc.)
$wgResourceBasePath = $wgScriptPath;
## The URL path to the logo. Make sure you change this from the default,
## The URL paths to the logo. Make sure you change this from the default,
## or else you'll overwrite your logo when you upgrade!
$wgLogo = "$wgResourceBasePath/resources/assets/wiki.png";
$wgLogos = [ '1x' => "$wgResourceBasePath/resources/assets/wiki.png" ];
## UPO means: this is also a user preference option

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://releases.wikimedia.org/mediawiki/1.32/mediawiki-1.32.0.tar.gz
SOURCE_SUM=d29b635dd41aea62bd05229c7c7942d4b0aa38aee457f8dc7302b6e59acb721b
SOURCE_URL=https://releases.wikimedia.org/mediawiki/1.35/mediawiki-1.35.0.tar.gz
SOURCE_SUM=3a7fbc1dec03533b57c688b075f721bba70eb14d92a4a1eab8d7d5a5943f2ed4
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true

4
conf/ldap_authentication2.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthentication2-REL1_31-68c653d.tar.gz
SOURCE_SUM=fa062f6942ee2885d37ff7dd9376385409dd0b560486ea27a0fdccceee94be9a
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthentication2-REL1_35-771b91e.tar.gz
SOURCE_SUM=84ddb5e871a39f4c035acec563c8b3c515cd8378aca18deab92d7b868710d882
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false

4
conf/ldap_authorization.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthorization-REL1_31-53e1ada.tar.gz
SOURCE_SUM=442700576895fdc62e0924d69a3fea505f11805609cc31fefcbd112e895a4f48
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthorization-REL1_35-e037664.tar.gz
SOURCE_SUM=0cd9e071b14a338cb6196fc84b4f0be3ef57e905bb87c611c67029806cd30236
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false

4
conf/ldap_groups.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPGroups-REL1_31-6098e11.tar.gz
SOURCE_SUM=e2e9a0cb06d4d2aa5d33740f7d56f4d287629f927039c2600d3d54892e895a5b
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPGroups-REL1_35-97e04b2.tar.gz
SOURCE_SUM=c6dc0de2fa56c3b26b2fd73135773d63ab88d7188d0241501e8457cc2ebec56b
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false

4
conf/ldap_provider.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPProvider-REL1_31-098cd58.tar.gz
SOURCE_SUM=653536b22c2dce57426c5b517f0b07647642fb0f3dc1f72f9efd43ab7dbce1a1
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPProvider-REL1_35-ca854c1.tar.gz
SOURCE_SUM=87420f722c4646f4cf9e47a798ac9e776d0ce904323484674a3dd003dcce6f60
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false

4
conf/ldap_userinfo.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPUserInfo-REL1_31-da95a07.tar.gz
SOURCE_SUM=5c915085506926aa46c1df6b983c9180822e93d7f8fa87359dd5734971a0f8e3
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPUserInfo-REL1_35-39cca83.tar.gz
SOURCE_SUM=bfdc2c9db277528daf1e942078b9eeadacad384aa0cbcc08173938318e126347
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false

4
conf/pluggable_auth.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/PluggableAuth-REL1_31-300ac44.tar.gz
SOURCE_SUM=703779a4f4f4154ea088e6043e8d3387ec2ae79d6d067c9138aeb2626b463b1f
SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/PluggableAuth-REL1_35-2a465ae.tar.gz
SOURCE_SUM=05d18f8ee61cf7f588b0ac6a8e042999eeab22a69bf242ac5191a66662954d2f
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false

4
manifest.json
View file

@ -6,7 +6,7 @@
"en": "A free and open source software wiki package written in PHP, originally for use on Wikipedia.",
"fr": "Un wiki à base de logiciels libres Open source, développé à l’origine pour Wikipédia ."
},
"version": "1.32.0~ynh6",
"version": "1.35.0~ynh1",
"url": "https://www.mediawiki.org",
"license": "GPL-2.0-or-later",
"maintainer": {
@ -19,7 +19,7 @@
"multi_instance": true,
"services": [
"nginx",
"php7.0-fpm",
"php7.3-fpm",
"mysql"
],
"arguments": {

2
scripts/_common.sh
View file

@ -9,3 +9,5 @@ pkg_dependencies=(
imagemagick
acl
)
YNH_PHP_VERSION="7.3"

5
scripts/install
View file

@ -125,6 +125,7 @@ ynh_script_progression --message="Configuring php-fpm..." --weight=1
# Create a dedicated php-fpm config
ynh_add_fpm_config
phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
#=================================================
# SPECIFIC SETUP
@ -147,7 +148,7 @@ else
scriptpath=$path_url
fi
php "$final_path/maintenance/install.php" --conf "$final_path" \
"php$phpversion" "$final_path/maintenance/install.php" --conf "$final_path" \
--server "https://$domain" \
--scriptpath "$scriptpath" \
--dbuser "$db_name" \
@ -189,7 +190,7 @@ ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string=
ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__LDAP_USER__" --replace_string="$ldap_user"
ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__LDAP_PASSWORD__" --replace_string="$ldap_password"
php "$final_path/maintenance/update.php"
"php$phpversion" "$final_path/maintenance/update.php"
chown -R "$app:$app" "$final_path"

3
scripts/upgrade
View file

@ -128,6 +128,7 @@ ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=1
# Create a dedicated php-fpm config
ynh_add_fpm_config
phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
#=================================================
# SPECIFIC UPGRADE
@ -185,7 +186,7 @@ ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string=
ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__LDAP_USER__" --replace_string="$ldap_user"
ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__LDAP_PASSWORD__" --replace_string="$ldap_password"
php "$final_path/maintenance/update.php"
"php$phpversion" "$final_path/maintenance/update.php"
#=================================================
# SECURE FILES AND DIRECTORIES