YunoHost-Apps/nextcloud_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/nextcloud_ynh.git synced 2024-09-03 19:55:57 +02:00
Code Issues Activity Actions

Small typos

Browse source
This commit is contained in:
ericgaspar 2020-10-03 12:11:28 +02:00
parent 7e638dbaa8
commit 8a52c9d401
No known key found for this signature in database
GPG key ID: 574F281483054D44
6 changed files with 35 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
README.md
View file

@ -9,9 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
## Overview ## Overview
[Nextcloud](https://nextcloud.com) gives you freedom and control over your [Nextcloud](https://nextcloud.com) gives you freedom and control over your own data. A personal cloud which runs on your own server. With Nextcloud you can synchronize your files over your devices.
own data. A personal cloud which runs on your own server. With Nextcloud
you can synchronize your files over your devices.
**Shipped version:** 20.0.0 **Shipped version:** 20.0.0
@ -41,7 +39,7 @@ To install and configure it:
- Then in Settings -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by OnlyOffice. - Then in Settings -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by OnlyOffice.
- Here you go :) You should be able to create new type of documents and open them. - Here you go :) You should be able to create new type of documents and open them.
*NB: OnlyOffice is only available for x86 architecture - **ARM** (Raspberry Pi, …) is **not** supported* *NB: OnlyOffice is only available for x86 architecture - **ARM** (Raspberry Pi...) is **not** supported*
## YunoHost specific features ## YunoHost specific features
@ -51,10 +49,8 @@ this package:
* Integrate with YunoHost users and SSO - i.e. logout button * Integrate with YunoHost users and SSO - i.e. logout button
* Allow one user to be the administrator (set at the installation) * Allow one user to be the administrator (set at the installation)
* Allow multiple instances of this application * Allow multiple instances of this application
* Optionally access the user home folder from Nextcloud files (set at the * Optionally access the user home folder from Nextcloud files (set at the installation, the sharing is enabled by default)
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
* Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's
not already served - i.e. by Baïkal
#### Multi-users support #### Multi-users support
@ -65,13 +61,9 @@ this package:
## Limitations ## Limitations
To integrate the logout button to the SSO, we have to patch Nextcloud sources. To integrate the logout button to the SSO, we have to patch Nextcloud sources. In waiting an upstream integration, the source code integrity checking has been disabled to prevent the warning message.
In waiting an upstream integration, the source code integrity checking has been
disabled to prevent the warning message.
Also, note we made the choice to disable third-parties applications at the Also, note we made the choice to disable third-parties applications at the upgrade. It allows to prevent an unstable - and sometimes broken - Nextcloud installation. You will just have to manually activate them after the upgrade.
upgrade. It allows to prevent an unstable - and sometimes broken - Nextcloud
installation. You will just have to manually activate them after the upgrade.
Finally, the following error message in Nextcloud logs can be safely ignored: Finally, the following error message in Nextcloud logs can be safely ignored:
``` ```
@ -91,15 +83,11 @@ If you need/want to use Nextcloud `occ` command¹, you need to be in `/var/www/n
#### Migrate from ownCloud #### Migrate from ownCloud
**This is not considered as stable yet, please do it with care and only for **This is not considered as stable yet, please do it with care and only for testing!**
testing!**
This package handles the migration from ownCloud to Nextcloud. For that, your This package handles the migration from ownCloud to Nextcloud. For that, your ownCloud application must be **up-to-date** in YunoHost.
ownCloud application must be **up-to-date** in YunoHost.
You will then have to upgrade your ownCloud application with this repository. You will then have to upgrade your ownCloud application with this repository. This can only be done from the command-line interface - e.g. through SSH. Once you're connected, you simply have to execute the following:
This can only be done from the command-line interface - e.g. through SSH. Once
you're connected, you simply have to execute the following:
```bash ```bash
sudo yunohost app upgrade -u https://github.com/YunoHost-Apps/nextcloud_ynh owncloud --debug sudo yunohost app upgrade -u https://github.com/YunoHost-Apps/nextcloud_ynh owncloud --debug
@ -108,13 +96,9 @@ sudo yunohost app upgrade -u https://github.com/YunoHost-Apps/nextcloud_ynh ownc
The `--debug` option will let you see the full output. If you encounter any The `--debug` option will let you see the full output. If you encounter any
issue, please paste it. issue, please paste it.
Note that a cron job will be executed at some time after the end of this Note that a cron job will be executed at some time after the end of this command. You must wait that before doing any other application operations! You should see that Nextcloud is installed after that.
command. You must wait that before doing any other application operations!
You should see that Nextcloud is installed after that.
Note that it does not change the application label nor the URL. To rename Note that it does not change the application label nor the URL. To rename the label, you can execute the following - replace `Nextcloud` with whatever you want:
the label, you can execute the following - replace `Nextcloud` with whatever
you want:
```bash ```bash
sudo yunohost app setting nextcloud label -v "Nextcloud" sudo yunohost app setting nextcloud label -v "Nextcloud"
@ -130,8 +114,7 @@ sudo yunohost app ssowatconf
--- ---
Developers infos ## Developers infos
----------------
Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing).

9
README_fr.md
View file

@ -41,7 +41,7 @@ Pour l'installer et le configurer :
- Ensuite dans les Paramètres -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec OnlyOffice. - Ensuite dans les Paramètres -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec OnlyOffice.
- Et voilà :) Vous devriez pouvoir créer de nouveaux types de documents, et les ouvrir. - Et voilà :) Vous devriez pouvoir créer de nouveaux types de documents, et les ouvrir.
*NB : OnlyOffice n'est disponible que sous architecture x86 - **ARM** (Raspberry Pi, …) n'est **pas** supporté* *NB : OnlyOffice n'est disponible que sous architecture x86 - **ARM** (Raspberry Pi...) n'est **pas** supporté*
## Caractéristiques spécifiques YunoHost ## Caractéristiques spécifiques YunoHost
@ -79,9 +79,9 @@ Following symlinks is not allowed ('/home/yunohost.multimedia/user/Share' -> '/h
**La migration n'est pas encore considérée comme stable, merci de la faire prudemment et uniquement pour tester !** **La migration n'est pas encore considérée comme stable, merci de la faire prudemment et uniquement pour tester !**
Ce package gère la migration de OwnCloud vers Nextcloud. Pour ça, l'application OwnCloud doit **être à jour** dans YunoHost. Ce package gère la migration de ownCloud vers Nextcloud. Pour ça, l'application ownCloud doit **être à jour** dans YunoHost.
Vous allez ensuite mettre à niveau votre OwnCloud avec ce dépôt. Vous allez ensuite mettre à niveau votre ownCloud avec ce dépôt.
Ça ne peut être fait qu'en ligne de commande - par exemple via SSH. Une fois connecté, vous n'avez plus qu'à exécuter la commande suivante : Ça ne peut être fait qu'en ligne de commande - par exemple via SSH. Une fois connecté, vous n'avez plus qu'à exécuter la commande suivante :
```bash ```bash
sudo yunohost app upgrade -u https://github.com/YunoHost-Apps/nextcloud_ynh owncloud --debug sudo yunohost app upgrade -u https://github.com/YunoHost-Apps/nextcloud_ynh owncloud --debug
@ -107,8 +107,7 @@ sudo yunohost app ssowatconf
--- ---
Informations pour les développeurs ## Informations pour les développeurs
----------------
Merci de faire votre « pull request » sur la [branche testing](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). Merci de faire votre « pull request » sur la [branche testing](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing).
Pour tester la branche testing, faites comme ceci. Pour tester la branche testing, faites comme ceci.

10
scripts/install
View file

@ -158,7 +158,7 @@ ynh_script_progression --message="Configuring Nextcloud..." --weight=8
# Ensure that UpdateNotification app is disabled # Ensure that UpdateNotification app is disabled
exec_occ app:disable updatenotification exec_occ app:disable updatenotification
# Enable ldap plugin # Enable LDAP plugin
exec_occ app:enable user_ldap exec_occ app:enable user_ldap
exec_occ ldap:create-empty-config exec_occ ldap:create-empty-config
@ -187,8 +187,8 @@ ynh_secure_remove --file="$nc_conf"
#================================================= #=================================================
# Check LDAP configuration to see if everything worked well # Check LDAP configuration to see if everything worked well
# exec_occ ldap:test-config \'\' \ exec_occ ldap:test-config \'\' \
# || ynh_die --message="An error occured during LDAP configuration" || ynh_die --message="An error occured during LDAP configuration"
#================================================= #=================================================
# MOUNT HOME FOLDERS AS EXTERNAL STORAGE # MOUNT HOME FOLDERS AS EXTERNAL STORAGE
@ -324,9 +324,9 @@ ynh_use_logrotate --logfile="$datadir/nextcloud.log"
#================================================= #=================================================
# SETUP FAIL2BAN # SETUP FAIL2BAN
#================================================= #=================================================
ynh_script_progression --message="Configuring Fail2ban..." --weight=8 ynh_script_progression --message="Configuring Fail2Ban..." --weight=8
# Create a dedicated Fail2ban config # Create a dedicated Fail2Ban config
ynh_add_fail2ban_config --logpath="/home/yunohost.app/$app/data/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: '<HOST>'.*$" --max_retry=5 ynh_add_fail2ban_config --logpath="/home/yunohost.app/$app/data/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: '<HOST>'.*$" --max_retry=5
#================================================= #=================================================

4
scripts/remove
View file

@ -73,9 +73,9 @@ ynh_remove_logrotate
#================================================= #=================================================
# REMOVE FAIL2BAN CONFIGURATION # REMOVE FAIL2BAN CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Removing Fail2ban configuration..." --weight=8 ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=8
# Remove the dedicated Fail2ban config # Remove the dedicated Fail2Ban config
ynh_remove_fail2ban_config ynh_remove_fail2ban_config
#================================================= #=================================================

2
scripts/restore
View file

@ -156,7 +156,7 @@ ynh_multimedia_addaccess $app
#================================================= #=================================================
# RESTORE THE FAIL2BAN CONFIGURATION # RESTORE THE FAIL2BAN CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Restoring the Fail2ban configuration..." --weight=7 ynh_script_progression --message="Restoring the Fail2Ban configuration..." --weight=7
ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf"
ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf"

25
scripts/upgrade
View file

@ -147,11 +147,11 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
ynh_backup_if_checksum_is_different --file="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup_if_checksum_is_different --file="/etc/nginx/conf.d/$domain.d/$app.conf"
# Delete current nginx configuration to be able to check if .well-known is already served. # Delete current NGINX configuration to be able to check if .well-known is already served.
ynh_remove_nginx_config ynh_remove_nginx_config
ynh_app_setting_delete --app=$app --key="checksum__etc_nginx_conf.d_$domain.d_$app.conf" ynh_app_setting_delete --app=$app --key="checksum__etc_nginx_conf.d_$domain.d_$app.conf"
# Wait untils nginx has fully reloaded # Wait untils NGINX has fully reloaded
ynh_systemd_action --service_name=nginx --action=reload --line_match="Reloaded" --log_path="systemd" ynh_systemd_action --service_name=nginx --action=reload --line_match="Reloaded" --log_path="systemd"
# Check if .well-known is available for this domain # Check if .well-known is available for this domain
@ -163,7 +163,7 @@ then
sed --in-place --regexp-extended '/^location = \/\.well\-known\/(caldav|carddav) \{/,/\}/d' "../conf/nginx.conf" sed --in-place --regexp-extended '/^location = \/\.well\-known\/(caldav|carddav) \{/,/\}/d' "../conf/nginx.conf"
fi fi
# Create a dedicated nginx config # Create a dedicated NGINX config
ynh_add_nginx_config YNH_PHP_VERSION ynh_add_nginx_config YNH_PHP_VERSION
#================================================= #=================================================
@ -179,7 +179,7 @@ ynh_system_user_create --username=$app
#================================================= #=================================================
ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
# Recreate a dedicated php-fpm config # Recreate a dedicated PHP-FPM config
ynh_add_fpm_config --phpversion="$YNH_PHP_VERSION" --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies" ynh_add_fpm_config --phpversion="$YNH_PHP_VERSION" --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies"
# Delete existing ini configuration file (backward compatibility) # Delete existing ini configuration file (backward compatibility)
@ -309,12 +309,9 @@ then
exec_occ -V exec_occ -V
done done
( exec_occ db:add-missing-indices
cd $final_path exec_occ db:add-missing-columns
sudo -u $app php${YNH_PHP_VERSION} occ db:add-missing-indices exec_occ db:convert-filecache-bigint -n
sudo -u $app php${YNH_PHP_VERSION} occ db:add-missing-columns
sudo -u $app php${YNH_PHP_VERSION} occ db:convert-filecache-bigint -n
)
#================================================= #=================================================
# CONFIGURE NEXTCLOUD # CONFIGURE NEXTCLOUD
@ -333,7 +330,7 @@ then
# Ensure that UpdateNotification app is disabled # Ensure that UpdateNotification app is disabled
exec_occ app:disable updatenotification exec_occ app:disable updatenotification
# Enable plugins # Enable LDAP plugin
exec_occ app:enable user_ldap exec_occ app:enable user_ldap
# Load the config file in nextcloud # Load the config file in nextcloud
@ -445,9 +442,9 @@ ynh_use_logrotate --non-append
#================================================= #=================================================
# SETUP FAIL2BAN # SETUP FAIL2BAN
#================================================= #=================================================
ynh_script_progression --message="Reconfiguring Fail2ban..." --weight=7 ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=7
# Create a dedicated Fail2ban config # Create a dedicated Fail2Ban config
ynh_add_fail2ban_config --logpath="/home/yunohost.app/$app/data/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: '<HOST>'.*$" --max_retry=5 ynh_add_fail2ban_config --logpath="/home/yunohost.app/$app/data/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: '<HOST>'.*$" --max_retry=5
#================================================= #=================================================
@ -474,7 +471,7 @@ ynh_systemd_action --service_name=nginx --action=reload
if [ $migration_process -eq 1 ] if [ $migration_process -eq 1 ]
then then
ynh_print_info --message="OwnCloud has been successfully migrated to Nextcloud! \ ynh_print_info --message="ownCloud has been successfully migrated to Nextcloud! \
A last scheduled operation will run in a couple of minutes to finish the \ A last scheduled operation will run in a couple of minutes to finish the \
migration in YunoHost side. Do not proceed any application operation while \ migration in YunoHost side. Do not proceed any application operation while \
you don't see Nextcloud as installed." you don't see Nextcloud as installed."