Merge pull request #681 from YunoHost-Apps/testing

Testing

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)

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:** <https://demo.nextcloud.com/>
 

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:** <https://demo.nextcloud.com/>
 

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 :** <https://demo.nextcloud.com/>
 

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:** <https://demo.nextcloud.com/>
 

README_zh_Hans.md

@@ -0,0 +1,61 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# 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
+
+**演示：** <https://demo.nextcloud.com/>
+
+## 截图
+
+![Nextcloud 的截图](./doc/screenshots/screenshot.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://nextcloud.com>
+- 官方用户文档： <https://docs.nextcloud.com/server/latest/user_manual/en/>
+- 官方管理文档： <https://docs.nextcloud.com/server/stable/admin_manual/>
+- 上游应用代码库： <https://github.com/nextcloud/server>
+- YunoHost 商店： <https://apps.yunohost.org/app/nextcloud>
+- 报告 bug： <https://github.com/YunoHost-Apps/nextcloud_ynh/issues>
+
+## 开发者信息
+
+请向 [`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
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

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.

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"
 

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"]
 
@@ -54,6 +54,13 @@ 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"]
+    default = "yes"
+
 [resources]
 
     [resources.sources]

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

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
 #=================================================