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

Merge pull request #15 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2022-06-03 21:34:20 +02:00 committed by GitHub
commit debd32b5d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 46 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Omeka S for YunoHost # Omeka S for YunoHost
[![Integration level](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) [![Integration level](https://dash.yunohost.org/integration/omeka-s.svg)](https://dash.yunohost.org/appci/app/omeka-s) ![Working status](https://ci-apps.yunohost.org/ci/badges/omeka-s.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/omeka-s.maintain.svg)
[![Install Omeka S with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=omeka-s) [![Install Omeka S with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=omeka-s)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -22,31 +22,32 @@ Omeka S is a web publication system for universities, galleries, libraries, arch
- Connect to the semantic Web - Connect to the semantic Web
- Share with DPLA - Share with DPLA
**Shipped version:** 3.2.0~ynh1 **Shipped version:** 3.2.1~ynh1
**Demo:** https://omeka.org/s/download/#sandbox **Demo:** https://omeka.org/s/download/#sandbox
## Screenshots ## Screenshots
![](./doc/screenshots/omeka-s.png) ![Screenshot of Omeka S](./doc/screenshots/omeka-s.png)
## Documentation and resources ## Documentation and resources
* Official app website: https://omeka.org/s/ * Official app website: <https://omeka.org/s/>
* Official user documentation: https://omeka.org/s/docs/user-manual/ * Official user documentation: <https://omeka.org/s/docs/user-manual/>
* Upstream app code repository: https://github.com/omeka/omeka-s * Upstream app code repository: <https://github.com/omeka/omeka-s>
* YunoHost documentation for this app: https://yunohost.org/app_omeka-s * YunoHost documentation for this app: <https://yunohost.org/app_omeka-s>
* Report a bug: https://github.com/YunoHost-Apps/omeka-s_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/omeka-s_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug
or or
sudo yunohost app upgrade omeka-s -u https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug sudo yunohost app upgrade omeka-s -u https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug
``` ```
**More info regarding app packaging:** https://yunohost.org/packaging_apps **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

27
README_fr.md
View file

@ -1,10 +1,14 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# Omeka S pour YunoHost # Omeka S pour YunoHost
[![Niveau d'intégration](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) [![Niveau d'intégration](https://dash.yunohost.org/integration/omeka-s.svg)](https://dash.yunohost.org/appci/app/omeka-s) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/omeka-s.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/omeka-s.maintain.svg)
[![Installer Omeka S avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=omeka-s) [![Installer Omeka S avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=omeka-s)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer Omeka S rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d'installer Omeka S rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -18,31 +22,32 @@ Omeka S is a web publication system for universities, galleries, libraries, arch
- Connect to the semantic Web - Connect to the semantic Web
- Share with DPLA - Share with DPLA
**Version incluse :** 3.2.0~ynh1 **Version incluse :** 3.2.1~ynh1
**Démo :** https://omeka.org/s/download/#sandbox **Démo :** https://omeka.org/s/download/#sandbox
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/omeka-s.png) ![Capture d'écran de Omeka S](./doc/screenshots/omeka-s.png)
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : https://omeka.org/s/ * Site officiel de l'app : <https://omeka.org/s/>
* Documentation officielle utilisateur : https://omeka.org/s/docs/user-manual/ * Documentation officielle utilisateur : <https://omeka.org/s/docs/user-manual/>
* Dépôt de code officiel de l'app : https://github.com/omeka/omeka-s * Dépôt de code officiel de l'app : <https://github.com/omeka/omeka-s>
* Documentation YunoHost pour cette app : https://yunohost.org/app_omeka-s * Documentation YunoHost pour cette app : <https://yunohost.org/app_omeka-s>
* Signaler un bug : https://github.com/YunoHost-Apps/omeka-s_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/omeka-s_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing). Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade omeka-s -u https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug sudo yunohost app upgrade omeka-s -u https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug
``` ```
**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps **Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/omeka/omeka-s/releases/download/v3.2.0/omeka-s-3.2.0.zip SOURCE_URL=https://github.com/omeka/omeka-s/releases/download/v3.2.1/omeka-s-3.2.1.zip
SOURCE_SUM=7fe089d818595db15e06225fa48b1bfbff1787de8fb299c36aac5800929f8252 SOURCE_SUM=54310c4310a1b0270e158930a3e4292e4411406719dcdc32c67ec57b5ff2a624
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

2
conf/database.ini.default
View file

@ -1,4 +1,4 @@
user = "__DB_NAME__" user = "__DB_USER__"
password = "__DB_PWD__" password = "__DB_PWD__"
dbname = "__DB_NAME__" dbname = "__DB_NAME__"
host = "localhost" host = "localhost"

2
conf/nginx.conf
View file

@ -42,5 +42,5 @@ location __PATH__/ {
} }
location @__APP__ { location @__APP__ {
rewrite ^(.*)$ __PATH__/index.php last; rewrite __PATH__/(.+)$ __PATH__/index.php?page=$1 last;
} }

4
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Web publication system for universities, galleries, libraries, archives, and museums", "en": "Web publication system for universities, galleries, libraries, archives, and museums",
"fr": "Système de publication Web pour les universités, les galeries, les bibliothèques, les archives et les musées" "fr": "Système de publication Web pour les universités, les galeries, les bibliothèques, les archives et les musées"
}, },
"version": "3.2.0~ynh1", "version": "3.2.1~ynh1",
"url": "https://omeka.org/", "url": "https://omeka.org/",
"upstream": { "upstream": {
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
@ -26,7 +26,7 @@
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
"nginx", "nginx",
"php7.3-fpm", "php8.0-fpm",
"mysql" "mysql"
], ],
"arguments": { "arguments": {

2
scripts/_common.sh
View file

@ -4,7 +4,7 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
YNH_PHP_VERSION="7.3" YNH_PHP_VERSION="8.0"
pkg_dependencies="imagemagick php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml" pkg_dependencies="imagemagick php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml"

1
scripts/install
View file

@ -23,6 +23,7 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH path_url=$YNH_APP_ARG_PATH
is_public=$YNH_APP_ARG_IS_PUBLIC is_public=$YNH_APP_ARG_IS_PUBLIC
phpversion=$YNH_PHP_VERSION
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME

20
scripts/restore
View file

@ -69,16 +69,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=5
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
# Recreate a dedicated php-fpm config
ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
#================================================= #=================================================
# SPECIFIC RESTORATION # SPECIFIC RESTORATION
#================================================= #=================================================
@ -89,6 +79,16 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=1
# Define and install dependencies # Define and install dependencies
ynh_install_app_dependencies $pkg_dependencies ynh_install_app_dependencies $pkg_dependencies
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=5
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
# Recreate a dedicated php-fpm config
ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
#================================================= #=================================================
# RESTORE THE MYSQL DATABASE # RESTORE THE MYSQL DATABASE
#================================================= #=================================================

11
scripts/upgrade
View file

@ -80,18 +80,9 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_script_progression --message="Upgrading source files..." --weight=1
mv "$final_path" "$final_path.old"
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/local.config.php $final_path/config/database.ini $final_path/modules $final_path/themes $final_path/files"
cp "$final_path.old/config/local.config.php" "$final_path/config/local.config.php"
cp "$final_path.old/config/database.ini" "$final_path/config/database.ini"
cp -r "$final_path.old/modules" "$final_path/modules"
cp -r "$final_path.old/themes" "$final_path/themes"
cp -r "$final_path.old/files" "$final_path/files"
# delete temp directory
ynh_secure_remove "$final_path.old"
fi fi
chmod 750 "$final_path" chmod 750 "$final_path"