Merge pull request YunoHost-Apps#99 from smart4life/fix-install

Fix install
tomdereub · Apr 24, 2023 · ccaec78 · ccaec78
2 parents 5f9152b + 829c486
commit ccaec78
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -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.2.2~ynh1
+**Shipped version:** 7.3.3~ynh1
 
 **Demo:** https://www.onlyoffice.com/fr/download-desktop.aspx
 

diff --git a/README_fr.md b/README_fr.md
@@ -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.2.2~ynh1
+**Version incluse :** 7.3.3~ynh1
 
 **Démo :** https://www.onlyoffice.com/fr/download-desktop.aspx
 

diff --git a/doc/screenshots/.DS_Store b/doc/screenshots/.DS_Store
diff --git a/manifest.json b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Create and edit documents collaboratively",
         "fr": "Créez et éditer des documents collaborativement"
     },
-    "version": "7.2.2~ynh1",
+    "version": "7.3.3~ynh1",
     "url": "https://www.onlyoffice.com",
     "upstream": {
         "license": "GPL-3.0-or-later",

diff --git a/scripts/install b/scripts/install
@@ -70,7 +70,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 ynh_script_progression --message="Installing dependencies..."
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian/ buster main contrib" --package=$contrib_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc"
+ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian/ $(lsb_release --codename --short) main contrib" --package=$contrib_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc"
 
 #=================================================
 # CREATE DEDICATED USER
@@ -123,14 +123,15 @@ echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-
 #=================================================
 ynh_script_progression --message="Install OnlyOffice..."
 
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 2>/dev/null
+# keyserver.ubuntu.com response an error 500 regularly
+#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 install/configure of their package, which is awful since that will
 # restart nginx and the whole webadmin and maybe even the yunohost command
 # running the install ...
 
-ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc"
+ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE"
 
 #=================================================
 # ADD A CONFIGURATION
@@ -154,11 +155,11 @@ chown -R ds:ds "$final_path"
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..."
+# ynh_script_progression --message="Starting a systemd service..."
 
-supervisorctl reload
+# supervisorctl reload
 
-sleep 30
+# sleep 30
 
 #=================================================
 # REGENERATE FONTS

diff --git a/scripts/restore b/scripts/restore
@@ -94,9 +94,10 @@ echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-
 #=================================================
 ynh_script_progression --message="Reinstalling 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
 
-ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc"
+# ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc"
+ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE"
 
 #=================================================
 # RESTORE THE CONFIGURATION
@@ -131,11 +132,11 @@ chown -R ds:ds "$final_path"
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..."
+# ynh_script_progression --message="Starting a systemd service..."
 
-supervisorctl reload
+# supervisorctl reload
 
-sleep 30
+# sleep 30
 
 #=================================================
 # GENERIC FINALIZATION

diff --git a/scripts/upgrade b/scripts/upgrade
@@ -131,10 +131,13 @@ echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-
 ynh_script_progression --message="Upgrading OnlyOffice..."
 
 ynh_remove_extra_repo --name="$app" # backward compat
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5
+
+# keyserver.ubuntu.com response an error 500 regularly
+# apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5
 
 # ynh_remove_app_dependencies
-ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc"
+ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE"
+
 
 #=================================================
 # UPDATE A CONFIG FILE
@@ -169,11 +172,11 @@ chown -R ds:ds "$final_path"
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..."
+# ynh_script_progression --message="Starting a systemd service..."
 
-supervisorctl reload
+# supervisorctl reload
 
-sleep 30
+# sleep 30
 
 #=================================================
 # RELOAD NGINX