Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing #39

Merged
merged 11 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ALL_README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# All available README files by language

- [Read the README in English](README.md)
- [Lee el README en español](README_es.md)
- [Lea 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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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~ynh2
**Shipped version:** 4.1.0~ynh3

**Demo:** <https://omeka.org/s/download/#sandbox>

Expand Down
2 changes: 1 addition & 1 deletion README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 actual:** 4.1.0~ynh2
**Versión actual:** 4.1.0~ynh3

**Demo:** <https://omeka.org/s/download/#sandbox>

Expand Down
2 changes: 1 addition & 1 deletion README_eu.md
Original file line number Diff line number Diff line change
Expand Up @@ -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~ynh2
**Paketatutako bertsioa:** 4.1.0~ynh3

**Demoa:** <https://omeka.org/s/download/#sandbox>

Expand Down
2 changes: 1 addition & 1 deletion README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -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~ynh2
**Version incluse :** 4.1.0~ynh3

**Démo :** <https://omeka.org/s/download/#sandbox>

Expand Down
2 changes: 1 addition & 1 deletion README_gl.md
Original file line number Diff line number Diff line change
Expand Up @@ -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~ynh2
**Versión proporcionada:** 4.1.0~ynh3

**Demo:** <https://omeka.org/s/download/#sandbox>

Expand Down
2 changes: 1 addition & 1 deletion README_zh_Hans.md
Original file line number Diff line number Diff line change
Expand Up @@ -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~ynh2
**分发版本:** 4.1.0~ynh3

**演示:** <https://omeka.org/s/download/#sandbox>

Expand Down
14 changes: 12 additions & 2 deletions manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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~ynh2"
version = "4.1.0~ynh3"

maintainers = ["eric_G"]

Expand Down Expand Up @@ -52,15 +52,25 @@ ram.runtime = "50M"
sha256 = "bc0f87c07906c1aef1538b8cd1ab1ee9c3c3fe227ffea96b433a691fbd72d05f"
autoupdate.strategy = "latest_github_tag"

[resources.sources.csvimport]
in_subdir = false
url = "https://github.com/omeka-s-modules/CSVImport/releases/download/v2.6.1/CSVImport-2.6.1.zip"
sha256 = "95aa91802ef497f6fb33e7bf1d129b041dc11ce1dc2eca4a6790a29becd592ad"
autoupdate.strategy = "latest_github_tag"

[resources.system_user]

[resources.install_dir]

[resources.permissions]
main.url = "/"
api.url = "/api"
api.allowed = "visitors"
api.auth_header = false
api.show_tile = false

[resources.apt]
packages = "mariadb-server, imagemagick, php8.2-mysql, php8.2-gd, php8.2-mbstring, php8.2-xml, php8.2-imagick"
packages = "mariadb-server, imagemagick, php8.3-mysql, php8.3-gd, php8.3-mbstring, php8.3-xml, php8.3-imagick"

[resources.database]
type = "mysql"
4 changes: 2 additions & 2 deletions scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
#=================================================
ynh_script_progression --message="Setting up source files..." --weight=1

# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir"
ynh_setup_source --dest_dir="$install_dir/modules/" --source_id="csvimport"

chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir"
Expand Down Expand Up @@ -60,7 +60,7 @@ 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
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

Expand Down
3 changes: 2 additions & 1 deletion scripts/upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ ynh_script_progression --message="Upgrading source files..." --weight=1

# 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"
ynh_setup_source --dest_dir="$install_dir/modules/" --source_id="csvimport"

chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir"
Expand All @@ -55,7 +56,7 @@ 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
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

Expand Down