mirror of
https://github.com/YunoHost-Apps/nextcloud_ynh.git
synced 2024-09-03 19:55:57 +02:00
Merge 46bffb0797 into 9bef6d077b
This commit is contained in:
eric_G
GitHub
commit
afb1f0fffb
27 changed files with 399 additions and 31 deletions
|
|
@ -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.5~ynh1
|
||||
**Shipped version:** 29.0.6~ynh1
|
||||
|
||||
**Demo:** <https://demo.nextcloud.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.5~ynh1
|
||||
**Versión actual:** 29.0.6~ynh1
|
||||
|
||||
**Demo:** <https://demo.nextcloud.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.5~ynh1
|
||||
**Paketatutako bertsioa:** 29.0.6~ynh1
|
||||
|
||||
**Demoa:** <https://demo.nextcloud.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.5~ynh1
|
||||
**Version incluse :** 29.0.6~ynh1
|
||||
|
||||
**Démo :** <https://demo.nextcloud.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.5~ynh1
|
||||
**Versión proporcionada:** 29.0.6~ynh1
|
||||
|
||||
**Demo:** <https://demo.nextcloud.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.5~ynh1
|
||||
**Versi terkirim:** 29.0.6~ynh1
|
||||
|
||||
**Demo:** <https://demo.nextcloud.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.5~ynh1
|
||||
**Поставляемая версия:** 29.0.6~ynh1
|
||||
|
||||
**Демо-версия:** <https://demo.nextcloud.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.5~ynh1
|
||||
**分发版本：** 29.0.6~ynh1
|
||||
|
||||
**演示：** <https://demo.nextcloud.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,8 @@
|
|||
"verify_peer": false,
|
||||
"verify_peer_name": false
|
||||
}
|
||||
}
|
||||
},
|
||||
"trusted_proxies": [ "127.0.0.1", "::1" ]
|
||||
},
|
||||
"apps": {
|
||||
"user_ldap": {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
8
conf/notify_push.conf
Normal file
8
conf/notify_push.conf
Normal file
|
|
@ -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;
|
||||
}
|
||||
14
conf/systemd.service
Normal file
14
conf/systemd.service
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
[Unit]
|
||||
Description = Push daemon for Nextcloud clients
|
||||
|
||||
[Service]
|
||||
Environment=SOCKET_PATH=/var/run/__APP__/notify-push.sock
|
||||
Environment=ALLOW_SELF_SIGNED=true
|
||||
RuntimeDirectory=__APP__
|
||||
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
|
||||
11
conf/watcher.path
Normal file
11
conf/watcher.path
Normal file
|
|
@ -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
|
||||
15
conf/watcher.service
Normal file
15
conf/watcher.service
Normal file
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
If you are upgrading to a new major version of Nextcloud, please make sure that your Nextcloud apps are up to date from Nextcloud's administration panel beforehand.
|
||||
|
||||
Additionally, if you installed specific Nextcloud apps, we recommend making sure that they are compatible with the new major version. YunoHost will attempt to check this automatically at the very beginning of the upgrade, but a manual check doesn't hurt either. For Nextcloud 28, this forum thread might be helpful : <https://help.nextcloud.com/t/apps-not-compatible-with-nc-28/176234>.
|
||||
|
|
@ -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.5~ynh1"
|
||||
version = "29.0.6~ynh1"
|
||||
|
||||
maintainers = ["kay0u"]
|
||||
|
||||
|
|
@ -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.5.tar.bz2'
|
||||
sha256 = 'c7fe9c61e5ec30a5e599e8f152a1825df684d30e899db0caa8868c8d67b53a2c'
|
||||
url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2'
|
||||
sha256 = 'dc60be03fd17e30bafef2a4d4feb2d096aa77a4c6b4f21c985760e537f8401e3'
|
||||
|
||||
[resources.sources.28]
|
||||
url = 'https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2'
|
||||
|
|
|
|||
|
|
@ -27,6 +27,13 @@ ynh_backup --src_path="$install_dir"
|
|||
|
||||
ynh_backup --src_path="$data_dir" --is_big
|
||||
|
||||
#=================================================
|
||||
# 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"
|
||||
|
||||
#=================================================
|
||||
# SYSTEM 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
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
#=================================================
|
||||
# SETUP SSOWAT
|
||||
# CONFIGURE NOTIFY_PUSH APP
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring permissions..."
|
||||
|
||||
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
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALISATION
|
||||
#=================================================
|
||||
# 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
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -18,6 +18,11 @@ ynh_abort_if_errors
|
|||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
|
||||
|
||||
exec_occ() {
|
||||
(cd "$install_dir" && ynh_exec_as "$app" \
|
||||
php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@")
|
||||
}
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC GETTERS FOR TOML SHORT KEY
|
||||
#=================================================
|
||||
|
|
@ -39,8 +44,7 @@ get__maintenance_mode() {
|
|||
}
|
||||
|
||||
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)
|
||||
echo $(exec_occ config:app:get dav system_addressbook_exposed)
|
||||
}
|
||||
|
||||
get__fpm_footprint() {
|
||||
|
|
@ -73,24 +77,85 @@ get__fpm_free_footprint() {
|
|||
set__maintenance_mode() {
|
||||
if [ "$maintenance_mode" -eq "0" ]; then
|
||||
# If maintenance_mode was set to 0, disable maintenance mode
|
||||
(cd "$install_dir" && ynh_exec_as "$app" \
|
||||
php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode --off)
|
||||
exec_occ maintenance:mode --off
|
||||
ynh_print_info "Maintenance mode disabled"
|
||||
elif [ "$maintenance_mode" -eq "1" ]; then
|
||||
# If maintenance_mode was set to 1, enable maintenance mode
|
||||
(cd "$install_dir" && ynh_exec_as "$app" \
|
||||
php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode --on)
|
||||
exec_occ maintenance:mode --on
|
||||
ynh_print_info "Maintenance mode enabled"
|
||||
fi
|
||||
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")
|
||||
exec_occ config:app:set dav system_addressbook_exposed --value="$system_addressbook_exposed"
|
||||
ynh_print_info "System addressbook is exposed: $system_addressbook_exposed"
|
||||
}
|
||||
|
||||
|
||||
set__enable_notify_push() {
|
||||
if [ "$enable_notify_push" -eq "0" ]; then
|
||||
nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d"
|
||||
ynh_secure_remove --file="$nginx_extra_conf_dir/notify_push.conf"
|
||||
ynh_systemd_action --service_name="nginx" --action=reload
|
||||
|
||||
# If notify_push is enabled, disable it
|
||||
if exec_occ app:list | awk '/Enabled/{f=1;next} f' | grep -q -w notify_push; then
|
||||
exec_occ app:disable notify_push
|
||||
fi
|
||||
|
||||
ynh_remove_systemd_config --service="${app}-notify-push"
|
||||
systemctl disable --now "${app}-notify-push-watcher.path"
|
||||
ynh_secure_remove --file="/etc/systemd/system/${app}-notify-push-watcher.path"
|
||||
ynh_remove_systemd_config --service="${app}-notify-push-watcher"
|
||||
|
||||
ynh_print_info "Notify push disabled"
|
||||
elif [ "$enable_notify_push" -eq "1" ]; then
|
||||
nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d"
|
||||
mkdir -p "$nginx_extra_conf_dir"
|
||||
|
||||
ynh_add_config --template="notify_push.conf" --destination="$nginx_extra_conf_dir/notify_push.conf"
|
||||
|
||||
ynh_systemd_action --service_name="nginx" --action=reload
|
||||
|
||||
# If notify_push is disabled, reenable it
|
||||
if exec_occ app:list | awk '/Disabled/{f=1;next} f' | grep -q -w notify_push; then
|
||||
exec_occ app:enable notify_push
|
||||
# If notify_push is not installed, install it
|
||||
elif ! exec_occ app:list | awk '/Enabled/{f=1;next} /Disabled/{f=0} f' | grep -q -w notify_push; then
|
||||
exec_occ app:install notify_push
|
||||
fi
|
||||
exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push
|
||||
|
||||
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-watcher" --action=restart
|
||||
ynh_systemd_action --service_name="${app}-notify-push" --action=restart --line_match="Push daemon for Nextcloud clients." --log_path="systemd"
|
||||
|
||||
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
|
||||
ynh_print_info "Notify push enabled"
|
||||
fi
|
||||
ynh_app_setting_set --app=$app --key=enable_notify_push --value="$enable_notify_push"
|
||||
}
|
||||
|
||||
set__fpm_footprint() {
|
||||
if [ "$fpm_footprint" != "specific" ]
|
||||
then
|
||||
|
|
|
|||
|
|
@ -49,6 +49,14 @@ then
|
|||
sed --in-place --regexp-extended '/location = \/\.well\-known\/(caldav|carddav)/d' "../conf/nginx.conf"
|
||||
fi
|
||||
|
||||
nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d"
|
||||
mkdir -p "$nginx_extra_conf_dir"
|
||||
|
||||
if [ $enable_notify_push -eq 1 ]
|
||||
then
|
||||
ynh_add_config --template="notify_push.conf" --destination="$nginx_extra_conf_dir/notify_push.conf"
|
||||
fi
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
|
|
@ -195,6 +203,27 @@ exec_occ config:app:set dav system_addressbook_exposed --value="$system_addressb
|
|||
# Calculate and store the config file checksum into the app settings
|
||||
ynh_store_file_checksum --file="$install_dir/config/config.php"
|
||||
|
||||
#=================================================
|
||||
# CONFIGURE NOTIFY_PUSH APP
|
||||
#=================================================
|
||||
|
||||
if [ $enable_notify_push -eq 1 ]
|
||||
then
|
||||
exec_occ app:install notify_push
|
||||
exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push
|
||||
|
||||
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"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# ADD A CRON JOB
|
||||
#=================================================
|
||||
|
|
@ -261,6 +290,27 @@ ynh_script_progression --message="Configuring Fail2Ban..." --weight=8
|
|||
# Create a dedicated Fail2Ban config
|
||||
ynh_add_fail2ban_config --logpath="/var/log/$app/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: '<HOST>'.*$" --max_retry=5
|
||||
|
||||
#=================================================
|
||||
# CHECK IF NOTIFY_PUSH WORKS
|
||||
#=================================================
|
||||
|
||||
if [ $enable_notify_push -eq 1 ]
|
||||
then
|
||||
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-watcher" --action=restart
|
||||
ynh_systemd_action --service_name="${app}-notify-push" --action=restart --line_match="Push daemon for Nextcloud clients." --log_path="systemd"
|
||||
|
||||
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
|
||||
|
||||
#=================================================
|
||||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ ynh_script_progression --message="Removing system configurations related to $app
|
|||
|
||||
# Remove the dedicated NGINX config
|
||||
ynh_remove_nginx_config
|
||||
ynh_secure_remove --file="/etc/nginx/conf.d/$domain.d/$app.d"
|
||||
|
||||
# Remove the dedicated PHP-FPM config
|
||||
ynh_remove_fpm_config
|
||||
|
|
@ -22,15 +23,21 @@ ynh_remove_logrotate
|
|||
# Remove the dedicated Fail2Ban config
|
||||
ynh_remove_fail2ban_config
|
||||
|
||||
# Remove notify push
|
||||
ynh_remove_systemd_config --service="${app}-notify-push"
|
||||
ynh_exec_warn_less systemctl disable --now ${app}-notify-push-watcher.path
|
||||
ynh_secure_remove --file="/etc/systemd/system/${app}-notify-push-watcher.path"
|
||||
ynh_remove_systemd_config --service="${app}-notify-push-watcher"
|
||||
|
||||
# Remove a cron file
|
||||
# TODO: Ensure that cron job is not running (How !?)
|
||||
ynh_secure_remove --file="/etc/cron.d/$app"
|
||||
|
||||
# Cleaning ACL in home directories
|
||||
for i in $(ls /home); do
|
||||
for path in /home/*; do
|
||||
# Clean ACL in every directories in /home, except those which start with 'yunohost.'
|
||||
[[ ! $i == yunohost.* ]] \
|
||||
&& setfacl --remove g:$app:rwx 2>&1
|
||||
[[ ! $path == /home/yunohost.* ]] \
|
||||
&& setfacl --remove g:$app -- "$path" 2>&1
|
||||
done
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ ynh_add_fpm_config
|
|||
#=================================================
|
||||
|
||||
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.d"
|
||||
|
||||
# Check if .well-known is available for this domain
|
||||
if is_url_handled --domain="$domain" --path="/.well-known/caldav" || is_url_handled --domain="$domain" --path="/.well-known/carddav"
|
||||
|
|
@ -123,6 +124,21 @@ fi
|
|||
|
||||
ynh_systemd_action --action=restart --service_name=fail2ban
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE NOTIFY_PUSH APP
|
||||
#=================================================
|
||||
|
||||
if [ $enable_notify_push -eq 1 ]
|
||||
then
|
||||
ynh_restore_file --origin_path="/etc/systemd/system/${app}-notify-push.service"
|
||||
ynh_restore_file --origin_path="/etc/systemd/system/${app}-notify-push-watcher.service"
|
||||
ynh_restore_file --origin_path="/etc/systemd/system/${app}-notify-push-watcher.path"
|
||||
|
||||
systemctl enable --now "${app}-notify-push-watcher.service" --quiet
|
||||
systemctl enable --now "${app}-notify-push-watcher.path" --quiet
|
||||
systemctl enable --now "${app}-notify-push.service" --quiet
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALIZATION
|
||||
#=================================================
|
||||
|
|
@ -132,6 +148,32 @@ ynh_script_progression --message="Reloading NGINX web server..." --weight=3
|
|||
|
||||
ynh_systemd_action --service_name=nginx --action=reload
|
||||
|
||||
#=================================================
|
||||
# CHECK IF NOTIFY_PUSH WORKS
|
||||
#=================================================
|
||||
|
||||
exec_occ() {
|
||||
(cd "$install_dir" && ynh_exec_as "$app" \
|
||||
php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@")
|
||||
}
|
||||
|
||||
if [ $enable_notify_push -eq 1 ]
|
||||
then
|
||||
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-watcher" --action=restart
|
||||
ynh_systemd_action --service_name="${app}-notify-push" --action=restart --line_match="Push daemon for Nextcloud clients." --log_path="systemd" --action=restart
|
||||
|
||||
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
|
||||
|
||||
#=================================================
|
||||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -24,6 +24,11 @@ elif [ "${system_addressbook_exposed,,}" = "no" ]; then
|
|||
system_addressbook_exposed=0
|
||||
fi
|
||||
|
||||
if [ -z ${enable_notify_push:-} ]; then
|
||||
ynh_app_setting_set --app=$app --key=enable_notify_push --value=0
|
||||
enable_notify_push=0
|
||||
fi
|
||||
|
||||
# Remove the option backup_core_only if it's in the settings.yml file
|
||||
ynh_app_setting_delete --app=$app --key=backup_core_only
|
||||
|
||||
|
|
@ -365,9 +370,46 @@ then
|
|||
sed --in-place --regexp-extended '/location = \/\.well\-known\/(caldav|carddav)/d' "../conf/nginx.conf"
|
||||
fi
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d"
|
||||
mkdir -p "$nginx_extra_conf_dir"
|
||||
|
||||
if [ $enable_notify_push -eq 1 ]
|
||||
then
|
||||
ynh_add_config --template="notify_push.conf" --destination="$nginx_extra_conf_dir/notify_push.conf"
|
||||
fi
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# CONFIGURE NOTIFY_PUSH APP
|
||||
#=================================================
|
||||
|
||||
if [ $enable_notify_push -eq 1 ]
|
||||
then
|
||||
# If notify_push is disabled, reenable it
|
||||
if exec_occ app:list | awk '/Disabled/{f=1;next} f' | grep -q -w notify_push; then
|
||||
exec_occ app:enable notify_push
|
||||
# If notify_push is not installed, install it
|
||||
elif ! exec_occ app:list | awk '/Enabled/{f=1;next} /Disabled/{f=0} f' | grep -q -w notify_push; then
|
||||
exec_occ app:install notify_push
|
||||
fi
|
||||
exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push
|
||||
|
||||
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"
|
||||
fi
|
||||
|
||||
|
||||
#=================================================
|
||||
# CRON JOB
|
||||
#=================================================
|
||||
|
|
@ -392,6 +434,27 @@ ynh_use_logrotate --non-append
|
|||
# Create a dedicated Fail2Ban config
|
||||
ynh_add_fail2ban_config --logpath="/var/log/$app/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: '<HOST>'.*$" --max_retry=5
|
||||
|
||||
#=================================================
|
||||
# CHECK IF NOTIFY_PUSH WORKS
|
||||
#=================================================
|
||||
|
||||
if [ $enable_notify_push -eq 1 ]
|
||||
then
|
||||
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-watcher" --action=restart
|
||||
ynh_systemd_action --service_name="${app}-notify-push" --action=restart --line_match="Push daemon for Nextcloud clients." --log_path="systemd" --action=restart
|
||||
|
||||
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
|
||||
|
||||
#=================================================
|
||||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ test_format = 1.0
|
|||
|
||||
[default]
|
||||
|
||||
args.enable_notify_push = "0"
|
||||
|
||||
# -------------------------------
|
||||
# Commits to test upgrade from
|
||||
# -------------------------------
|
||||
|
|
@ -11,3 +13,10 @@ test_format = 1.0
|
|||
test_upgrade_from.9c6d1eea.name = "Upgrade from 27.1.4"
|
||||
test_upgrade_from.e9f82ab7.name = "Upgrade from 28.0.6"
|
||||
test_upgrade_from.e9f82ab7.args.system_addressbook_exposed = "yes"
|
||||
|
||||
[notify_push_test]
|
||||
|
||||
args.enable_notify_push = "1"
|
||||
test_upgrade_from.e9f82ab7.name = "Upgrade from 28.0.6"
|
||||
test_upgrade_from.e9f82ab7.args.system_addressbook_exposed = "yes"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue