diff --git a/manifest.toml b/manifest.toml index b2c9d8e..d6215bf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -72,9 +72,14 @@ ram.runtime = "800M" "libstdc++6", "rabbitmq-server", "libcurl4-openssl-dev", - "ttf-mscorefonts-installer", ] + # Manual install in scripts + # [resources.apt.extras.ttf] + # repo = "deb http://deb.debian.org/debian/ bullseye main contrib" + # key = "https://ftp-master.debian.org/keys/release-bullseye.asc" + # packages = ["ttf-mscorefonts-installer"] + # Manual install in scripts # [resources.apt.extras.onlyoffice] # repo = "https://download.onlyoffice.com/repo/debian squeeze main" diff --git a/scripts/_common.sh b/scripts/_common.sh index 57b23d3..4de1a72 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,6 +8,18 @@ # PERSONAL HELPERS #================================================= +_install_msfonts_deb() { + + # Do not replace app dependencies + YNH_INSTALL_APP_DEPENDENCIES_REPLACE="false" + + # Run this here because it's less verbose for some reason + ynh_exec_warn_less ynh_install_extra_app_dependencies \ + --repo="deb http://deb.debian.org/debian/ $(lsb_release --codename --short) main contrib" \ + --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" \ + --package="ttf-mscorefonts-installer" +} + _install_onlyoffice_deb() { echo onlyoffice-documentserver onlyoffice/ds-port select "$port" | debconf-set-selections echo onlyoffice-documentserver onlyoffice/db-host string 127.0.0.1 | debconf-set-selections diff --git a/scripts/install b/scripts/install index aa03bca..fca5967 100644 --- a/scripts/install +++ b/scripts/install @@ -21,6 +21,7 @@ ynh_app_setting_set --app="$app" --key=jwt_secret --value="$jwt_secret" #================================================= ynh_script_progression --message="Install OnlyOffice..." +_install_msfonts_deb _install_onlyoffice_deb #================================================= diff --git a/scripts/restore b/scripts/restore index e954d93..89df2da 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,6 +20,7 @@ ynh_psql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" #================================================= ynh_script_progression --message="Install OnlyOffice..." +_install_msfonts_deb _install_onlyoffice_deb #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7a7a01f..f8cd7d5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,6 +22,7 @@ ynh_script_progression --message="Upgrading OnlyOffice..." ynh_backup_if_checksum_is_different --file="/etc/onlyoffice/documentserver/default.json" +_install_msfonts_deb _install_onlyoffice_deb #=================================================