Merge pull request #38 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lee el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)

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.1.0~ynh1
+**Shipped version:** 4.1.0~ynh2
 
 **Demo:** <https://omeka.org/s/download/#sandbox>
 

README_es.md

@@ -0,0 +1,54 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Omeka S para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/omeka-s.svg)](https://dash.yunohost.org/appci/app/omeka-s) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/omeka-s.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/omeka-s.maintain.svg)
+
+[![Instalar Omeka S con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=omeka-s)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarOmeka S rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+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.
+
+### Features
+
+- Connect to the semantic Web
+- Share with DPLA
+
+**Versión actual:** 4.1.0~ynh2
+
+**Demo:** <https://omeka.org/s/download/#sandbox>
+
+## Capturas
+
+![Captura de Omeka S](./doc/screenshots/omeka-s.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://omeka.org/s/>
+- Documentación usuario oficial: <https://omeka.org/s/docs/user-manual/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/omeka/omeka-s>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/omeka-s>
+- Reportar un error: <https://github.com/YunoHost-Apps/omeka-s_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade omeka-s -u https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.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
 
-**Paketatutako bertsioa:** 4.1.0~ynh1
+**Paketatutako bertsioa:** 4.1.0~ynh2
 
 **Demoa:** <https://omeka.org/s/download/#sandbox>
 

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.1.0~ynh1
+**Version incluse :** 4.1.0~ynh2
 
 **Démo :** <https://omeka.org/s/download/#sandbox>
 

README_gl.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
 
-**Versión proporcionada:** 4.1.0~ynh1
+**Versión proporcionada:** 4.1.0~ynh2
 
 **Demo:** <https://omeka.org/s/download/#sandbox>
 

README_zh_Hans.md

@@ -3,7 +3,7 @@
 请勿手动编辑。
 -->
 
-# YunoHost 的 Omeka S
+# YunoHost 上的 Omeka S
 
 [![集成程度](https://dash.yunohost.org/integration/omeka-s.svg)](https://dash.yunohost.org/appci/app/omeka-s) ![工作状态](https://ci-apps.yunohost.org/ci/badges/omeka-s.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/omeka-s.maintain.svg)
 
@@ -23,7 +23,7 @@ Omeka S is a web publication system for universities, galleries, libraries, arch
 - Connect to the semantic Web
 - Share with DPLA
 
-**分发版本：** 4.1.0~ynh1
+**分发版本：** 4.1.0~ynh2
 
 **演示：** <https://omeka.org/s/download/#sandbox>
 

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.1.0~ynh1"
+version = "4.1.0~ynh2"
 
 maintainers = ["eric_G"]
 
@@ -60,7 +60,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server, imagemagick, php8.2-mysql, php8.2-gd, php8.2-mbstring, php8.2-xml"
+    packages = "mariadb-server, imagemagick, php8.2-mysql, php8.2-gd, php8.2-mbstring, php8.2-xml, php8.2-imagick"
 
     [resources.database]
     type = "mysql"

scripts/backup

@@ -22,15 +22,11 @@ ynh_print_info --message="Declaring files to be backed up..."
 ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# BACKUP THE PHP-FPM CONFIGURATION
-#=================================================
-
 ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================

scripts/install

@@ -52,11 +52,18 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/database.ini.default" --destination="$install_dir/config/database.ini"
+ynh_add_config --template="database.ini.default" --destination="$install_dir/config/database.ini"
 
 chmod 400 "$install_dir/config/database.ini"
 chown $app "$install_dir/config/database.ini"
 
+#=================================================
+# TWEAK IMAGICK CONFIGURATION TO ALLOW PDF THUMBNAILS GENERATION 
+#=================================================
+ynh_script_progression --message="Tweaking imagemagick conf to allow generation of thumbnails PDF" --weight=1
+
+sed -i 's/^\s*<policy.*PDF.*/<!--\0-->/g' /etc/ImageMagick-*/policy.xml
+
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -43,6 +43,13 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
+#=================================================
+# TWEAK IMAGICK CONFIGURATION TO ALLOW PDF THUMBNAILS GENERATION 
+#=================================================
+ynh_script_progression --message="Tweaking imagemagick conf to allow generation of thumbnails PDF" --weight=1
+
+sed -i 's/^\s*<policy.*PDF.*/<!--\0-->/g' /etc/ImageMagick-*/policy.xml
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================

scripts/upgrade

@@ -52,6 +52,13 @@ ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
 ynh_add_nginx_config
 
+#=================================================
+# TWEAK IMAGICK CONFIGURATION TO ALLOW PDF THUMBNAILS GENERATION 
+#=================================================
+ynh_script_progression --message="Tweaking imagemagick conf to allow generation of thumbnails PDF" --weight=1
+
+sed -i 's/^\s*<policy.*PDF.*/<!--\0-->/g' /etc/ImageMagick-*/policy.xml
+
 #=================================================
 # END OF SCRIPT
 #=================================================

tests.toml

@@ -6,4 +6,4 @@ test_format = 1.0
     # Commits to test upgrade from
     # -------------------------------
 
-    test_upgrade_from.894f1eb9.name = "Upgrade from 3.0.2"
+    test_upgrade_from.1fd11805251707b295840f1c62def7efa2becc70.name = "Upgrade from 4.0.4"