mirror of
https://github.com/YunoHost-Apps/collabora_ynh.git
synced 2024-09-03 18:16:25 +02:00
Fix
This commit is contained in:
parent
023db7240c
commit
59188a4c5f
4 changed files with 4 additions and 20 deletions
|
@ -1,11 +1,6 @@
|
||||||
# See here for more informations
|
|
||||||
# https://github.com/YunoHost/package_check#syntax-check_process-file
|
|
||||||
|
|
||||||
# Move this file from check_process.default to check_process when you have filled it.
|
|
||||||
|
|
||||||
;; Test complet
|
;; Test complet
|
||||||
; Manifest
|
; Manifest
|
||||||
domain="domain.tld" (DOMAIN)
|
domain="domain.tld"
|
||||||
password="pass"
|
password="pass"
|
||||||
nextcloud_domain="nextcloud.tld"
|
nextcloud_domain="nextcloud.tld"
|
||||||
; Checks
|
; Checks
|
||||||
|
@ -18,7 +13,6 @@
|
||||||
upgrade=1
|
upgrade=1
|
||||||
backup_restore=1
|
backup_restore=1
|
||||||
multi_instance=0
|
multi_instance=0
|
||||||
port_already_use=0
|
|
||||||
change_url=0
|
change_url=0
|
||||||
;;; Options
|
;;; Options
|
||||||
Email=
|
Email=
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
"email": "rafi59_dev@srvmaison.fr.nf"
|
"email": "rafi59_dev@srvmaison.fr.nf"
|
||||||
},
|
},
|
||||||
"requirements": {
|
"requirements": {
|
||||||
"yunohost": ">= 4.1.4.3"
|
"yunohost": ">= 4.2.4"
|
||||||
},
|
},
|
||||||
"multi_instance": false,
|
"multi_instance": false,
|
||||||
"services": [
|
"services": [
|
||||||
|
|
|
@ -74,7 +74,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
|
||||||
# config directory which of course doesn't exists and we want to disable SSL
|
# config directory which of course doesn't exists and we want to disable SSL
|
||||||
# because we're in a reverse proxy context...
|
# because we're in a reverse proxy context...
|
||||||
mkdir -p /etc/loolwsd
|
mkdir -p /etc/loolwsd
|
||||||
ynh_add_config ../conf/loolwsd.xml /etc/loolwsd/loolwsd.xml
|
ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# INSTALL DEPENDENCIES
|
# INSTALL DEPENDENCIES
|
||||||
|
|
|
@ -27,15 +27,6 @@ nextcloud_domain=$(ynh_app_setting_get --app="$app" --key=nextcloud_domain)
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Ensuring downward compatibility..."
|
ynh_script_progression --message="Ensuring downward compatibility..."
|
||||||
|
|
||||||
# Fix is_public as a boolean value
|
|
||||||
if [ "$is_public" = "Yes" ]; then
|
|
||||||
ynh_app_setting_set --app=$app --key=is_public --value=1
|
|
||||||
is_public=1
|
|
||||||
elif [ "$is_public" = "No" ]; then
|
|
||||||
ynh_app_setting_set --app=$app --key=is_public --value=0
|
|
||||||
is_public=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If db_name doesn't exist, create it
|
# If db_name doesn't exist, create it
|
||||||
if [ -z "$path_url" ]; then
|
if [ -z "$path_url" ]; then
|
||||||
path_url="/"
|
path_url="/"
|
||||||
|
@ -86,7 +77,6 @@ ynh_add_nginx_config
|
||||||
ynh_script_progression --message="Upgrading dependencies..."
|
ynh_script_progression --message="Upgrading dependencies..."
|
||||||
|
|
||||||
DEBIAN_VERSION_NUMBER=$(cat /etc/debian_version | head -n 1 | cut -f1 -d .)
|
DEBIAN_VERSION_NUMBER=$(cat /etc/debian_version | head -n 1 | cut -f1 -d .)
|
||||||
|
|
||||||
ynh_install_extra_app_dependencies --repo="deb https://collaboraoffice.com/repos/CollaboraOnline/CODE-debian${DEBIAN_VERSION_NUMBER} ./ " --package="$pkg_dependencies" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x0C54D189F4BA284D"
|
ynh_install_extra_app_dependencies --repo="deb https://collaboraoffice.com/repos/CollaboraOnline/CODE-debian${DEBIAN_VERSION_NUMBER} ./ " --package="$pkg_dependencies" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x0C54D189F4BA284D"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -95,7 +85,7 @@ ynh_install_extra_app_dependencies --repo="deb https://collaboraoffice.com/repos
|
||||||
# UPGRADE CONFIG
|
# UPGRADE CONFIG
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
ynh_add_config "../conf/loolwsd.xml" "/etc/loolwsd/loolwsd.xml"
|
ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# GENERIC FINALIZATION
|
# GENERIC FINALIZATION
|
||||||
|
|
Loading…
Reference in a new issue