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

Merge branch 'testing'

This commit is contained in:
ericgaspar 2021-01-30 14:02:47 +01:00
commit 51d21a82c0
No known key found for this signature in database
GPG key ID: 574F281483054D44
3 changed files with 26 additions and 9 deletions

View file

@ -1,14 +1,29 @@
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
location __PATH__/ {
# Path to source
alias __FINALPATH__/ ;
# Path to source
alias __FINALPATH__/;
# Force usage of https
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
index index.html;
# Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc;
# Force usage of https
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
location = __PATH__/http-bind {
proxy_pass http://localhost:5290/http-bind;
proxy_redirect off;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $server_name;
proxy_set_header X-Forwarded-Port $server_port;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection “upgrade”;
}
# Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc;
}

View file

@ -59,6 +59,8 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
# Download, the source from sources folder
mkdir -p $final_path && cp -a ../sources/* $final_path
ynh_replace_string --match_string="__DOMAIN____PATH__" --replace_string="$domain$path_url" --target_file="$final_path/index.html"
#=================================================
# NGINX CONFIGURATION
#=================================================

View file

@ -49,7 +49,7 @@
authentication: 'login',
auto_away: 300,
auto_reconnect: true,
bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
bosh_service_url: 'https://__DOMAIN____PATH__/http-bind',
message_archiving: 'always',
view_mode: 'fullscreen'
});