1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/collabora_ynh.git synced 2024-09-03 18:16:25 +02:00

Merge pull request #52 from YunoHost-Apps/testing

Testing
This commit is contained in:
Éric Gaspar 2021-08-15 20:44:54 +02:00 committed by GitHub
commit 12345da4ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 5 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
LibreOffice-based online office suite with collaborative editing LibreOffice-based online office suite with collaborative editing
**Shipped version:** 6.4.10~ynh1 **Shipped version:** 6.4.10~ynh2

View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Suite office en ligne et collaborative, basée sur LibreOffice Suite office en ligne et collaborative, basée sur LibreOffice
**Version incluse :** 6.4.10~ynh1 **Version incluse :** 6.4.10~ynh2

View file

@ -1,7 +1,7 @@
;; Test complet ;; Test complet
; Manifest ; Manifest
domain="domain.tld" domain="domain.tld"
password="pass" password="password"
nextcloud_domain="nextcloud.tld" nextcloud_domain="nextcloud.tld"
; Checks ; Checks
pkg_linter=1 pkg_linter=1

View file

@ -6,7 +6,7 @@
"en": "LibreOffice-based online office suite with collaborative editing", "en": "LibreOffice-based online office suite with collaborative editing",
"fr": "Suite office en ligne et collaborative, basée sur LibreOffice" "fr": "Suite office en ligne et collaborative, basée sur LibreOffice"
}, },
"version": "6.4.10~ynh1", "version": "6.4.10~ynh2",
"url": "https://collaboraoffice.com", "url": "https://collaboraoffice.com",
"upstream": { "upstream": {
"license": "MPL-2.0", "license": "MPL-2.0",

View file

@ -67,6 +67,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
#================================================= #=================================================
# CONFIGURE ONLYOFFICE # CONFIGURE ONLYOFFICE
#================================================= #=================================================
ynh_script_progression --message="Installing config file..." --weight=2
# Turns out we need to create/copy this file BEFORE the actual .deb install, # Turns out we need to create/copy this file BEFORE the actual .deb install,
# otherwise stupid collabora will expect to find a certificate file in its own # otherwise stupid collabora will expect to find a certificate file in its own
@ -74,6 +75,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
# 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 --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml" ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml"
chmod 640 "/etc/loolwsd/loolwsd.xml"
#================================================= #=================================================
# INSTALL DEPENDENCIES # INSTALL DEPENDENCIES

View file

@ -52,6 +52,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_script_progression --message="Restoring the configuration..." --weight=3 ynh_script_progression --message="Restoring the configuration..." --weight=3
ynh_restore_file --origin_path="/etc/loolwsd/loolwsd.xml" ynh_restore_file --origin_path="/etc/loolwsd/loolwsd.xml"
chmod 640 "/etc/loolwsd/loolwsd.xml"
#================================================= #=================================================
# SPECIFIC RESTORATION # SPECIFIC RESTORATION
@ -73,7 +74,7 @@ yunohost service add "loolwsd" --description="Collabora online office suite" --l
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE
#================================================= #=================================================
ynh_script_progression --message="Starting a systemd service..." ynh_script_progression --message="Starting a systemd service..." --weight=1
ynh_systemd_action --service_name="loolwsd" --action="restart" --log_path="systemd" --line_match="Ready to accept connections" ynh_systemd_action --service_name="loolwsd" --action="restart" --log_path="systemd" --line_match="Ready to accept connections"

View file

@ -74,9 +74,13 @@ ynh_add_nginx_config
#================================================= #=================================================
# UPGRADE CONFIG # UPGRADE CONFIG
#================================================= #=================================================
ynh_script_progression --message="Upgrading config file..." --weight=2
ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml" ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml"
chown lool: "/etc/loolwsd/loolwsd.xml"
chmod 640 "/etc/loolwsd/loolwsd.xml"
#================================================= #=================================================
# UPGRADE DEPENDENCIES # UPGRADE DEPENDENCIES
#================================================= #=================================================