From ee0a22caba0a43757060de00c156d33263bed1ad Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 8 Apr 2024 19:22:26 +0200 Subject: [PATCH 1/6] Make system address book access configurable --- config_panel.toml | 9 +++++++++ manifest.toml | 6 ++++++ scripts/config | 11 +++++++++++ scripts/install | 6 ++++++ 4 files changed, 32 insertions(+) diff --git a/config_panel.toml b/config_panel.toml index 7598044..4e458b6 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -11,6 +11,15 @@ name = "Nextcloud configuration" type = "boolean" default = "0" + [main.addressbook] + name = "Address book configuration" + + [main.addressbook.system_addressbook_exposed] + ask = "Should there be a system address book listing all users, accessible by all users?" + type = "boolean" + yes = "yes" + no = "no" + [main.php_fpm_config] name = "PHP-FPM configuration" diff --git a/manifest.toml b/manifest.toml index 5a47012..87c12d1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,6 +54,12 @@ ram.runtime = "512M" type = "boolean" default = false + [install.system_addressbook_exposed] + ask.en = "Should there be a system address book listing all users, accessible by all users?" + ask.fr = "Devrait-il y avoir un carnet d'adresses système listant tous les comptes, accessible par tous les comptes ?" + type = "select" + choices = ["yes", "no"] + [resources] [resources.sources] diff --git a/scripts/config b/scripts/config index 1b5e26b..93ced20 100644 --- a/scripts/config +++ b/scripts/config @@ -38,6 +38,11 @@ get__maintenance_mode() { fi } +get__system_addressbook_exposed() { + echo $(cd "$install_dir" && ynh_exec_as "$app" \ + php${phpversion} --define apc.enable_cli=1 occ config:app:get dav system_addressbook_exposed) +} + get__fpm_footprint() { # Free footprint value for php-fpm # Check if current_fpm_footprint is an integer @@ -80,6 +85,12 @@ set__maintenance_mode() { ynh_app_setting_set --app=$app --key=maintenance_mode --value="$maintenance_mode" } +set__system_addressbook_exposed() { + (cd "$install_dir" && ynh_exec_as "$app" \ + php${phpversion} --define apc.enable_cli=1 occ config:app:set dav system_addressbook_exposed --value="$system_addressbook_exposed") + ynh_print_info "System addressbook is exposed: $system_addressbook_exposed" +} + set__fpm_footprint() { if [ "$fpm_footprint" != "specific" ] then diff --git a/scripts/install b/scripts/install index 24cd665..c80a941 100755 --- a/scripts/install +++ b/scripts/install @@ -180,6 +180,12 @@ ynh_mysql_connect_as --user=$db_name --password="$db_pwd" --database=$db_name -- # And delete admin user exec_occ user:delete admin +#================================================= +# ENABLE OR DISABLE SYSTEM ADDRESS BOOK +#================================================= + +exec_occ config:app:set dav system_addressbook_exposed --value="$system_addressbook_exposed" + #================================================= # STORE THE CHECKSUM OF THE CONFIG FILE #================================================= From 1e9852a7f2cc3d37c80b502f556f792481cf7c85 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 8 Apr 2024 17:22:46 +0000 Subject: [PATCH 2/6] Auto-update READMEs --- ALL_README.md | 2 +- README.md | 2 +- README_eu.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 README_eu.md diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..77b7509 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,6 @@ # All available README files by language - [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) -- [Leggi il “README” in italiano](README_it.md) diff --git a/README.md b/README.md index 933eeb7..23bacd8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install Nextcloud quickly and simply on a YunoHost server.* > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..0a5fa09 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,61 @@ + + +# Nextcloud YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg) + +[![Instalatu Nextcloud YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Nextcloud YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Nextcloud Hub is a fully open-source on-premises content collaboration platform. Teams access, share and edit their documents, chat and participate in video calls and manage their mail and calendar and projects across mobile, desktop and web interfaces. + +### YunoHost-specific features + +In addition to Nextcloud core features, the following are made available with this package: + + * Integrate with YunoHost users and SSO - i.e. logout button + * Allow one user to be the administrator (set at the installation) + * Allow multiple instances of this application + * Optionally access the user home folder from Nextcloud files (set at the installation, the sharing is enabled by default) + * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal + + +**Paketatutako bertsioa:** 28.0.4~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Nextcloud(r)en pantaila-argazkia](./doc/screenshots/screenshot.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Erabiltzaileen dokumentazio ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug +edo +sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** From 6a0e5ee9de6dfd9eb55acd8cd97bdc85110324cd Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 8 Apr 2024 19:28:38 +0200 Subject: [PATCH 3/6] Make system address book access configurable: default value --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 87c12d1..3af0709 100644 --- a/manifest.toml +++ b/manifest.toml @@ -59,6 +59,7 @@ ram.runtime = "512M" ask.fr = "Devrait-il y avoir un carnet d'adresses système listant tous les comptes, accessible par tous les comptes ?" type = "select" choices = ["yes", "no"] + default = "yes" [resources] From e45a54f5952af07e009686e18ce3e3203ff45826 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:17:56 +0200 Subject: [PATCH 4/6] fix nginx config --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 3fc37b7..0300bad 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -19,7 +19,7 @@ location ^~ /.well-known { location = /.well-known/caldav { return 301 __PATH__/remote.php/dav/; } location = /.well-known/webfinger { return 301 __PATH__/index.php$request_uri; } - location = /.well-known/nodeinfo { return 301 __PATH__/index.php$uri; } + location = /.well-known/nodeinfo { return 301 __PATH__/index.php$request_uri; } # Let Nextcloud's API for `/.well-known` URIs handle all other # requests by passing them to the front-end controller. From 0b318410619f49290b5f0ce868bd5e8f97e25d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 16 Apr 2024 10:54:48 +0200 Subject: [PATCH 5/6] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 3af0709..b847a94 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Nextcloud" description.en = "Online storage, file sharing platform and various other applications" description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" -version = "28.0.4~ynh1" +version = "28.0.4~ynh2" maintainers = ["kay0u"] From a21b2da44e251b9fa43860f31509c3cade628a59 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 16 Apr 2024 08:54:53 +0000 Subject: [PATCH 6/6] Auto-update READMEs --- ALL_README.md | 1 + README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 77b7509..a01b345 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -4,3 +4,4 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 23bacd8..7a0a267 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ In addition to Nextcloud core features, the following are made available with th * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 28.0.4~ynh1 +**Shipped version:** 28.0.4~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index 0a5fa09..0676394 100644 --- a/README_eu.md +++ b/README_eu.md @@ -29,7 +29,7 @@ In addition to Nextcloud core features, the following are made available with th * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Paketatutako bertsioa:** 28.0.4~ynh1 +**Paketatutako bertsioa:** 28.0.4~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index a89996e..91334c2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 28.0.4~ynh1 +**Version incluse :** 28.0.4~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index aad0610..e0c3070 100644 --- a/README_gl.md +++ b/README_gl.md @@ -29,7 +29,7 @@ In addition to Nextcloud core features, the following are made available with th * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Versión proporcionada:** 28.0.4~ynh1 +**Versión proporcionada:** 28.0.4~ynh2 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..be0c591 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,61 @@ + + +# YunoHost 的 Nextcloud + +[![集成程度](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![工作状态](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg) + +[![使用 YunoHost 安装 Nextcloud](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Nextcloud。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Nextcloud Hub is a fully open-source on-premises content collaboration platform. Teams access, share and edit their documents, chat and participate in video calls and manage their mail and calendar and projects across mobile, desktop and web interfaces. + +### YunoHost-specific features + +In addition to Nextcloud core features, the following are made available with this package: + + * Integrate with YunoHost users and SSO - i.e. logout button + * Allow one user to be the administrator (set at the installation) + * Allow multiple instances of this application + * Optionally access the user home folder from Nextcloud files (set at the installation, the sharing is enabled by default) + * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal + + +**分发版本：** 28.0.4~ynh2 + +**演示：** + +## 截图 + +![Nextcloud 的截图](./doc/screenshots/screenshot.png) + +## 文档与资源 + +- 官方应用网站： +- 官方用户文档： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug +或 +sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：**