1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/onlyoffice_ynh.git synced 2024-09-03 19:56:11 +02:00

Merge pull request #76 from YunoHost-Apps/fix

Fix
This commit is contained in:
Éric Gaspar 2022-05-20 15:09:07 +02:00 committed by GitHub
commit e8dfb457fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 15 additions and 17 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Create and edit documents collaboratively Create and edit documents collaboratively
**Shipped version:** 6.4.2~ynh1 **Shipped version:** 7.1.0~ynh1
**Demo:** https://www.onlyoffice.com/fr/download-desktop.aspx **Demo:** https://www.onlyoffice.com/fr/download-desktop.aspx

View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Créez et éditer des documents collaborativement Créez et éditer des documents collaborativement
**Version incluse :** 6.4.2~ynh1 **Version incluse :** 7.1.0~ynh1
**Démo :** https://www.onlyoffice.com/fr/download-desktop.aspx **Démo :** https://www.onlyoffice.com/fr/download-desktop.aspx

View file

@ -6,7 +6,7 @@
"en": "Create and edit documents collaboratively", "en": "Create and edit documents collaboratively",
"fr": "Créez et éditer des documents collaborativement" "fr": "Créez et éditer des documents collaborativement"
}, },
"version": "6.4.2~ynh1", "version": "7.1.0~ynh1",
"url": "https://www.onlyoffice.com", "url": "https://www.onlyoffice.com",
"upstream": { "upstream": {
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
@ -20,7 +20,7 @@
"email": "liberodark@gmail.com" "email": "liberodark@gmail.com"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.2.0" "yunohost": ">= 4.3.0"
}, },
"multi_instance": false, "multi_instance": false,
"services": [ "services": [

View file

@ -65,4 +65,4 @@ ynh_psql_dump_db --database="$db_name" > db.sql
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================
ynh_print_info --message="Backup script completed for OnlyOffice. (YunoHost will then actually copy those files to the archive)." ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."

View file

@ -114,4 +114,4 @@ ynh_systemd_action --service_name=nginx --action=reload
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================
ynh_script_progression --message="Change of URL completed for OnlyOffice" ynh_script_progression --message="Change of URL completed for $app"

View file

@ -88,7 +88,7 @@ db_name=$(ynh_sanitize_dbid --db_name=$app)
db_user=$db_name db_user=$db_name
ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name
ynh_psql_test_if_first_run ynh_psql_test_if_first_run
ynh_psql_setup_db --db_user=$db_name --db_name=$db_name ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
@ -122,14 +122,14 @@ echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-
#================================================= #=================================================
ynh_script_progression --message="Install OnlyOffice..." ynh_script_progression --message="Install OnlyOffice..."
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 2>/dev/null
# The onlyoffice dev had the magnificent idea to add a "nginx restart" during # The onlyoffice dev had the magnificent idea to add a "nginx restart" during
# the install/configure of their package, which is awful since that will # the install/configure of their package, which is awful since that will
# restart nginx and the whole webadmin and maybe even the yunohost command # restart nginx and the whole webadmin and maybe even the yunohost command
# running the install ... # running the install ...
ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies 2>/dev/null
#================================================= #=================================================
# MODIFY A CONFIG FILE # MODIFY A CONFIG FILE
@ -195,4 +195,4 @@ ynh_systemd_action --service_name=nginx --action=reload
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================
ynh_script_progression --message="Installation of OnlyOffice completed" ynh_script_progression --message="Installation of $app completed"

View file

@ -37,7 +37,7 @@ ynh_secure_remove --file=/var/lib/dpkg/info/onlyoffice-documentserver.prerm
# already removed ... so their removal fails which breaks dpkg. # already removed ... so their removal fails which breaks dpkg.
# So instead, we trick it with this stupid link to /bin/true which is removed # So instead, we trick it with this stupid link to /bin/true which is removed
# right after. # right after.
ln -s /bin/true /usr/local/bin/supervisorctl #ln -s /bin/true /usr/local/bin/supervisorctl
ynh_package_autopurge onlyoffice-documentserver ynh_package_autopurge onlyoffice-documentserver
#================================================= #=================================================
@ -55,11 +55,10 @@ ynh_script_progression --message="Removing dependencies..."
# Remove metapackage and its dependencies # Remove metapackage and its dependencies
ynh_remove_app_dependencies ynh_remove_app_dependencies
#ynh_remove_extra_repo
dpkg --configure -a dpkg --configure -a
apt-key del "E09C A29F 6E17 8040 EF22 B409 8320 CA65 CB2D E8E5" apt-key del "E09C A29F 6E17 8040 EF22 B409 8320 CA65 CB2D E8E5" 2>/dev/null
#================================================= #=================================================
# REMOVE APP MAIN DIR # REMOVE APP MAIN DIR
@ -87,7 +86,6 @@ ynh_script_progression --message="Removing file..."
# Remove a directory securely # Remove a directory securely
ynh_secure_remove --file="/etc/onlyoffice" ynh_secure_remove --file="/etc/onlyoffice"
ynh_secure_remove --file="/var/lib/onlyoffice" ynh_secure_remove --file="/var/lib/onlyoffice"
#ynh_secure_remove --file="/var/cache/nginx/onlyoffice"
# Remove the log files # Remove the log files
ynh_secure_remove --file="/var/log/$app" ynh_secure_remove --file="/var/log/$app"
@ -107,4 +105,4 @@ ynh_system_user_delete --username=$app
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================
ynh_script_progression --message="Removal of OnlyOffice completed" ynh_script_progression --message="Removal of $app completed"

View file

@ -149,4 +149,4 @@ ynh_systemd_action --service_name=nginx --action=reload
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================
ynh_script_progression --message="Restoration completed for OnlyOffice" ynh_script_progression --message="Restoration completed for $app"

View file

@ -178,4 +178,4 @@ ynh_systemd_action --service_name=nginx --action=reload
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================
ynh_script_progression --message="Upgrade of OnlyOffice completed" ynh_script_progression --message="Upgrade of $app completed"