mirror of
https://github.com/YunoHost-Apps/onlyoffice_ynh.git
synced 2024-09-03 19:56:11 +02:00
eric_G
GitHub
commit
74b3ea2a7e
10 changed files with 41 additions and 27 deletions
|
|
@ -30,7 +30,7 @@ Online collaborative edition of ONLYOFFICE documents requires:
|
|||
A solution made easy by YunoHost is to install (1.i) and (2.i), see [section below](https://github.com/YunoHost-Apps/onlyoffice_ynh/#configuration-of-onlyoffice-server). The Nextcloud addicts may follow [this tutorial](https://github.com/YunoHost-Apps/nextcloud_ynh#configure-onlyoffice-integration) to install (1.ii) and (2.i) on one Nextcloud instance. However, performance and architecture are limited.
|
||||
|
||||
|
||||
**Shipped version:** 7.3.3~ynh1
|
||||
**Shipped version:** 7.5~ynh1
|
||||
|
||||
**Demo:** https://www.onlyoffice.com/fr/download-desktop.aspx
|
||||
|
||||
|
|
@ -76,7 +76,9 @@ You should not install ONLYOFFICE on your main YunoHost domain, especially if yo
|
|||
Prerequisite: **ONLYOFFICE should be public**, see previous section.
|
||||
* In Nextcloud apps store, install `ONLYOFFICE`, i.e. the [ONLYOFFICE connector for Nextcloud](https://apps.nextcloud.com/apps/onlyoffice).
|
||||
* Go in the Nextcloud `settings` > `Administration` > `ONLYOFFICE` > `Server settings` > `Address of the Document Server`.
|
||||
* Give the installation domain of your `onlyoffice`, e.g. `https://office.yunohost.domain/` and click `Save`.
|
||||
* Give the installation domain of your `onlyoffice`, e.g. `https://office.yunohost.domain/`.
|
||||
* Give the secret key that was sent to you by email during the install (you can also retrieve it with the CLI command `sudo documentserver-jwt-status.sh`).
|
||||
* Click `Save`.
|
||||
* Create a new document and enjoy!
|
||||
|
||||
### Desktop Edition on PC
|
||||
|
|
@ -92,7 +94,6 @@ Prerequisite: **ONLYOFFICE should be public**, see previous section.
|
|||
|
||||
* Official app website: <https://www.onlyoffice.com>
|
||||
* Upstream app code repository: <https://github.com/ONLYOFFICE/DocumentServer>
|
||||
* YunoHost documentation for this app: <https://yunohost.org/app_onlyoffice>
|
||||
* Report a bug: <https://github.com/YunoHost-Apps/onlyoffice_ynh/issues>
|
||||
|
||||
## Developer info
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ L'édition collaborative en ligne des documents ONLYOFFICE nécessite :
|
|||
Une solution rendue facile par YunoHost est d'installer (1.i) et (2.i), voir [ci-dessous](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server). Les utilisateurs qui aiment le tout Nextcloud peuvent suivre [ce tutoriel](https://github.com/YunoHost-Apps/nextcloud_ynh/blob/master/README_fr.md#configurer-lint%C3%A9gration-donlyoffice) pour installer le Community Document Server (1.ii) et ONLYOFFICE connector (2.i) sur une instance Nextcloud. Cependant, les performances et l'architecture sont limitées.
|
||||
|
||||
|
||||
**Version incluse :** 7.3.3~ynh1
|
||||
**Version incluse :** 7.5~ynh1
|
||||
|
||||
**Démo :** https://www.onlyoffice.com/fr/download-desktop.aspx
|
||||
|
||||
|
|
@ -76,7 +76,9 @@ Vous ne devez pas installer ONLYOFFICE sur votre domaine YunoHost principal, sur
|
|||
Prérequis : **ONLYOFFICE doit être public**, voir la section précédente.
|
||||
* dans le magasin d'applications Nextcloud, installez `ONLYOFFICE`, c'est-à-dire le [connecteur ONLYOFFICE pour Nextcloud](https://apps.nextcloud.com/apps/onlyoffice)
|
||||
* Allez dans Nextcloud `Paramètres` > `Administration` > `ONLYOFFICE` > `Paramètres du serveur` > `Adresse du service d'édition de document`.
|
||||
* Spécifiez le domaine d'installation de votre serveur `ONLYOFFICE`, par exemple `https://office.yunohost.domain/` et cliquez sur `Enregistrer`.
|
||||
* Spécifiez le domaine d'installation de votre serveur `ONLYOFFICE`, par exemple `https://office.yunohost.domain/`.
|
||||
* Renseignez la clé secrète qui vous a été envoyée par email lors de l'installation (vous pouvez aussi la retrouve avec la ligne de commande `sudo documentserver-jwt-status.sh`).
|
||||
* Cliquez sur `Enregistrer`.
|
||||
* Créez un nouveau document !
|
||||
|
||||
### Desktop Édition sur PC
|
||||
|
|
@ -92,7 +94,6 @@ Prérequis : **ONLYOFFICE doit être public**, voir la section précédente.
|
|||
|
||||
* Site officiel de l’app : <https://www.onlyoffice.com>
|
||||
* Dépôt de code officiel de l’app : <https://github.com/ONLYOFFICE/DocumentServer>
|
||||
* Documentation YunoHost pour cette app : <https://yunohost.org/app_onlyoffice>
|
||||
* Signaler un bug : <https://github.com/YunoHost-Apps/onlyoffice_ynh/issues>
|
||||
|
||||
## Informations pour les développeurs
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@
|
|||
setup_private=1
|
||||
setup_public=1
|
||||
upgrade=1
|
||||
upgrade=1 from_commit=2be500cb4251cc1209ae36c7f0668aa17be230aa
|
||||
#7.3.3~ynh1
|
||||
upgrade=1 from_commit=205cc12c26b46c57ba8459f449e835949be44096
|
||||
backup_restore=1
|
||||
multi_instance=0
|
||||
port_already_use=0
|
||||
|
|
@ -21,6 +22,6 @@
|
|||
Email=
|
||||
Notification=none
|
||||
;;; Upgrade options
|
||||
; commit=2be500cb4251cc1209ae36c7f0668aa17be230aa
|
||||
name=Merge pull request #72 from YunoHost-Apps/testing
|
||||
; commit=205cc12c26b46c57ba8459f449e835949be44096
|
||||
name=7.3.3~ynh1
|
||||
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
|
||||
|
|
@ -1,11 +1,10 @@
|
|||
__APP__ was successfully installed :)
|
||||
|
||||
Please open your __APP__ domain: https://__DOMAIN____PATH_URL__
|
||||
|
||||
To configure OnlyOffice with your Nextcloud, go to the settings:
|
||||
under "Administration > ONLYOFFICE > Server settings >
|
||||
- Address of the Document Server" enter: "https://__DOMAIN____PATH_URL__"
|
||||
- Secret key" enter "__JWT_TOKEN__"
|
||||
To configure OnlyOffice with Nextcloud:
|
||||
- Within Nextcloud, install ONLYOFFICE app
|
||||
- go to the settings under "Administration > ONLYOFFICE > Server settings
|
||||
- Address of the Document Server: "https://__DOMAIN____PATH_URL__"
|
||||
- Secret key: "__JWT_SECRET__"
|
||||
|
||||
OnlyOffice should now work with your Nextcloud!
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,9 @@ You should not install ONLYOFFICE on your main YunoHost domain, especially if yo
|
|||
Prerequisite: **ONLYOFFICE should be public**, see previous section.
|
||||
* In Nextcloud apps store, install `ONLYOFFICE`, i.e. the [ONLYOFFICE connector for Nextcloud](https://apps.nextcloud.com/apps/onlyoffice).
|
||||
* Go in the Nextcloud `settings` > `Administration` > `ONLYOFFICE` > `Server settings` > `Address of the Document Server`.
|
||||
* Give the installation domain of your `onlyoffice`, e.g. `https://office.yunohost.domain/` and click `Save`.
|
||||
* Give the installation domain of your `onlyoffice`, e.g. `https://office.yunohost.domain/`.
|
||||
* Give the secret key that was sent to you by email during the install (you can also retrieve it with the CLI command `sudo documentserver-jwt-status.sh`).
|
||||
* Click `Save`.
|
||||
* Create a new document and enjoy!
|
||||
|
||||
### Desktop Edition on PC
|
||||
|
|
|
|||
|
|
@ -34,7 +34,9 @@ Vous ne devez pas installer ONLYOFFICE sur votre domaine YunoHost principal, sur
|
|||
Prérequis : **ONLYOFFICE doit être public**, voir la section précédente.
|
||||
* dans le magasin d'applications Nextcloud, installez `ONLYOFFICE`, c'est-à-dire le [connecteur ONLYOFFICE pour Nextcloud](https://apps.nextcloud.com/apps/onlyoffice)
|
||||
* Allez dans Nextcloud `Paramètres` > `Administration` > `ONLYOFFICE` > `Paramètres du serveur` > `Adresse du service d'édition de document`.
|
||||
* Spécifiez le domaine d'installation de votre serveur `ONLYOFFICE`, par exemple `https://office.yunohost.domain/` et cliquez sur `Enregistrer`.
|
||||
* Spécifiez le domaine d'installation de votre serveur `ONLYOFFICE`, par exemple `https://office.yunohost.domain/`.
|
||||
* Renseignez la clé secrète qui vous a été envoyée par email lors de l'installation (vous pouvez aussi la retrouve avec la ligne de commande `sudo documentserver-jwt-status.sh`).
|
||||
* Cliquez sur `Enregistrer`.
|
||||
* Créez un nouveau document !
|
||||
|
||||
### Desktop Édition sur PC
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"en": "Create and edit documents collaboratively",
|
||||
"fr": "Créez et éditer des documents collaborativement"
|
||||
},
|
||||
"version": "7.3.3~ynh1",
|
||||
"version": "7.5~ynh1",
|
||||
"url": "https://www.onlyoffice.com",
|
||||
"upstream": {
|
||||
"license": "GPL-3.0-or-later",
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
"email": ""
|
||||
},
|
||||
"requirements": {
|
||||
"yunohost": ">= 11.0.9"
|
||||
"yunohost": ">= 11.2"
|
||||
},
|
||||
"multi_instance": false,
|
||||
"services": [
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ nextclouddomain=$YNH_APP_ARG_NEXTCLOUDDOMAIN
|
|||
app=$YNH_APP_INSTANCE_NAME
|
||||
admin=$YNH_APP_ARG_ADMIN
|
||||
admin_mail=$(ynh_user_get_info --username=$admin --key="mail")
|
||||
jwt_secret=$(ynh_string_random --length=32)
|
||||
|
||||
#=================================================
|
||||
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
|
||||
|
|
@ -54,6 +55,7 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain
|
|||
ynh_app_setting_set --app=$app --key=path --value=$path_url
|
||||
ynh_app_setting_set --app=$app --key=nextclouddomain --value=$nextclouddomain
|
||||
ynh_app_setting_set --app=$app --key=final_path --value=$final_path
|
||||
ynh_app_setting_set --app=$app --key=jwt_secret --value=$jwt_secret
|
||||
|
||||
#=================================================
|
||||
# STANDARD MODIFICATIONS
|
||||
|
|
@ -120,7 +122,8 @@ echo onlyoffice-documentserver onlyoffice/db-user string $db_user | debconf-set-
|
|||
echo onlyoffice-documentserver onlyoffice/db-pwd password $db_pwd | debconf-set-selections
|
||||
echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-selections
|
||||
|
||||
#echo onlyoffice-documentserver onlyoffice/jwt-enabled boolean false | debconf-set-selections
|
||||
#JWT options
|
||||
echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections
|
||||
|
||||
#=================================================
|
||||
# INSTALL ONLYOFFICE
|
||||
|
|
@ -183,8 +186,6 @@ ynh_systemd_action --service_name=nginx --action=reload
|
|||
#=================================================
|
||||
ynh_script_progression --message="Sending a readme for the admin..."
|
||||
|
||||
jwt_token=$(documentserver-jwt-status.sh | sed "3q;d" | cut -d "-" -f 2 | tr -d ' ')
|
||||
|
||||
ynh_send_readme_to_admin --app_message="../conf/msg_install" --recipients=$admin_mail --type='install'
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ db_user=$db_name
|
|||
db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
|
||||
port=$(ynh_app_setting_get --app=$app --key=port)
|
||||
nextclouddomain=$(ynh_app_setting_get --app=$app --key=nextclouddomain)
|
||||
jwt_secret=$(ynh_app_setting_get --app=$app --key=jwt_secret)
|
||||
|
||||
#=================================================
|
||||
# CHECK IF THE APP CAN BE RESTORED
|
||||
|
|
@ -89,12 +90,15 @@ echo onlyoffice-documentserver onlyoffice/db-user string $db_user | debconf-set-
|
|||
echo onlyoffice-documentserver onlyoffice/db-pwd password $db_pwd | debconf-set-selections
|
||||
echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-selections
|
||||
|
||||
#JWT options
|
||||
#echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections
|
||||
|
||||
#=================================================
|
||||
# REINSTALL ONLYOFFICE
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reinstalling OnlyOffice..."
|
||||
|
||||
ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package="onlyoffice-documentserver" --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE"
|
||||
ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package="onlyoffice-documentserver" --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE"
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE CONFIGURATION
|
||||
|
|
@ -106,6 +110,7 @@ ynh_restore_file --origin_path="/etc/onlyoffice"
|
|||
#=================================================
|
||||
# RESTORE THE CACHE
|
||||
#=================================================
|
||||
|
||||
ynh_restore_file --origin_path="/var/lib/onlyoffice/documentserver/App_Data/cache/files"
|
||||
|
||||
#=================================================
|
||||
|
|
@ -113,7 +118,7 @@ ynh_restore_file --origin_path="/var/lib/onlyoffice/documentserver/App_Data/cach
|
|||
#=================================================
|
||||
ynh_script_progression --message="Generating fonts..."
|
||||
|
||||
/usr/bin/documentserver-generate-allfonts.sh
|
||||
/usr/bin/documentserver-generate-allfonts.sh 2>/dev/null
|
||||
|
||||
#=================================================
|
||||
# SECURE FILES AND DIRECTORIES
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@ db_user=$db_name
|
|||
db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
|
||||
port=$(ynh_app_setting_get --app=$app --key=port)
|
||||
nextclouddomain=$(ynh_app_setting_get --app=$app --key=nextclouddomain)
|
||||
#jwt_secret=$(ynh_app_setting_get --app=$app --key=jwt_secret)
|
||||
|
||||
#=================================================
|
||||
# CHECK VERSION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Checking version..."
|
||||
|
||||
upgrade_type=$(ynh_check_app_version_changed)
|
||||
|
||||
|
|
@ -125,6 +125,9 @@ echo onlyoffice-documentserver onlyoffice/db-user string $db_user | debconf-set-
|
|||
echo onlyoffice-documentserver onlyoffice/db-pwd password $db_pwd | debconf-set-selections
|
||||
echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-selections
|
||||
|
||||
#JWT options
|
||||
#echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections
|
||||
|
||||
#=================================================
|
||||
# UPGRADE ONLYOFFICE
|
||||
#=================================================
|
||||
|
|
@ -138,7 +141,6 @@ ynh_remove_extra_repo --name="$app" # backward compat
|
|||
# ynh_remove_app_dependencies
|
||||
ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package="onlyoffice-documentserver" --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE"
|
||||
|
||||
|
||||
#=================================================
|
||||
# UPDATE A CONFIG FILE
|
||||
#=================================================
|
||||
|
|
@ -156,7 +158,7 @@ ynh_store_file_checksum --file="/etc/onlyoffice/documentserver/default.json"
|
|||
#=================================================
|
||||
ynh_script_progression --message="Generating fonts..."
|
||||
|
||||
/usr/bin/documentserver-generate-allfonts.sh
|
||||
/usr/bin/documentserver-generate-allfonts.sh 2>/dev/null
|
||||
|
||||
#=================================================
|
||||
# SECURE FILES AND DIRECTORIES
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue