Merge "Quick fix for Composer slowdown after a lot of typing - use “debounce” straw...

[osm/UI.git] / skyquake / skyquake.js

diff --git a/skyquake/skyquake.js b/skyquake/skyquake.js
index b9af78a..9b52e96 100644 (file)
--- a/skyquake/skyquake.js
+++ b/skyquake/skyquake.js
@@ -83,6 +83,9 @@ if (cluster.isMaster && clusteredLaunch) {
 
        var sslOptions = null;
 
+       var apiServer = argv['api-server'] ? argv['api-server'] : 'localhost';
+       var uploadServer = argv['upload-server'] ? argv['upload-server'] : null;
+
        try {
                if (argv['enable-https']) {
                        var keyFilePath = argv['keyfile-path'];
@@ -194,9 +197,16 @@ if (cluster.isMaster && clusteredLaunch) {
                app.use(inactivity_routes);
 
                // Configure global config with ssl enabled/disabled
-               configurationAPI.globalConfiguration.update({
-                       ssl_enabled: httpsConfigured
-               });
+               var globalConfig = {
+                       ssl_enabled: httpsConfigured,
+                       api_server: apiServer
+               };
+
+               if (uploadServer) {
+                       globalConfig.upload_server = uploadServer;
+               }
+
+               configurationAPI.globalConfiguration.update(globalConfig);
 
                // Configure configuration route(s)
                app.use(configuration_routes);
@@ -238,6 +248,13 @@ if (cluster.isMaster && clusteredLaunch) {
                app.get('/multiplex-client', function(req, res) {
                        res.sendFile(__dirname + '/node_modules/websocket-multiplex/multiplex_client.js');
                });
+
+               // handle requests for gzip'd files
+           app.get('*gzip*', function (req, res, next) {
+                       res.set('Content-Encoding', 'gzip');
+                       next();
+           });
+
        }
 
        /**