Add initial mechanics for serving an app on a path other than /

For now, this requires the ABSOLUTE_URL environment to be set to true. More considered ABI possibly coming.
hy · Jun 13, 2013 · 213cd94 · 213cd94
1 parent fc74cfb
commit 213cd94
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 19 deletions.
diff --git a/packages/ctl/ctl.js b/packages/ctl/ctl.js
@@ -54,7 +54,8 @@ Ctl.Commands.push({
       Ctl.prettyCall(Ctl.findGalaxy(), 'run', [Ctl.myAppName(), 'server', {
         exitPolicy: 'restart',
         env: {
-          METEOR_DEPLOY_CONFIG: JSON.stringify(deployConfig)
+          METEOR_DEPLOY_CONFIG: JSON.stringify(deployConfig),
+          ROOT_URL: appConfig.sitename
         },
         ports: {
           "main": {

diff --git a/packages/livedata/stream_client_common.js b/packages/livedata/stream_client_common.js
@@ -52,6 +52,9 @@ var translateUrl =  function(url, newSchemeBase, subPath) {
     url = newSchemeBase + "://" + url;
   }
 
+  if (__meteor_runtime_config__.ABSOLUTE_URL && startsWith(url, "/"))
+      url = Meteor.absoluteUrl() + url;
+
   if (endsWith(url, "/"))
     return url + subPath;
   else

diff --git a/packages/meteor/url_server.js b/packages/meteor/url_server.js
@@ -1,3 +1,6 @@
 if (process.env.ROOT_URL &&
     typeof __meteor_runtime_config__ === "object")
   __meteor_runtime_config__.ROOT_URL = process.env.ROOT_URL;
+if (process.env.ABSOLUTE_URL &&
+    typeof __meteor_runtime_config__ === "object")
+  __meteor_runtime_config__.ABSOLUTE_URL = true;
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
@@ -239,6 +239,14 @@ var runWebAppServer = function () {
             "// ##RUNTIME_CONFIG##",
             "__meteor_runtime_config__ = " +
               JSON.stringify(__meteor_runtime_config__) + ";");
+    var rootUrl = "";
+    if (process.env.ABSOLUTE_URL) {
+      rootUrl = __meteor_runtime_config__.ROOT_URL || process.env.ROOT_URL;
+    }
+    boilerplateHtml = boilerplateHtml.replace(
+        /##ROOT_URL##/g,
+      rootUrl
+    );
 
     app.use(function (req, res, next) {
       if (! appUrl(req.url))
@@ -283,7 +291,11 @@ var runWebAppServer = function () {
   };
 };
 
-var bindToProxy = function (proxyConfig) {
+var bindToProxy = Meteor._bindToProxy = function (proxyConfig) {
+
+  var securePort = proxyConfig.securePort || (proxyConfig.unprivilegedPorts ? 4433 : 443);
+  var insecurePort = proxyConfig.insecurePort || (proxyConfig.unprivilegedPorts ? 8080 : 80);
+  var bindPathPrefix = proxyConfig.bindPathPrefix || "";
   // XXX also support galaxy-based lookup
   if (!proxyConfig.proxyEndpoint)
     throw new Error("missing proxyEndpoint");
@@ -306,10 +318,10 @@ var bindToProxy = function (proxyConfig) {
   var myHost = os.hostname();
 
   var ddpBindTo = proxyConfig.unprivilegedPorts ? {
-    ddpUrl: 'ddp://' + proxyConfig.bindHost + ':4433/',
-    insecurePort: 8080
+    ddpUrl: 'ddp://' + proxyConfig.bindHost + ':' + securePort + bindPathPrefix + '/',
+    insecurePort: insecurePort
   } : {
-    ddpUrl: 'ddp://' + proxyConfig.bindHost + '/'
+    ddpUrl: 'ddp://' + proxyConfig.bindHost + bindPathPrefix + '/'
   };
 
   // This is run after packages are loaded (in main) so we can use
@@ -331,25 +343,29 @@ var bindToProxy = function (proxyConfig) {
     pid: pid,
     bindTo: {
       host: proxyConfig.bindHost,
-      port: proxyConfig.unprivilegedPorts ? 8080 : 80
+      port: insecurePort,
+      pathPrefix: bindPathPrefix
     },
     proxyTo: {
       host: host,
       port: port
     }
   });
-  proxy.call('bindHttp', {
-    pid: pid,
-    bindTo: {
-      host: proxyConfig.bindHost,
-      port: proxyConfig.unprivilegedPorts ? 4433: 443,
-      ssl: true
-    },
-    proxyTo: {
-      host: host,
-      port: port
-    }
+  if (!proxyConfig.omitSsl) {
+    proxy.call('bindHttp', {
+      pid: pid,
+      bindTo: {
+        host: proxyConfig.bindHost,
+        port: securePort,
+        pathPrefix: bindPathPrefix,
+        ssl: true
+      },
+      proxyTo: {
+        host: host,
+        port: port
+      }
   });
+  }
 };
 
 runWebAppServer();
diff --git a/tools/app.html.in b/tools/app.html.in
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html##HTML_ATTRIBUTES##>
 <head>
-{{#each stylesheets}}  <link rel="stylesheet" href="{{this}}">
+{{#each stylesheets}}  <link rel="stylesheet" href="##ROOT_URL##{{this}}">
 {{/each}}
 
 <script type="text/javascript">
 // ##RUNTIME_CONFIG##
 </script>
 
-{{#each scripts}}  <script type="text/javascript" src="{{this}}"></script>
+{{#each scripts}}  <script type="text/javascript" src="##ROOT_URL##{{this}}"></script>
 {{/each}}
 
 {{{head_extra}}}