Merge branch 'testing' into pr/88

tomdereub · Apr 25, 2023 · cb7fc85 · cb7fc85
2 parents be9110f + 74d9b9d
commit cb7fc85
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 33 deletions.
diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -1,4 +1,6 @@
-location ^~ __PATH__/ {
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+location __PATH__/ {
+
   proxy_pass        http://127.0.0.1:__PORT__/;
   proxy_http_version 1.1;
   proxy_set_header Upgrade $http_upgrade;
@@ -10,6 +12,7 @@ location ^~ __PATH__/ {
   proxy_redirect    off;
   proxy_set_header  Host $host;
   proxy_set_header  X-Real-IP $remote_addr;
+
   more_set_headers "X-Frame-Options : ALLOW-FROM https://__NEXTCLOUDDOMAIN__ always";
   client_max_body_size 10M;
 }
diff --git a/scripts/install b/scripts/install
@@ -126,9 +126,6 @@ echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-
 #=================================================
 ynh_script_progression --message="Install OnlyOffice..."
 
-# 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
@@ -153,17 +150,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R ds:ds "$final_path"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-# ynh_script_progression --message="Starting a systemd service..."
-
-# supervisorctl reload
-
-# sleep 30
-
 #=================================================
 # REGENERATE FONTS
 #=================================================

diff --git a/scripts/restore b/scripts/restore
@@ -60,7 +60,7 @@ ynh_script_progression --message="Reinstalling dependencies..."
 
 # Define and install 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/ buster main contrib" --package="ttf-mscorefonts-installer" --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc"
 
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
@@ -94,10 +94,7 @@ 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
-
-# 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"
+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
@@ -127,17 +124,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R ds:ds "$final_path"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-# ynh_script_progression --message="Starting a systemd service..."
-
-# supervisorctl reload
-
-# sleep 30
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================

diff --git a/scripts/upgrade b/scripts/upgrade
@@ -95,7 +95,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 ynh_script_progression --message="Upgrading 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/ $(lsb_release --codename --short) 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="ttf-mscorefonts-installer" --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -136,7 +136,7 @@ ynh_remove_extra_repo --name="$app" # backward compat
 # 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://download.onlyoffice.com/GPG-KEY-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"
 
 
 #=================================================