From 7f071cfc076f161074e790b3ded1382b7015b1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Apr 2021 07:53:26 +0200 Subject: [PATCH] Testing (#39) * Upgrade to version 3.10.3 --- README.md | 12 +++++----- README_fr.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ check_process | 5 +++- conf/app.src | 4 ++-- manifest.json | 20 ++-------------- scripts/upgrade | 4 ++-- 6 files changed, 78 insertions(+), 29 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index 6bdf324..28216db 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,15 @@ [![Integration level](https://dash.yunohost.org/integration/moodle.svg)](https://dash.yunohost.org/appci/app/moodle) ![](https://ci-apps.yunohost.org/ci/badges/moodle.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/moodle.maintain.svg) [![Install Moodle with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moodle) +*[Lire ce readme en français.](./README_fr.md)* + > *This package allows you to install Moodle quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -[Moodle](https://moodle.org) is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments. +[Moodle](https://moodle.org) is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments. Moodle is widely used around the world by universities, schools, companies and all manner of organisations and individuals. -Moodle is widely used around the world by universities, schools, companies and all manner of organisations and individuals. - -**Shipped version:** 3.10.2 +**Shipped version:** 3.10.3 ## Screenshots @@ -38,8 +38,8 @@ How to configure this app: by an admin panel. #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/moodle%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/moodle/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/moodle%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/moodle/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/moodle.svg)](https://ci-apps.yunohost.org/ci/apps/moodle/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/moodle.svg)](https://ci-apps-arm.yunohost.org/ci/apps/moodle/) ## Links diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..8ccc57f --- /dev/null +++ b/README_fr.md @@ -0,0 +1,62 @@ +# Moodle pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/moodle.svg)](https://dash.yunohost.org/appci/app/moodle) ![](https://ci-apps.yunohost.org/ci/badges/moodle.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/moodle.maintain.svg) +[![Installer Moodle avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moodle) + +*[Read this readme in english.](./README.md)* + +> *Ce package vous permet d'installer Moodle rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* + +## Vue d'ensemble +[Moodle](https://moodle.org) est une plateforme d'apprentissage conçue pour fournir aux enseignants, aux administrateurs et aux apprenants un système unique robuste, sécurisé et intégré pour créer des environnements d'apprentissage personnalisés. Moodle est largement utilisé dans le monde entier par les universités, les écoles, les entreprises et toutes sortes d'organisations et d'individus. + +**Version incluse :** 3.10.3 + +## Captures d'écran + +![](https://upload.wikimedia.org/wikipedia/commons/3/36/Moodle_2.0_on_Firefox_4.0.png) + +## Démo + +* [Démo officielle](https://sandbox.moodledemo.net/) + +## Configuration + +* Comment configurer cette application : via le panneau d'administration. + +## Documentation + +* Documentation officielle : https://docs.moodle.org/39/en/Main_page + +## Caractéristiques spécifiques YunoHost + +#### Support multi-utilisateur + +* L'authentification LDAP et HTTP est-elle prise en charge ? **Oui** +* 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/moodle.svg)](https://ci-apps.yunohost.org/ci/apps/moodle/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/moodle.svg)](https://ci-apps-arm.yunohost.org/ci/apps/moodle/) + +## Liens + + * Signaler un bug :https://github.com/YunoHost-Apps/moodle_ynh/issues + * Site de l'application : https://moodle.org/ + * Dépôt de l'application principale : http://git.moodle.org/ - https://github.com/moodle/moodle + * Site web YunoHost : https://yunohost.org/ + +--- + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/moodle_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/moodle_ynh/tree/testing --debug +ou +sudo yunohost app upgrade moodle -u https://github.com/YunoHost-Apps/moodle_ynh/tree/testing --debug +``` diff --git a/check_process b/check_process index 004eec0..209432d 100644 --- a/check_process +++ b/check_process @@ -14,9 +14,10 @@ upgrade=1 # 3.8.2~ynh2 upgrade=1 from_commit=3bdecdeabdcaaf1fdfade6e5b7dcfa30704c665c + # 3.10.2~ynh1 + upgrade=1 from_commit=499ac857a9e80bbf56c93e448086e84e09e97ac6 backup_restore=1 multi_instance=1 - port_already_use=0 change_url=0 ;;; Options Email= @@ -24,3 +25,5 @@ Notification=none ;;; Upgrade options ; commit=3bdecdeabdcaaf1fdfade6e5b7dcfa30704c665c name=3.8.2~ynh2 + ; commit=499ac857a9e80bbf56c93e448086e84e09e97ac6 + name=3.10.2~ynh1 \ No newline at end of file diff --git a/conf/app.src b/conf/app.src index 012418c..621f625 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/moodle/moodle/archive/v3.10.2.zip -SOURCE_SUM=6c54328ca6c40fb5cb4eb66a449b3c5fe7fe03bb04ab21df1156ba3c9c2ed1c6 +SOURCE_URL=https://github.com/moodle/moodle/archive/v3.10.3.zip +SOURCE_SUM=f92e603a261d013b1c6f2956d1511b7e5d65ac1e9f05de77a94183bc3faaba7d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 73293d3..f668490 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online learning platform", "fr": "Plateforme d'apprentissage en ligne" }, - "version": "3.10.2~ynh1", + "version": "3.10.3~ynh1", "url": "https://moodle.org/", "license": "GPL-3.0-or-later", "maintainer": { @@ -14,7 +14,7 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 4.0.0" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ @@ -26,38 +26,22 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for Moodle", - "fr": "Choisissez un nom de domaine pour Moodle" - }, "example": "example.com" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Moodle", - "fr": "Choisissez un chemin pour Moodle" - }, "example": "/moodle", "default": "/moodle" }, { "name": "admin", "type": "user", - "ask": { - "en": "Choose the Moodle administrator (must be an existing YunoHost user)", - "fr": "Administrateur du site (doit être un utilisateur YunoHost existant)" - }, "example": "johndoe" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, "default": true } ] diff --git a/scripts/upgrade b/scripts/upgrade index cf1a4e0..7cc7354 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,7 +36,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If the admin is not defined, We can't upgrade this app if [ -z "$admin" ]; then - ynh_die --message="This app can't be upgraded from a very old version of the package. Please remove and reinstall moodle_ynh" + ynh_die --message="This app can't be upgraded from a very old version of the package. Please remove and reinstall Moodle" fi # Cleaning legacy permissions @@ -79,7 +79,7 @@ fi #================================================= ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #=================================================