YunoHost-Apps · kay0u · Apr 23, 2024 · Apr 23, 2024 · Apr 25, 2024 · Apr 26, 2024
diff --git a/ALL_README.md b/ALL_README.md
@@ -6,4 +6,5 @@
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
 - [Baca README dalam bahasa bahasa Indonesia](README_id.md)
+- [Прочитать README на русский](README_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ In the context of YunoHost, Nextcloud integrates with the SSO / user portal (Yun
 The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it.
 
 
-**Shipped version:** 29.0.4~ynh1
+**Shipped version:** 29.0.5~ynh1
 
 **Demo:** <https://demo.nextcloud.com/>
 

diff --git a/README_es.md b/README_es.md
@@ -23,7 +23,7 @@ In the context of YunoHost, Nextcloud integrates with the SSO / user portal (Yun
 The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it.
 
 
-**Versión actual:** 29.0.4~ynh1
+**Versión actual:** 29.0.5~ynh1
 
 **Demo:** <https://demo.nextcloud.com/>
 

diff --git a/README_eu.md b/README_eu.md
@@ -23,7 +23,7 @@ In the context of YunoHost, Nextcloud integrates with the SSO / user portal (Yun
 The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it.
 
 
-**Paketatutako bertsioa:** 29.0.4~ynh1
+**Paketatutako bertsioa:** 29.0.5~ynh1
 
 **Demoa:** <https://demo.nextcloud.com/>
 

diff --git a/README_fr.md b/README_fr.md
@@ -23,7 +23,7 @@ Dans le cadre de YunoHost, Nextcloud s'intègre avec le SSO / portail utilisateu
 L'adresse  `/.well-known` sera automatiquement configuré pour la synchronisation CalDAV et CardDAV si aucun autre service tel que Baïkal ne l'utilise déjà.
 
 
-**Version incluse :** 29.0.4~ynh1
+**Version incluse :** 29.0.5~ynh1
 
 **Démo :** <https://demo.nextcloud.com/>
 

diff --git a/README_gl.md b/README_gl.md
@@ -23,7 +23,7 @@ In the context of YunoHost, Nextcloud integrates with the SSO / user portal (Yun
 The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it.
 
 
-**Versión proporcionada:** 29.0.4~ynh1
+**Versión proporcionada:** 29.0.5~ynh1
 
 **Demo:** <https://demo.nextcloud.com/>
 

diff --git a/README_id.md b/README_id.md
@@ -23,7 +23,7 @@ In the context of YunoHost, Nextcloud integrates with the SSO / user portal (Yun
 The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it.
 
 
-**Versi terkirim:** 29.0.4~ynh1
+**Versi terkirim:** 29.0.5~ynh1
 
 **Demo:** <https://demo.nextcloud.com/>
 

diff --git a/README_ru.md b/README_ru.md
@@ -0,0 +1,55 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# Nextcloud для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/nextcloud.svg)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)
+
+[![Установите Nextcloud с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить Nextcloud быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+Nextcloud lets you access and synchronize data, files, contacts and calendars between different devices (PCs or mobiles), or share them with other people (with or without accounts), and also offers advanced communication and collaborative working features. Nextcloud features its own application mechanism (see also [Nextcloud's app store](https://apps.nextcloud.com/)) for specific functionalities. 
+
+In the context of YunoHost, Nextcloud integrates with the SSO / user portal (YunoHost accounts are automatically connected to Nextcloud).
+
+The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it.
+
+
+**Поставляемая версия:** 29.0.5~ynh1
+
+**Демо-версия:** <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>
+- Сообщите об ошибке: <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>
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
@@ -23,7 +23,7 @@ In the context of YunoHost, Nextcloud integrates with the SSO / user portal (Yun
 The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it.
 
 
-**分发版本：** 29.0.4~ynh1
+**分发版本：** 29.0.5~ynh1
 
 **演示：** <https://demo.nextcloud.com/>
 

diff --git a/conf/config.json b/conf/config.json
@@ -30,7 +30,8 @@
         "verify_peer": false,
         "verify_peer_name": false
       }
-    }
+    },
+    "trusted_proxies": [ "127.0.0.1", "::1" ]
   },
   "apps": {
     "user_ldap": {

diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -165,6 +165,8 @@ location ^~ __PATH__/ {
     try_files $uri / __PATH__/index.php$request_uri;
   }
 
+  include conf.d/__DOMAIN__.d/__APP__.d/*.conf;
+
   # show YunoHost panel access
   include conf.d/yunohost_panel.conf.inc;
 }
diff --git a/conf/notify_push.conf b/conf/notify_push.conf
@@ -0,0 +1,8 @@
+location ^~ __PATH__/push/ {
+   proxy_pass http://unix:/var/run/__APP__/notify-push.sock:/;
+   proxy_http_version 1.1;
+   proxy_set_header Upgrade $http_upgrade;
+   proxy_set_header Connection "Upgrade";
+   proxy_set_header Host $host;
+   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+}
diff --git a/conf/systemd.service b/conf/systemd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description = Push daemon for Nextcloud clients
+
+[Service]
+Environment=SOCKET_PATH=/var/run/__APP__/notify-push.sock
+Environment=ALLOW_SELF_SIGNED=true
+ExecStart=__INSTALL_DIR__/apps/notify_push/bin/__ARCH__/notify_push __INSTALL_DIR__/config/config.php
+Type=notify
+User=__APP__
+Group=__APP__
+
+[Install]
+WantedBy = multi-user.target
diff --git a/conf/watcher.path b/conf/watcher.path
@@ -0,0 +1,11 @@
+[Unit]
+Description=Restart Push daemon for Nextcloud clients when it receives updates
+Documentation=https://github.com/nextcloud/notify_push
+PartOf=__APP__-notify-push-watcher.service
+
+[Path]
+PathModified=/var/www/nextcloud/apps/notify_push/bin/__ARCH__/notify_push
+Unit=__APP__-notify-push-watcher.service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/conf/watcher.service b/conf/watcher.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Restart Push daemon for Nextcloud clients when it receives updates
+Documentation=https://github.com/nextcloud/notify_push
+#Requires=__APP__-notify-push.service
+After=__APP__-notify-push.service
+StartLimitIntervalSec=10
+StartLimitBurst=5
+
+[Service]
+Type=oneshot
+ExecStartPre=/usr/bin/chmod u+x __INSTALL_DIR__/apps/notify_push/bin/__ARCH__/notify_push
+ExecStart=/usr/bin/systemctl restart __APP__-notify-push.service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/config_panel.toml b/config_panel.toml
@@ -9,7 +9,7 @@ name = "Nextcloud configuration"
         [main.maintenance.maintenance_mode]
         ask = "Enable maintenance mode"
         type = "boolean"
-        default = "0"
+        default = false
 
         [main.maintenance.set_permissions_button]
         ask.en = "Set permissions for all data (Can take up to several hours if users have a lot of data)"
@@ -22,8 +22,14 @@ name = "Nextcloud 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.notify_push]
+    name = "Notify Push configuration"
+
+        [main.notify_push.enable_notify_push]
+        ask.en = "Configure the High Performance Backend?"
+        ask.fr = "Configurer le Backend Hautes Performances ?"
+        type = "boolean"
 
     [main.php_fpm_config]
     name = "PHP-FPM configuration"

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
@@ -12,6 +12,10 @@ Alternatively, you may open a 'Nextcloud shell' with `sudo yunohost app shell __
 
 ONLYOFFICE is an online rich text document editor which can be integrated in Nextcloud
 
+#### High Performance Backend
+
+High Performance Backend is an application on Nextcloud that should speed up the instance, more information here: https://github.com/nextcloud/notify_push#about
+
 #### With YunoHost App (ARM64 support, better performance)
 
 For better performance and ARM64 support (Raspberry Pi, OLinuXino...), install the [OnlyOffice YunoHost app](https://apps.yunohost.org/app/onlyoffice) and connect it to Nextcloud, see the tutorial in the [doc of onlyoffice_ynh package](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server)

diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
@@ -12,6 +12,10 @@ Ou bien, vous pouvez ouvrir un "shell Nextcloud" avec `sudo yunohost app shell _
 
 ONLYOFFICE est un éditeur de texte enrichi en ligne qui peut s'intégrer dans Nextcloud
 
+#### Backend Hautes Performances
+
+Le backend Hautes Performances est une application sur Nextcloud qui devrait accélérer l'instance, plus d'informations ici : https://github.com/nextcloud/notify_push#about
+
 #### Avec l'application YunoHost (support ARM64, meilleures performances)
 
 Pour de meilleures performances et le support de ARM64 (Raspberry Pi, OLinuXino...), installez l'[app YunoHost OnlyOffice](https://apps.yunohost.org/app/onlyoffice), puis connectez-la à Nextcloud : voir le tutoriel dans la [doc du paquet onlyoffice_ynh](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server)

diff --git a/hooks/post_user_create b/hooks/post_user_create
@@ -3,4 +3,4 @@
 user="$1"
 app="$(basename $0 | cut -d- -f 2-)" # Extract the app name from the script name, which is supposed to be something like "50-app_id"
 
-setfacl --modify g:$app:rwx /home/$user
+setfacl --recursive --modify g:$app:rwX,d:g:$app:rwX /home/$user
diff --git 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 = "29.0.4~ynh2"
+version = "29.0.5~ynh1"
 
 maintainers = ["kay0u"]
 
@@ -19,7 +19,7 @@ code = "https://github.com/nextcloud/server"
 cpe = "cpe:2.3:a:nextcloud:nextcloud"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.27"
 architectures = ["amd64", "arm64", "armhf"]
 multi_instance = true
 
@@ -60,13 +60,19 @@ ram.runtime = "512M"
     type = "boolean"
     default = true
 
+    [install.enable_notify_push]
+    ask.en = "Configure the High Performance Backend?"
+    ask.fr = "Configurer le Backend Hautes Performances ?"
+    type = "boolean"
+    default = false
+
 [resources]
 
     [resources.sources]
 
         [resources.sources.main]
-        url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.4.tar.bz2'
-        sha256 = '19c469e264b31ee80400f8396460854546569e88db4c15fc0854e192f96027eb'
+        url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.5.tar.bz2'
+        sha256 = 'c7fe9c61e5ec30a5e599e8f152a1825df684d30e899db0caa8868c8d67b53a2c'
 
         [resources.sources.28]
         url = 'https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2'

diff --git a/scripts/backup b/scripts/backup
@@ -28,7 +28,14 @@ ynh_backup --src_path="$install_dir"
 ynh_backup --src_path="$data_dir" --is_big
 
 #=================================================
-# SYSTEM CONFIGURATION
+# BACKUP THE NGINX CONFIGURATION
+#=================================================
+
+ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.d"
+
+#=================================================
+# BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
 
 # Backup the PHP-FPM configuration
@@ -59,6 +66,17 @@ ynh_print_info --message="Backing up the MySQL database..."
 
 ynh_mysql_dump_db --database="$db_name" --default_character_set="utf8mb4" > db.sql
 
+#=================================================
+# BACKUP THE NOTIFY_PUSH APP
+#=================================================
+
+if [ $enable_notify_push -eq 1 ]
+then
+    ynh_backup --src_path="/etc/systemd/system/${app}-notify-push.service"
+    ynh_backup --src_path="/etc/systemd/system/${app}-notify-push-watcher.service"
+    ynh_backup --src_path="/etc/systemd/system/${app}-notify-push-watcher.path"
+fi
+
 #=================================================
 # END OF SCRIPT
 #=================================================

diff --git a/scripts/change_url b/scripts/change_url
@@ -50,16 +50,62 @@ then
 
     # Reload PHP-FPM, necessary for force Nextcloud to re-read config.php, cf opcache.revalidate_freq
     ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload
+
+    mv /etc/nginx/conf.d/$old_domain.d/$app.d /etc/nginx/conf.d/$new_domain.d/$app.d
+fi
+
+#=================================================
+# CONFIGURE NOTIFY_PUSH APP
+#=================================================
+
+if [ $enable_notify_push -eq 1 ]
+then
+    domain="$new_domain"
+    path_url="$new_path"
+
+    ynh_add_config --template="notify_push.conf" --destination="/etc/nginx/conf.d/$domain.d/$app.d/notify_push.conf"
+
+    ynh_systemd_action --service_name=nginx --action=reload
+
+    case $YNH_ARCH in
+        amd64) arch="x86_64";;
+        arm64) arch="aarch64";;
+        armel|armhf) arch="armv7";;
+    esac
+
+    ynh_add_config --template="watcher.path" --destination="/etc/systemd/system/${app}-notify-push-watcher.path"
+    ynh_add_systemd_config --service="${app}-notify-push-watcher" --template="watcher.service"
+    systemctl enable --now ${app}-notify-push-watcher.path
+    ynh_add_systemd_config --service="${app}-notify-push"
+
+    count=0
+    while ! ynh_exec_as "$app" php${phpversion} --define apc.enable_cli=1 $install_dir/cron.php && [[ $count -lt 30 ]]
+    do
+        sleep 1
+        count=$((count + 1))
+    done
+
+    ynh_systemd_action --service_name="${app}-notify-push" --action=restart --line_match="Push daemon for Nextcloud clients." --log_path="systemd" --action=restart
+
+    exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push
+
+    if ! exec_occ notify_push:self-test; then
+        ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart ${app}-notify-push.service\", and run \"sudo -u $app php${phpversion} $install_dir/occ notify_push:self-test\" to verify that everything is green."
+    fi
 fi
 
 #=================================================
-# SETUP SSOWAT
+# GENERIC FINALISATION
 #=================================================
-ynh_script_progression --message="Configuring permissions..."
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading NGINX web server..."
 
 # Temporary fix for the API permission (workaround for https://github.com/YunoHost/issues/issues/2294 )
 ynh_permission_url --permission="api" --url="re:$new_domain\/.well-known\/.*" --auth_header="false" --clear_urls
 
+ynh_systemd_action --service_name=nginx --action=reload
+
 #=================================================
 # END OF SCRIPT
 #=================================================