Skip to content

Commit

Permalink
Merge pull request #96 from stakwork/home-config
Browse files Browse the repository at this point in the history
Home config
  • Loading branch information
Evanfeenstra authored Nov 12, 2020
2 parents bb7959a + 9f2197a commit cbd75e0
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 73 deletions.
2 changes: 1 addition & 1 deletion app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import * as network from './src/network'
let server: any = null
const env = process.env.NODE_ENV || 'development';
const config = require(path.join(__dirname, 'config/app.json'))[env];
const port = process.env.PORT || 3001 // config.node_http_port || 3001
const port = process.env.PORT || config.node_http_port || 3001

process.env.GRPC_SSL_CIPHER_SUITES = 'HIGH+ECDSA'

Expand Down
6 changes: 4 additions & 2 deletions config/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"hub_invite_url": "http://lvh.me/invites",
"hub_check_invite_url": "http://lvh.me/check_invite",
"media_host": "localhost:5000",
"tribes_host": "tribes.sphinx.chat"
"tribes_host": "tribes.sphinx.chat",
"public_url": ""
},
"production": {
"senza_url": "https://staging.senza.us/api/v2/",
Expand All @@ -28,6 +29,7 @@
"hub_invite_url": "https://hub.sphinx.chat/invites",
"hub_check_invite_url": "https://hub.sphinx.chat/check_invite",
"media_host": "memes.sphinx.chat",
"tribes_host": "tribes.sphinx.chat"
"tribes_host": "tribes.sphinx.chat",
"public_url": ""
}
}
2 changes: 1 addition & 1 deletion dist/app.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/app.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dist/src/utils/lightning.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cbd75e0

Please sign in to comment.