diff --git a/README.md b/README.md index fba18da..07d203f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Overleaf for YunoHost -[![Integration level](https://dash.yunohost.org/integration/overleaf.svg)](https://dash.yunohost.org/appci/app/overleaf) ![Working status](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/overleaf.svg)](https://ci-apps.yunohost.org/ci/apps/overleaf/) ![Working status](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) [![Install Overleaf with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=overleaf) @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Overleaf is an open-source online real-time collaborative LaTeX editor. -**Shipped version:** 2024.06.10~ynh1 +**Shipped version:** 2024.06.25~ynh1 ## Screenshots diff --git a/README_es.md b/README_es.md index 19806c7..13b67ce 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Overleaf para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/overleaf.svg)](https://dash.yunohost.org/appci/app/overleaf) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/overleaf.svg)](https://ci-apps.yunohost.org/ci/apps/overleaf/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) [![Instalar Overleaf con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=overleaf) @@ -19,7 +19,7 @@ No se debe editar a mano. Overleaf is an open-source online real-time collaborative LaTeX editor. -**Versión actual:** 2024.06.10~ynh1 +**Versión actual:** 2024.06.25~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index 771d2fa..caa19d9 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Overleaf YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/overleaf.svg)](https://dash.yunohost.org/appci/app/overleaf) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/overleaf.svg)](https://ci-apps.yunohost.org/ci/apps/overleaf/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) [![Instalatu Overleaf YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=overleaf) @@ -19,7 +19,7 @@ EZ editatu eskuz. Overleaf is an open-source online real-time collaborative LaTeX editor. -**Paketatutako bertsioa:** 2024.06.10~ynh1 +**Paketatutako bertsioa:** 2024.06.25~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index a74c074..5453e34 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Overleaf pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/overleaf.svg)](https://dash.yunohost.org/appci/app/overleaf) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/overleaf.svg)](https://ci-apps.yunohost.org/ci/apps/overleaf/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) [![Installer Overleaf avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=overleaf) @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Overleaf est un éditeur LaTeX collaboratif en ligne et en temps réel open source. -**Version incluse :** 2024.06.10~ynh1 +**Version incluse :** 2024.06.25~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index a491b89..0ff3afd 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Overleaf para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/overleaf.svg)](https://dash.yunohost.org/appci/app/overleaf) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/overleaf.svg)](https://ci-apps.yunohost.org/ci/apps/overleaf/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) [![Instalar Overleaf con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=overleaf) @@ -19,7 +19,7 @@ NON debe editarse manualmente. Overleaf is an open-source online real-time collaborative LaTeX editor. -**Versión proporcionada:** 2024.06.10~ynh1 +**Versión proporcionada:** 2024.06.25~ynh1 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 8119efd..910775b 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Overleaf -[![集成程度](https://dash.yunohost.org/integration/overleaf.svg)](https://dash.yunohost.org/appci/app/overleaf) ![工作状态](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/overleaf.svg)](https://ci-apps.yunohost.org/ci/apps/overleaf/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg) [![使用 YunoHost 安装 Overleaf](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=overleaf) @@ -19,7 +19,7 @@ Overleaf is an open-source online real-time collaborative LaTeX editor. -**分发版本:** 2024.06.10~ynh1 +**分发版本:** 2024.06.25~ynh1 ## 截图 diff --git a/conf/settings.js b/conf/settings.js index f6725bb..6564b8e 100644 --- a/conf/settings.js +++ b/conf/settings.js @@ -210,6 +210,10 @@ const settings = { process.env.OVERLEAF_SESSION_SECRET || process.env.CRYPTO_RANDOM, }, + csp: { + enabled: process.env.OVERLEAF_CSP_ENABLED !== 'false', + }, + // These credentials are used for authenticating api requests // between services that may need to go over public channels httpAuthUsers, @@ -286,7 +290,6 @@ const settings = { compileTimeout: parseIntOrFail(process.env.COMPILE_TIMEOUT || 180), compileGroup: 'standard', trackChanges: true, - templates: true, references: true, }, } @@ -405,76 +408,6 @@ if ( } } -// ###################### -// Overleaf Server Pro -// ###################### - -if (parse(process.env.OVERLEAF_IS_SERVER_PRO) === true) { - settings.bypassPercentageRollouts = true - settings.apis.references = { url: 'http://127.0.0.1:3040' } -} - -// Compiler -// -------- -if (process.env.SANDBOXED_COMPILES === 'true') { - settings.clsi = { - dockerRunner: true, - docker: { - image: process.env.TEX_LIVE_DOCKER_IMAGE, - env: { - HOME: '/tmp', - PATH: - process.env.COMPILER_PATH || - '/usr/local/texlive/2015/bin/x86_64-linux:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - }, - user: 'www-data', - }, - } - - if (settings.path == null) { - settings.path = {} - } - settings.path.synctexBaseDir = () => '/compile' - if (process.env.SANDBOXED_COMPILES_SIBLING_CONTAINERS === 'true') { - console.log('Using sibling containers for sandboxed compiles') - if (process.env.SANDBOXED_COMPILES_HOST_DIR) { - settings.path.sandboxedCompilesHostDir = - process.env.SANDBOXED_COMPILES_HOST_DIR - } else { - console.error( - 'Sibling containers, but SANDBOXED_COMPILES_HOST_DIR not set' - ) - } - } -} - -// Templates -// --------- -if (process.env.OVERLEAF_TEMPLATES_USER_ID) { - settings.templates = { - mountPointUrl: '/templates', - user_id: process.env.OVERLEAF_TEMPLATES_USER_ID, - } - - settings.templateLinks = parse( - process.env.OVERLEAF_NEW_PROJECT_TEMPLATE_LINKS - ) -} - -// /Learn -// ------- -if (process.env.OVERLEAF_PROXY_LEARN != null) { - settings.proxyLearn = parse(process.env.OVERLEAF_PROXY_LEARN) - if (settings.proxyLearn) { - settings.nav.header_extras = [ - { - url: '/learn', - text: 'documentation', - }, - ].concat(settings.nav.header_extras || []) - } -} - // /References // ----------- if (process.env.OVERLEAF_ELASTICSEARCH_URL != null) { diff --git a/manifest.toml b/manifest.toml index 7fb7d7e..eab2ba8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Overleaf" description.en = "Online real-time collaborative LaTeX editor" description.fr = "Éditeur LaTeX collaboratif en ligne et en temps réel" -version = "2024.06.10~ynh1" +version = "2024.06.25~ynh1" maintainers = [] @@ -51,8 +51,8 @@ ram.runtime = "3G" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/overleaf/overleaf/archive/e67a2b92a8fe8573bde5ee2424e26a99100e0027.tar.gz" - sha256 = "51bc4aad0334207b9d7de440c365932361a90e8b5326169896e03d41668c2238" + url = "https://github.com/overleaf/overleaf/archive/ce9b531892a882a23c3be7c8c03aa3bf97c810bc.tar.gz" + sha256 = "a0c649cc8281a3dfa3791117f4e94d297e65a8b1706da076cf5403271b335697" autoupdate.strategy = "latest_github_commit" [resources.system_user] @@ -77,7 +77,7 @@ ram.runtime = "3G" [resources.apt] packages = [ # Overleaf dependencies - "texlive", "texlive-xetex", "texlive-base", "texlive-font-utils", "redis-server", "latexmk", "python3-pygments", + "texlive", "texlive-xetex", "texlive-base", "texlive-font-utils", "redis-server", "latexmk", "python3-pygments", "build-essential", # Aspell dependencies "aspell-ar", "aspell-ar-large", diff --git a/scripts/_common.sh b/scripts/_common.sh index 57ab2f4..0f3a408 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,8 +1,8 @@ # COMMON VARIABLES #================================================= -nodejs_version="18.20.2" -YNH_MONGO_VERSION=6.0 +nodejs_version="20" +YNH_MONGO_VERSION="7.0" #================================================= # PERSONAL HELPERS diff --git a/scripts/remove b/scripts/remove index 49831f8..aa3d058 100755 --- a/scripts/remove +++ b/scripts/remove @@ -131,16 +131,6 @@ ynh_script_progression --message="Removing dependencies..." ynh_remove_mongo ynh_remove_nodejs -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." - -# Remove the log files -ynh_secure_remove --file="/var/log/$app" - #================================================= # END OF SCRIPT #================================================= diff --git a/tests.toml b/tests.toml index 80fa961..27d82c6 100644 --- a/tests.toml +++ b/tests.toml @@ -2,4 +2,4 @@ test_format = 1.0 [default] -test_upgrade_from.405228e.name = "2024-04-09" +test_upgrade_from.ce30971.name = "2024-06-10"