From bcd23df8382d52c8f0bdfb1ba0dec0f0b4d28dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 4 Jul 2023 11:24:20 +0200 Subject: [PATCH 1/6] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e3424d5..c09c029 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ userdoc = "https://omeka.org/s/docs/user-manual/" code = "https://github.com/omeka/omeka-s" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = false From d92a7f7382e21f85db086aacad95698e17b19aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 8 Jul 2023 21:29:17 +0200 Subject: [PATCH 2/6] cleaning --- doc/DESCRIPTION_fr.md | 6 ++++++ scripts/restore | 1 - scripts/upgrade | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..6431091 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,6 @@ +Omeka S est un système de publication Web pour les universités, les galeries, les bibliothèques, les archives et les musées. Il consiste en un réseau local d'expositions organisées de manière indépendante partageant un pool d'éléments, de médias et de leurs métadonnées construit en collaboration. + +### Caractéristiques + +- Se connecter au Web sémantique +- Partager avec DPLA \ No newline at end of file diff --git a/scripts/restore b/scripts/restore index e22dd71..cd1ea62 100755 --- a/scripts/restore +++ b/scripts/restore @@ -40,7 +40,6 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 2ad97ae..2fb3a41 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,7 +55,7 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint ynh_add_nginx_config From 9d792e761f553c7c4a8ce18d9e3ee3b6922c3caa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 8 Jul 2023 19:29:25 +0000 Subject: [PATCH 3/6] Auto-update README --- README_fr.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README_fr.md b/README_fr.md index c1ac3a9..47a8061 100755 --- a/README_fr.md +++ b/README_fr.md @@ -16,12 +16,12 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Omeka S is a web publication system for universities, galleries, libraries, archives, and museums. It consists of a local network of independently curated exhibits sharing a collaboratively built pool of items, media, and their metadata. +Omeka S est un système de publication Web pour les universités, les galeries, les bibliothèques, les archives et les musées. Il consiste en un réseau local d'expositions organisées de manière indépendante partageant un pool d'éléments, de médias et de leurs métadonnées construit en collaboration. -### Features +### Caractéristiques -- Connect to the semantic Web -- Share with DPLA +- Se connecter au Web sémantique +- Partager avec DPLA **Version incluse :** 4.0.1~ynh3 From 81cd13644da7c75fba4e3f4efb482ca1a54b8906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 8 Jul 2023 21:30:16 +0200 Subject: [PATCH 4/6] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index c09c029..5d63ddf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,7 +23,7 @@ multi_instance = true ldap = false sso = false disk = "50M" -ram.build = "50M" +ram.build = "500M" ram.runtime = "50M" [install] From 54ca375b9cba11c6b3406d29476d0429ce042d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 4 Aug 2023 22:26:14 +0200 Subject: [PATCH 5/6] fix --- manifest.toml | 8 ++++---- scripts/upgrade | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5d63ddf..580d2a9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Omeka S" description.en = "Web publication system for universities, galleries, libraries, archives, and museums" description.fr = "Système de publication Web pour les universités, les galeries, les bibliothèques, les archives et les musées" -version = "4.0.1~ynh3" +version = "4.0.3~ynh1" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ userdoc = "https://omeka.org/s/docs/user-manual/" code = "https://github.com/omeka/omeka-s" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/omeka/omeka-s/releases/download/v4.0.1/omeka-s-4.0.1.zip" - sha256 = "2d682b77c95bd9d0ab0a846527b6351acaced571c293b637e731ff7f0193ba37" + url = "https://github.com/omeka/omeka-s/releases/download/v4.0.3/omeka-s-4.0.3.zip" + sha256 = "a9cdca0552c8e3c42fcee7c7a9686b0b04a01f55dfa5b47d223285c0e91660e3" autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/upgrade b/scripts/upgrade index 2fb3a41..6b60d01 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -44,7 +44,6 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --keep="config/local.config.php config/database.ini modules themes files" - fi chmod -R o-rwx "$install_dir" From f72146fdc16f29d556f569a8a0cd6c8ba42b094c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 4 Aug 2023 20:26:19 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0975793..8215b6c 100755 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Omeka S is a web publication system for universities, galleries, libraries, arch - Connect to the semantic Web - Share with DPLA -**Shipped version:** 4.0.1~ynh3 +**Shipped version:** 4.0.3~ynh1 **Demo:** https://omeka.org/s/download/#sandbox diff --git a/README_fr.md b/README_fr.md index 47a8061..6aee61a 100755 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ Omeka S est un système de publication Web pour les universités, les galeries, - Se connecter au Web sémantique - Partager avec DPLA -**Version incluse :** 4.0.1~ynh3 +**Version incluse :** 4.0.3~ynh1 **Démo :** https://omeka.org/s/download/#sandbox