2 files changed, 10 insertions, 4 deletions
diff --git a/app.js b/app.js
index e3ce93de..a17d3a61 100644
--- a/app.js
+++ b/app.js
@@ -11,6 +11,7 @@ var compression = require('compression')
 var session = require('express-session');
 var SequelizeStore = require('connect-session-sequelize')(session.Store);
 var fs = require('fs');
+var url = require('url');
 var path = require('path');
 var imgur = require('imgur');
 var formidable = require('formidable');
@@ -102,7 +103,7 @@ app.use(helmet.hsts({
 }));
 
 i18n.configure({
-    locales: ['en', 'zh', 'fr', 'de', 'ja', 'es', 'el', 'pt', 'it', 'tr', 'ru', 'nl', 'hr', 'pl', 'uk', 'hi', 'sv'],
+    locales: ['en', 'zh', 'fr', 'de', 'ja', 'es', 'el', 'pt', 'it', 'tr', 'ru', 'nl', 'hr', 'pl', 'uk', 'hi', 'sv', 'eo'],
     cookie: 'locale',
     directory: __dirname + '/locales'
 });
@@ -499,7 +500,7 @@ app.post('/uploadimage', function (req, res) {
                 switch (config.imageUploadType) {
                 case 'filesystem':
                     res.send({
-                        link: path.join(config.serverurl, files.image.path.match(/^public(.+$)/)[1])
+                        link: url.resolve(config.serverurl, files.image.path.match(/^public(.+$)/)[1])
                     });
 
                     break;
@@ -511,7 +512,7 @@ app.post('/uploadimage', function (req, res) {
 
                     fs.readFile(files.image.path, function (err, buffer) {
                         var params = {
-                            Bucket: 'hackmd',
+                            Bucket: config.s3bucket,
                             Key: path.join('uploads', path.basename(files.image.path)),
                             Body: buffer
                         };
diff --git a/app.json b/app.json
index fcdc60a7..6025bba9 100644
--- a/app.json
+++ b/app.json
@@ -35,11 +35,16 @@
             "description": "sub url path, like `www.example.com/<URL_PATH>`",
             "required": false
         },
-        "HMD_ALLOW_ORIGIN": {
+        "HMD_PORT": {
             "description": "web app port",
             "required": false,
             "value": "80"
         },
+        "HMD_ALLOW_ORIGIN": {
+            "description": "domain name whitelist (use comma to separate)",
+            "required": false,
+            "value": "localhost"
+        },
         "HMD_PROTOCOL_USESSL": {
             "description": "set to use ssl protocol for resources path (only applied when domain is set)",
             "required": false