From 6ec8193b835798bfb5c0611f45e4cb6518a1c99c Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Wed, 17 Apr 2024 16:18:37 +0300 Subject: [PATCH 1/5] fix(nginx): add mjs mime type --- conf/nginx.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index dcb3639..891041d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,3 +1,9 @@ +# Add .mjs as a file extension for javascript +include mime.types; +types { + text/javascript js mjs; +} + #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { From a63a3f70cfd82ea52a20168d91fe12de61b53327 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Wed, 17 Apr 2024 16:32:13 +0300 Subject: [PATCH 2/5] fix(nginx): only mjs needs mimetype --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 891041d..3e8d95a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,7 +1,7 @@ # Add .mjs as a file extension for javascript include mime.types; types { - text/javascript js mjs; + text/javascript mjs; } #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; From 4ffd5308b1bab6fb1343bc72e7be896ec77ede4e Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Wed, 17 Apr 2024 16:32:44 +0300 Subject: [PATCH 3/5] chore: bump version 4.4.4~ynh2 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 648740d..988fbd1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "YesWiki" description.en = "Wiki that is quick and easy to use" description.fr = "Wiki facile et rapide à prendre en main" -version = "4.4.4~ynh1" +version = "4.4.4~ynh2" maintainers = ["Florian Schmitt", "Nils Van Zuijlen", "Plumf"] From f6da38c6bbc2497c51fe970dd8708acfa9159b4e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 17 Apr 2024 13:32:54 +0000 Subject: [PATCH 4/5] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e50de1f..1d659b9 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Shipped version:** 4.4.4~ynh1 +**Shipped version:** 4.4.4~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index e67132a..61d263a 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Paketatutako bertsioa:** 4.4.4~ynh1 +**Paketatutako bertsioa:** 4.4.4~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index e5f673f..fb55fe4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Néanmoins, avec un YesWiki on peut fabriquer un site internet aux usages multip - Cultiver un bout de liberté... -**Version incluse :** 4.4.4~ynh1 +**Version incluse :** 4.4.4~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index 06e0183..65d0330 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Versión proporcionada:** 4.4.4~ynh1 +**Versión proporcionada:** 4.4.4~ynh2 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 9585a2d..b3de7ef 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**分发版本：** 4.4.4~ynh1 +**分发版本：** 4.4.4~ynh2 **演示：** From 4d5f25530ca74951fd5011d322788a0d34fded5f Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Wed, 17 Apr 2024 16:45:08 +0300 Subject: [PATCH 5/5] fix(manifest): use approximative sizes from CI for disk and ram usage --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 988fbd1..cc199f9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -22,8 +22,8 @@ architectures = "all" multi_instance = true ldap = true sso = false -disk = "50M" -ram.build = "50M" +disk = "100M" +ram.build = "200M" ram.runtime = "50M" [install]