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

Merge pull request #11 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2021-07-18 11:11:24 +02:00 committed by GitHub
commit e449278239
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 9 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
Web-based XMPP/Jabber chat client Web-based XMPP/Jabber chat client
**Shipped version:** 7.0.6~ynh1 **Shipped version:** 7.0.6~ynh2
**Demo:** https://inverse.chat/ **Demo:** https://inverse.chat/

2
README_fr.md
View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Client de chat XMPP/Jabber basé sur le Web Client de chat XMPP/Jabber basé sur le Web
**Version incluse :** 7.0.6~ynh1 **Version incluse :** 7.0.6~ynh2
**Démo :** https://inverse.chat/ **Démo :** https://inverse.chat/

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Web-based XMPP/Jabber chat client", "en": "Web-based XMPP/Jabber chat client",
"fr": "Client de chat XMPP/Jabber basé sur le Web" "fr": "Client de chat XMPP/Jabber basé sur le Web"
}, },
"version": "7.0.6~ynh1", "version": "7.0.6~ynh2",
"url": "http://conversejs.org/", "url": "http://conversejs.org/",
"upstream": { "upstream": {
"license": "MPL-2.0", "license": "MPL-2.0",

6
scripts/install
View file

@ -23,6 +23,7 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH path_url=$YNH_APP_ARG_PATH
is_public=$YNH_APP_ARG_IS_PUBLIC is_public=$YNH_APP_ARG_IS_PUBLIC
maindomain=$(yunohost domain main-domain --output-as plain)
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
@ -45,6 +46,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=2
ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=path --value=$path_url
ynh_app_setting_set --app=$app --key=maindomain --value=$maindomain
#================================================= #=================================================
# CREATE DEDICATED USER # CREATE DEDICATED USER
@ -65,9 +67,7 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
# Download, the source from sources folder # Download, the source from sources folder
mkdir -p $final_path && cp -a ../sources/* $final_path mkdir -p $final_path && cp -a ../sources/* $final_path
ynh_add_config --template="../sources/index.html" --destination="$final_path/index.html"
ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$final_path/index.html"
ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/index.html"
chmod 750 "$final_path" chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"

10
scripts/upgrade
View file

@ -18,6 +18,7 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path) path_url=$(ynh_app_setting_get --app=$app --key=path)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
maindomain=$(ynh_app_setting_get --app=$app --key=maindomain)
#================================================= #=================================================
# CHECK VERSION # CHECK VERSION
@ -50,6 +51,12 @@ if [ -z "$final_path" ]; then
ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=final_path --value=$final_path
fi fi
# If maindomain doesn't exist, create it
if [ -z "$maindomain" ]; then
maindomain=$(yunohost domain main-domain --output-as plain)
ynh_app_setting_set --app=$app --key=maindomain --value=$maindomain
fi
# Cleaning legacy permissions # Cleaning legacy permissions
if ynh_legacy_permissions_exists; then if ynh_legacy_permissions_exists; then
ynh_legacy_permissions_delete_all ynh_legacy_permissions_delete_all
@ -78,8 +85,7 @@ then
# Download, the source from sources folder # Download, the source from sources folder
mkdir -p $final_path && cp -a ../sources/* $final_path mkdir -p $final_path && cp -a ../sources/* $final_path
ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$final_path/index.html" ynh_add_config --template="../sources/index.html" --destination="$final_path/index.html"
ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/index.html"
fi fi
chmod 750 "$final_path" chmod 750 "$final_path"

2
sources/index.html
View file

@ -52,7 +52,7 @@
auto_away: 300, auto_away: 300,
auto_reconnect: true, auto_reconnect: true,
bosh_service_url: 'https://__DOMAIN____PATH__/http-bind', bosh_service_url: 'https://__DOMAIN____PATH__/http-bind',
default_domain: '__DOMAIN__', default_domain: '__MAINDOMAIN__',
message_archiving: 'always', message_archiving: 'always',
view_mode: 'fullscreen', view_mode: 'fullscreen',
assets_path: '/dist/', assets_path: '/dist/',