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

Merge pull request #51 from YunoHost-Apps/Fix-rights

Browse source 
fix right
This commit is contained in:
Éric Gaspar 2021-08-15 16:33:58 +02:00 committed by GitHub
commit 9b53e16779
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
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
**Shipped version:** 6.4.10~ynh1
**Shipped version:** 6.4.10~ynh2

2
README_fr.md
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
**Version incluse :** 6.4.10~ynh1
**Version incluse :** 6.4.10~ynh2

2
check_process
View file

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

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "LibreOffice-based online office suite with collaborative editing",
"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",
"upstream": {
"license": "MPL-2.0",

2
scripts/install
View file

@ -67,6 +67,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
#=================================================
# 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,
# 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...
mkdir -p /etc/loolwsd
ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml"
chmod 640 "/etc/loolwsd/loolwsd.xml"
#=================================================
# INSTALL DEPENDENCIES

3
scripts/restore
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_restore_file --origin_path="/etc/loolwsd/loolwsd.xml"
chmod 640 "/etc/loolwsd/loolwsd.xml"
#=================================================
# SPECIFIC RESTORATION
@ -73,7 +74,7 @@ yunohost service add "loolwsd" --description="Collabora online office suite" --l
#=================================================
# 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"

4
scripts/upgrade
View file

@ -74,9 +74,13 @@ ynh_add_nginx_config
#=================================================
# UPGRADE CONFIG
#=================================================
ynh_script_progression --message="Upgrading config file..." --weight=2
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
#=================================================