YunoHost-Apps/thelounge_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/thelounge_ynh.git synced 2024-09-03 20:35:54 +02:00
Code Issues Activity Actions

[fix] Resolve path properly

Browse source
This commit is contained in:
kload 2015-08-22 22:22:45 +02:00
parent e4101b0a6c
commit 30b8623cf0
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/install
View file

@ -31,6 +31,9 @@ user=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | s
sed -i "s@USERTOCHANGE@$user@g" ../conf/user.json sed -i "s@USERTOCHANGE@$user@g" ../conf/user.json
sed -i "s@PATHTOCHANGE@$path/@g" ../conf/config.js sed -i "s@PATHTOCHANGE@$path/@g" ../conf/config.js
# HACK: Change the socket.io path in the sources
sed -i "s@PATHTOCHANGE@$path@g" ../sources/client/js/shout.js
# Copy files to the right place # Copy files to the right place
sudo mkdir -p $final_path/.shout/users sudo mkdir -p $final_path/.shout/users
sudo cp ../conf/config.js $final_path/.shout/ sudo cp ../conf/config.js $final_path/.shout/

3
scripts/upgrade
View file

@ -11,6 +11,9 @@ final_path=/var/www/shout
# Remove trailing "/" from the path # Remove trailing "/" from the path
path=${path%/} path=${path%/}
# HACK: Change the socket.io path in the sources
sed -i "s@PATHTOCHANGE@$path@g" ../sources/client/js/shout.js
# Copy files to the right place # Copy files to the right place
sudo mkdir -p $final_path/.shout/users sudo mkdir -p $final_path/.shout/users
sed -i "s@PATHTOCHANGE@$path/@g" ../conf/config.js sed -i "s@PATHTOCHANGE@$path/@g" ../conf/config.js

2
sources/client/js/shout.js
View file

@ -1,5 +1,5 @@
$(function() { $(function() {
var socket = io(); var socket = io({path: 'PATHTOCHANGE/socket.io'});
var commands = [ var commands = [
"/close", "/close",
"/connect", "/connect",

5
sources/src/server.js
View file

@ -16,8 +16,8 @@ module.exports = function(options) {
config = _.extend(config, options); config = _.extend(config, options);
var app = express() var app = express()
.use(config.rootpath, index) .use(index)
.use(config.rootpath, express.static("client")); .use(express.static("client"));
app.enable("trust proxy"); app.enable("trust proxy");
@ -46,7 +46,6 @@ module.exports = function(options) {
sockets = io(server, { sockets = io(server, {
transports: transports transports: transports
}); });
sockets.path(config.rootpath + 'socket.io');
sockets.on("connect", function(socket) { sockets.on("connect", function(socket) {
var authHeader = socket.client.request.headers.authorization; var authHeader = socket.client.request.headers.authorization;