mirror of
https://github.com/taobataoma/meanTorrent.git
synced 2026-03-01 17:51:00 +01:00
Merge commit 'fc06cdbd9511a3c0787f393165c0c0ba83641dcd'
* commit 'fc06cdbd9511a3c0787f393165c0c0ba83641dcd': cfg(core): config global settings cfg(core): config global settings # Conflicts: # config/env/default.js # config/env/development.js # config/env/production.js # config/env/torrents.js
This commit is contained in:
4
config/env/default.js
vendored
4
config/env/default.js
vendored
@@ -11,7 +11,7 @@ module.exports = {
|
||||
promise: global.Promise
|
||||
},
|
||||
port: process.env.PORT || 3000,
|
||||
host: process.env.HOST || '0.0.0.0',
|
||||
host: process.env.HOST || '127.0.0.1',
|
||||
// DOMAIN config should be set to the fully qualified application accessible
|
||||
// URL. For example: https://www.myapp.com (including port if required).
|
||||
domain: process.env.DOMAIN || 'mine.pt',
|
||||
@@ -42,7 +42,7 @@ module.exports = {
|
||||
},
|
||||
logo: 'modules/core/client/img/brand/logo.png',
|
||||
favicon: 'modules/core/client/img/brand/favicon.ico',
|
||||
illegalUsernames: ['meanjs', 'administrator', 'password', 'admin', 'user',
|
||||
illegalUsernames: ['meanjs', 'administrator', 'password', 'admin', 'user', 'mean', 'meanTorrent', 'torrent', 'bit', 'bits', 'oper', 'operator',
|
||||
'unknown', 'anonymous', 'null', 'undefined', 'api'
|
||||
],
|
||||
aws: {
|
||||
|
||||
2
config/env/production.js
vendored
2
config/env/production.js
vendored
@@ -11,7 +11,7 @@ module.exports = {
|
||||
},
|
||||
port: process.env.PORT || 3000,
|
||||
// Binding to 127.0.0.1 is safer in production.
|
||||
host: process.env.HOST || '0.0.0.0',
|
||||
host: process.env.HOST || '127.0.0.1',
|
||||
db: {
|
||||
uri: process.env.MONGOHQ_URL || process.env.MONGODB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean-dev-v2',
|
||||
options: {
|
||||
|
||||
6
config/env/torrents.js
vendored
6
config/env/torrents.js
vendored
@@ -193,9 +193,9 @@ module.exports = {
|
||||
ircAnnounce: {
|
||||
enable: true,
|
||||
debug: false,
|
||||
server: 'chd.im',
|
||||
server: 'MEAN.im',
|
||||
port: 16667,
|
||||
nick: 'Announcer',
|
||||
nick: 'mineAnnouncer',
|
||||
userName: 'meanTorrent',
|
||||
realName: 'IRC announce client',
|
||||
channel: '#mineAnnounce',
|
||||
@@ -959,10 +959,10 @@ module.exports = {
|
||||
*
|
||||
* movie info web www.themoviedb.com settings
|
||||
*
|
||||
* @key: access key fro TMDB, when u first install and runing this system, please register a key from TMDB and replace here
|
||||
* @tmdbHome: TMDB website home link url
|
||||
* @tmdbMovieLinkUrl: linked url, link to movie detail info page, system get movie detail info from here
|
||||
* @tmdbTvserialLinkUrl: linked url, link to tv serial detail info page, system get tv serial detail info from here
|
||||
* @key: access key fro TMDB, when u first install and runing this system, please register a key from TMDB and replace here
|
||||
* @backdropImgBaseUrl: image link url
|
||||
* @backdropImgBaseUrl_300: image link url
|
||||
* @backdropImgBaseUrl_780: image link url
|
||||
|
||||
Reference in New Issue
Block a user