From 1725caea27fb9a94c373fd157e4931da8e1f02c5 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 13 Apr 2022 01:23:40 +0200 Subject: [PATCH 1/8] apply last example_ynh --- check_process | 5 ++-- conf/LocalSettings.php | 2 +- doc/DESCRIPTION.md | 1 + doc/DESCRIPTION_fr.md | 1 + manifest.json | 10 ++++---- scripts/install | 35 ++++++++++------------------ scripts/remove | 16 ++++++------- scripts/restore | 7 +++--- scripts/upgrade | 53 +++++++++++++----------------------------- 9 files changed, 50 insertions(+), 80 deletions(-) create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DESCRIPTION_fr.md diff --git a/check_process b/check_process index 92edf81..7bf732c 100644 --- a/check_process +++ b/check_process @@ -2,12 +2,11 @@ ; Manifest domain="domain.tld" path="/path" - admin="john" is_public=1 language="fr" + admin="john" password="jztI4OHHr2RfhrqK5wgX" wiki_name="MyYunoWiki" - port="666" ; Checks pkg_linter=1 setup_sub_dir=1 @@ -18,7 +17,7 @@ upgrade=1 backup_restore=1 multi_instance=1 - incorrect_path=1 + port_already_use=0 change_url=1 ;;; Options Email= diff --git a/conf/LocalSettings.php b/conf/LocalSettings.php index d46d8f2..ef48408 100644 --- a/conf/LocalSettings.php +++ b/conf/LocalSettings.php @@ -26,7 +26,7 @@ $wgSitename = "__WIKI_NAME__"; ## For more information on customizing the URLs ## (like /w/index.php/Page_title to /wiki/Page_title) please see: ## https://www.mediawiki.org/wiki/Manual:Short_URL -$wgScriptPath = "__PATH__"; +$wgScriptPath = "__MEDIAWIKI_PATH__"; ## The protocol and server name to use in fully-qualified URLs $wgServer = "https://__DOMAIN__"; diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..ee01dfc --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +MediaWiki is a free and open-source wiki software package written in PHP. It serves as the platform for Wikipedia and the other Wikimedia projects, used by hundreds of millions of people each month. MediaWiki is localised in over 350 languages and its reliability and robust feature set have earned it a large and vibrant community of third-party users and developers. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..218669d --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +MediaWiki est un progiciel wiki gratuit et open-source écrit en PHP. Il sert de plate-forme pour Wikipedia et les autres projets Wikimedia, utilisés par des centaines de millions de personnes chaque mois. MediaWiki est localisé dans plus de 350 langues et sa fiabilité et son ensemble de fonctionnalités robustes lui ont valu une communauté importante et dynamique d'utilisateurs et de développeurs tiers. diff --git a/manifest.json b/manifest.json index 78ad452..78634f6 100644 --- a/manifest.json +++ b/manifest.json @@ -31,7 +31,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" @@ -42,10 +42,6 @@ "example": "/wiki", "default": "/wiki" }, - { - "name": "admin", - "type": "user" - }, { "name": "is_public", "type": "boolean", @@ -65,6 +61,10 @@ "choices": ["fr", "en"], "default": "fr" }, + { + "name": "admin", + "type": "user" + }, { "name": "password", "type": "password", diff --git a/scripts/install b/scripts/install index 54817bf..0d161d3 100644 --- a/scripts/install +++ b/scripts/install @@ -13,9 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -25,14 +22,16 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH -admin=$YNH_APP_ARG_ADMIN -admin_password=$YNH_APP_ARG_PASSWORD is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE +admin=$YNH_APP_ARG_ADMIN +admin_password=$YNH_APP_ARG_PASSWORD wiki_name=$YNH_APP_ARG_WIKI_NAME app=$YNH_APP_INSTANCE_NAME +secret=$(ynh_string_random --length=64) + #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= @@ -51,10 +50,11 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url +ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=admin_password --value=$admin_password -ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=wiki_name --value=$wiki_name +ynh_app_setting_set --app=$app --key=secret --value=$secret #================================================= # STANDARD MODIFICATIONS @@ -71,7 +71,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Configuring system user..." --weight=2 # Create a system user -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CREATE A MYSQL DATABASE @@ -145,32 +145,21 @@ fi "$wiki_name" "$admin" #================================================= -# REPLACE CONFIGURATION SETTINGS +# ADD A CONFIGURATION #================================================= -cp ../conf/LocalSettings.php "$final_path/LocalSettings.php" - -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__WIKI_NAME__" --replace_string="$wiki_name" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__ADMIN__" --replace_string="$admin" +ynh_script_progression --message="Adding a configuration file..." if [ "$path_url" = "/" ]; then # MediaWiki expects a "" for the root URL which is typically assumed to be # "/" by other application packages. Therefore, we assume end-users will do # this as well and make sure to ensure an "" in all cases where "/" is # specified - ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__PATH__" --replace_string="" + mediawiki_path="" else - ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__PATH__" --replace_string="$path_url" + mediawiki_path="$path_url" fi -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__DOMAIN__" --replace_string="$domain" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__DB_NAME__" --replace_string="$db_name" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__DB_USER__" --replace_string="$db_name" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__DB_PWD__" --replace_string="$db_pwd" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__LANGUAGE__" --replace_string="$language" - -secret=$(ynh_string_random 64) -ynh_app_setting_set $app secret "$secret" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__SECRET__" --replace_string="$secret" +ynh_add_config --template="../conf/LocalSettings.php" --destination="$final_path/LocalSettings.php" "php$phpversion" "$final_path/maintenance/update.php" diff --git a/scripts/remove b/scripts/remove index 366f9ce..fb60878 100755 --- a/scripts/remove +++ b/scripts/remove @@ -32,14 +32,6 @@ ynh_script_progression --message="Removing the MySQL database..." --weight=4 # Remove a database if it exists, along with the associated user ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=10 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - #================================================= # REMOVE APP MAIN DIR #================================================= @@ -64,6 +56,14 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." --weight=10 + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index 7a5ac75..2b1d91b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -39,14 +39,15 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path \ + || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." +ynh_script_progression --message="Restoring the NGINX web server configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -56,7 +57,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Recreating the dedicated system user..." --weight=2 # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR diff --git a/scripts/upgrade b/scripts/upgrade index 44e56fa..a6d5a46 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,13 +18,15 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) +language=$(ynh_app_setting_get --app=$app --key=language) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) wiki_name=$(ynh_app_setting_get --app=$app --key=wiki_name) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +secret=$(ynh_app_setting_get --app=$app --key=secret) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) @@ -32,6 +34,7 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= # CHECK VERSION #================================================= +ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -80,6 +83,14 @@ if [ -z "$fpm_usage" ]; then ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi +# Removed in dec. 2020 +ldap_user=$(ynh_app_setting_get --app=$app --key=ldap_user) +if [[ -n "$ldap_user" ]]; then + yunohost user delete "$ldap_user" + ynh_app_setting_delete --app=$app --key=ldap_user + ynh_app_setting_delete --app=$app --key=ldap_password +fi + # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all @@ -87,23 +98,13 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi -if ! ynh_permission_exists --permission="admin"; then - # Create the required permissions - ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin -fi - -# Create a permission if needed -if ! ynh_permission_exists --permission="api"; then - ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" -fi - #================================================= # CREATE DEDICATED USER #================================================= ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -158,14 +159,6 @@ ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_ #================================================= # REMOVE LEGACY LDAP USER #================================================= -# Removed in dec. 2020 -ldap_user=$(ynh_app_setting_get --app=$app --key=ldap_user) -if [[ -n "$ldap_user" ]]; then - yunohost user delete "$ldap_user" - ynh_app_setting_delete --app=$app --key=ldap_user - ynh_app_setting_delete --app=$app --key=ldap_password -fi - #================================================= # STORE THE CONFIG FILE CHECKSUM #================================================= @@ -176,31 +169,17 @@ ynh_backup_if_checksum_is_different --file="$final_path/LocalSettings.php" #================================================= ynh_script_progression --message="Upgrading application files..." --weight=4 -rm "$final_path/LocalSettings.php" -cp ../conf/LocalSettings.php "$final_path/LocalSettings.php" - -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__WIKI_NAME__" --replace_string="$wiki_name" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__ADMIN__" --replace_string="$admin" - if [ "$path_url" = "/" ]; then # MediaWiki expects a "" for the root URL which is typically assumed to be # "/" by other application packages. Therefore, we assume end-users will do # this as well and make sure to ensure an "" in all cases where "/" is # specified - ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__PATH__" --replace_string="" + mediawiki_path="" else - ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__PATH__" --replace_string="$path_url" + mediawiki_path="$path_url" fi -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__DOMAIN__" --replace_string="$domain" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__DB_NAME__" --replace_string="$db_name" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__DB_USER__" --replace_string="$db_name" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__DB_PWD__" --replace_string="$db_pwd" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__LANGUAGE__" --replace_string="$language" - -secret=$(ynh_string_random 64) -ynh_app_setting_set $app secret "$secret" -ynh_replace_string --target_file="$final_path/LocalSettings.php" --match_string="__SECRET__" --replace_string="$secret" +ynh_add_config --template="../conf/LocalSettings.php" --destination="$final_path/LocalSettings.php" # Check for admin password being too short for the new mediawiki requirements password_length=$(ynh_app_setting_get --app=$app --key=admin_password | awk '{print length}') From b9f8f19b865c164bd9454ff7da8d5baa88d048f4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 13 Apr 2022 01:31:52 +0200 Subject: [PATCH 2/8] more example_ynh --- conf/nginx.conf | 1 - conf/php-fpm.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 898b35f..c5d1085 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,7 +10,6 @@ location __PATH__/ { index index.php; try_files $uri $uri/ @rewrite___NAME__; - location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 52dfead..238913c 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -229,7 +229,7 @@ pm.max_spare_servers = 3 ; last request memory: 0 ; ; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/__PHPVERSION__/fpm/status.html +; It's available in: /usr/share/php/7.0/fpm/status.html ; ; Note: The value must start with a leading slash (/). The value can be ; anything, but it may not be a good idea to use the .php extension or it From 0aae8b5f31073f2db639b9c73c2d11e9dffc5f13 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 13 Apr 2022 01:34:10 +0200 Subject: [PATCH 3/8] Upgrade to 1.37.2~ynh1 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- conf/ldap_authentication2.src | 4 ++-- conf/ldap_authorization.src | 4 ++-- conf/ldap_groups.src | 4 ++-- conf/ldap_provider.src | 4 ++-- conf/ldap_userinfo.src | 4 ++-- conf/pluggable_auth.src | 4 ++-- manifest.json | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 0e7c87f..79dbee7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Wiki package originally for use on Wikipedia -**Shipped version:** 1.37.1~ynh1 +**Shipped version:** 1.37.2~ynh1 **Demo:** https://www.wikipedia.org/, https://www.mediawiki.org/wiki/Project:Sandbox diff --git a/README_fr.md b/README_fr.md index ffed900..bfaf6c3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Wiki développé à l’origine pour Wikipédia -**Version incluse :** 1.37.1~ynh1 +**Version incluse :** 1.37.2~ynh1 **Démo :** https://www.wikipedia.org/, https://www.mediawiki.org/wiki/Project:Sandbox diff --git a/conf/app.src b/conf/app.src index 7172b3b..d0d5d57 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.wikimedia.org/mediawiki/1.37/mediawiki-1.37.1.tar.gz -SOURCE_SUM=53436e92dc30adb14b6797d8139d20696a5461525f38a375c83e435cf042e2e7 +SOURCE_URL=https://github.com/wikimedia/mediawiki/archive/refs/tags/1.37.2.tar.gz +SOURCE_SUM=97ea2edd24646c66100b22c76ad29b6b909c37d2b338d9187ad3e6a47aadb52c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/ldap_authentication2.src b/conf/ldap_authentication2.src index 5697f84..bf91734 100644 --- a/conf/ldap_authentication2.src +++ b/conf/ldap_authentication2.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthentication2-REL1_35-dabdf22.tar.gz -SOURCE_SUM=e53b1bd791b288e0531bdec5ca58386b7d7287899f4677073bf5c93a2b778b3f +SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthentication2-REL1_38-502759b.tar.gz +SOURCE_SUM=2212a2baa6b070d08fe36b8f3cf236a76a7aa58cdc5953c65a9a66d16cee3dc6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/ldap_authorization.src b/conf/ldap_authorization.src index 0417ad8..3553cd5 100644 --- a/conf/ldap_authorization.src +++ b/conf/ldap_authorization.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthorization-REL1_37-ba9cdb5.tar.gz -SOURCE_SUM=b5134407376f33e0c43c7c85fb965757a6ffd83d13280ff26e84d1ced4747bb8 +SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthorization-REL1_38-068c368.tar.gz +SOURCE_SUM=402949ab8a5e4d636d7f510194909c38199b189385c6bce794703d0cb8f8272d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/ldap_groups.src b/conf/ldap_groups.src index cfc4b8e..248aeb2 100644 --- a/conf/ldap_groups.src +++ b/conf/ldap_groups.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPGroups-REL1_37-f622040.tar.gz -SOURCE_SUM=e198ac995b383d461086c848fb6adf1064b593647fd61199daa22af56b60df47 +SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPGroups-REL1_38-f4edda5.tar.gz +SOURCE_SUM=80101ec40e3dad5bc206f95baf5391a07e0957bac399037500602c84fbf5f070 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/ldap_provider.src b/conf/ldap_provider.src index 954a2fd..13d9217 100644 --- a/conf/ldap_provider.src +++ b/conf/ldap_provider.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPProvider-REL1_35-a801161.tar.gz -SOURCE_SUM=e0ef72d68ba6c89123212bdd06a3739b4f733d3b45e5caa3a0a295a8225a15ea +SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPProvider-REL1_38-78f283a.tar.gz +SOURCE_SUM=a0d72d6da668c014b665f8f2263d0008a5abf636228888ddf6d6b4a5ad0f9031 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/ldap_userinfo.src b/conf/ldap_userinfo.src index 69d7157..616eb62 100644 --- a/conf/ldap_userinfo.src +++ b/conf/ldap_userinfo.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPUserInfo-REL1_37-a4b1bcf.tar.gz -SOURCE_SUM=0e236e5d0498079c722e1bcff398b7e46ef5a165ebe0f201ebbc6195d066746e +SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPUserInfo-REL1_38-f4255f4.tar.gz +SOURCE_SUM=802e13ce3e8da41191f6b7969ca7120cf044ff266b76ab877588be34cb7e97c4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/pluggable_auth.src b/conf/pluggable_auth.src index daac1a4..5298ac2 100644 --- a/conf/pluggable_auth.src +++ b/conf/pluggable_auth.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/PluggableAuth-REL1_37-5757eca.tar.gz -SOURCE_SUM=d81edf9033db3a98bc51384b43f6926dfda78b456844db31d800f6d5884511e7 +SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/PluggableAuth-REL1_38-b537019.tar.gz +SOURCE_SUM=b1919f93578af63135efb13d7b04b6d028e8bd6a254e669b873ca978a6ad8c53 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 78634f6..a801206 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Wiki package originally for use on Wikipedia", "fr": "Wiki développé à l’origine pour Wikipédia" }, - "version": "1.37.1~ynh1", + "version": "1.37.2~ynh1", "url": "https://www.mediawiki.org", "upstream": { "license": "GPL-2.0-or-later", From bbb434e316605d4dd97de81cbb64a2abbca4548b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 13 Apr 2022 01:35:08 +0200 Subject: [PATCH 4/8] charset --- doc/DESCRIPTION_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 218669d..2023d07 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1 @@ -MediaWiki est un progiciel wiki gratuit et open-source écrit en PHP. Il sert de plate-forme pour Wikipedia et les autres projets Wikimedia, utilisés par des centaines de millions de personnes chaque mois. MediaWiki est localisé dans plus de 350 langues et sa fiabilité et son ensemble de fonctionnalités robustes lui ont valu une communauté importante et dynamique d'utilisateurs et de développeurs tiers. +MediaWiki est un progiciel wiki gratuit et open-source écrit en PHP. Il sert de plate-forme pour Wikipedia et les autres projets Wikimedia, utilisés par des centaines de millions de personnes chaque mois. MediaWiki est localisé dans plus de 350 langues et sa fiabilité et son ensemble de fonctionnalités robustes lui ont valu une communauté importante et dynamique d'utilisateurs et de développeurs tiers. From 19fcbe14873f5c76793b67fc113c986732934b35 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Apr 2022 23:35:13 +0000 Subject: [PATCH 5/8] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 79dbee7..275edf0 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Wiki package originally for use on Wikipedia +MediaWiki is a free and open-source wiki software package written in PHP. It serves as the platform for Wikipedia and the other Wikimedia projects, used by hundreds of millions of people each month. MediaWiki is localised in over 350 languages and its reliability and robust feature set have earned it a large and vibrant community of third-party users and developers. + **Shipped version:** 1.37.2~ynh1 diff --git a/README_fr.md b/README_fr.md index bfaf6c3..90d18c2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Wiki développé à l’origine pour Wikipédia +MediaWiki est un progiciel wiki gratuit et open-source écrit en PHP. Il sert de plate-forme pour Wikipedia et les autres projets Wikimedia, utilisés par des centaines de millions de personnes chaque mois. MediaWiki est localisé dans plus de 350 langues et sa fiabilité et son ensemble de fonctionnalités robustes lui ont valu une communauté importante et dynamique d'utilisateurs et de développeurs tiers. + **Version incluse :** 1.37.2~ynh1 From dd638d5992083572495a499b2717f8f9ae928a20 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 13 Apr 2022 01:37:00 +0200 Subject: [PATCH 6/8] Cleanup disclaimer --- doc/DISCLAIMER.md | 9 --------- doc/DISCLAIMER_fr.md | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e00c18b..75100c0 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -14,12 +14,3 @@ Some of the extensions are marked as "disabled and unused" because they are not * Is LDAP supported?: **yes** * Is HTTP auth supported?: **no** * Can the app be used by multiple users?: **yes** - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mediawiki.svg)](https://ci-apps.yunohost.org/ci/apps/mediawiki/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mediawiki.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mediawiki/) - -### How to configure this app: - -* Through the admin panel: Log in then click on `Preferences` diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index f82760f..9b0647b 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -14,13 +14,3 @@ Certaines extensions sont marquées comme "désactivées et inutilisées" car el * L'authentification LDAP est-elle prise en charge ? **Oui** * L'authentification HTTP est-elle prise en charge ? **Non** * L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** - - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mediawiki.svg)](https://ci-apps.yunohost.org/ci/apps/mediawiki/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mediawiki.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mediawiki/) - -### Comment configurer cette application : - -* Via le panneau d'administration : Connectez-vous puis cliquez sur `Préférences` From 7086b5f38228f9ee6a2631072f8cb46c97638e82 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Apr 2022 23:37:05 +0000 Subject: [PATCH 7/8] Auto-update README --- README.md | 9 --------- README_fr.md | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/README.md b/README.md index 275edf0..591277b 100644 --- a/README.md +++ b/README.md @@ -45,15 +45,6 @@ Some of the extensions are marked as "disabled and unused" because they are not * Is HTTP auth supported?: **no** * Can the app be used by multiple users?: **yes** -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mediawiki.svg)](https://ci-apps.yunohost.org/ci/apps/mediawiki/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mediawiki.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mediawiki/) - -### How to configure this app: - -* Through the admin panel: Log in then click on `Preferences` - ## Documentation and resources * Official app website: https://www.mediawiki.org diff --git a/README_fr.md b/README_fr.md index 90d18c2..e44a73b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -41,16 +41,6 @@ Certaines extensions sont marquées comme "désactivées et inutilisées" car el * L'authentification HTTP est-elle prise en charge ? **Non** * L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mediawiki.svg)](https://ci-apps.yunohost.org/ci/apps/mediawiki/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mediawiki.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mediawiki/) - -### Comment configurer cette application : - -* Via le panneau d'administration : Connectez-vous puis cliquez sur `Préférences` - ## Documentations et ressources * Site officiel de l'app : https://www.mediawiki.org From b8da61f51823f418840f6eaaab4dc2e02a58bb69 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 13 Apr 2022 19:26:56 +0200 Subject: [PATCH 8/8] fix app source --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index d0d5d57..672e632 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/wikimedia/mediawiki/archive/refs/tags/1.37.2.tar.gz -SOURCE_SUM=97ea2edd24646c66100b22c76ad29b6b909c37d2b338d9187ad3e6a47aadb52c +SOURCE_URL=https://releases.wikimedia.org/mediawiki/1.37/mediawiki-1.37.2.tar.gz +SOURCE_SUM=583f074bcafcec17da50142a56f5bbfde5c3366977d61d912d7e56fcca3bda1b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true