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:
commit
51d21a82c0
3 changed files with 26 additions and 9 deletions
|
@ -1,14 +1,29 @@
|
||||||
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
|
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
|
||||||
location __PATH__/ {
|
location __PATH__/ {
|
||||||
|
|
||||||
# Path to source
|
# Path to source
|
||||||
alias __FINALPATH__/ ;
|
alias __FINALPATH__/;
|
||||||
|
|
||||||
# Force usage of https
|
index index.html;
|
||||||
if ($scheme = http) {
|
|
||||||
rewrite ^ https://$server_name$request_uri? permanent;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Include SSOWAT user panel.
|
# Force usage of https
|
||||||
include conf.d/yunohost_panel.conf.inc;
|
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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,6 +59,8 @@ 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_replace_string --match_string="__DOMAIN____PATH__" --replace_string="$domain$path_url" --target_file="$final_path/index.html"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# NGINX CONFIGURATION
|
# NGINX CONFIGURATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
authentication: 'login',
|
authentication: 'login',
|
||||||
auto_away: 300,
|
auto_away: 300,
|
||||||
auto_reconnect: true,
|
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',
|
message_archiving: 'always',
|
||||||
view_mode: 'fullscreen'
|
view_mode: 'fullscreen'
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Reference in a new issue