LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

Merge pull request #685 from lbryio/master

Browse source 
Cut staging from master
This commit is contained in:
Shawn K 2018-11-07 17:05:52 -05:00 • committed by GitHub
commit 6d7c1b5c87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitignore vendored
View file

@ -6,17 +6,11 @@ node_modules
client/build
client_custom/build
client_custom/scss
client_custom/src/components
client_custom/src/containers
client_custom/src/pages
site/
devConfig/sequelizeCliConfig.js
devConfig/testingConfig.js
config/
public/bundle/bundle.js
public/bundle/bundle.js.map
public/bundle/Lekton-*

14
cli/configure.js
View file

@ -13,16 +13,16 @@ let thumbnailChannel = '';
let thumbnailChannelId = '';
const createConfigFile = (fileName, configObject) => { // siteConfig.json , siteConfig
const fileLocation = Path.resolve(__dirname, `../config/${fileName}`);
const fileLocation = Path.resolve(__dirname, `../site/config/${fileName}`);
const fileContents = JSON.stringify(configObject, null, 2);
fs.writeFileSync(fileLocation, fileContents, 'utf-8');
console.log(`Successfully created /config/${fileName}\n`);
console.log(`Successfully created ./site/config/${fileName}\n`);
};
// import existing configs or import the defaults
let mysqlConfig;
try {
mysqlConfig = require('../config/mysqlConfig.json');
mysqlConfig = require('../site/config/mysqlConfig.json');
} catch (error) {
mysqlConfig = require('./defaults/mysqlConfig.json');
}
@ -30,7 +30,7 @@ const { database: mysqlDatabase, username: mysqlUsername, password: mysqlPasswor
let siteConfig;
try {
siteConfig = require('../config/siteConfig.json');
siteConfig = require('../site/config/siteConfig.json');
} catch (error) {
siteConfig = require('./defaults/siteConfig.json');
}
@ -48,21 +48,21 @@ const {
let lbryConfig;
try {
lbryConfig = require('../config/lbryConfig.json');
lbryConfig = require('../site/config/lbryConfig.json');
} catch (error) {
lbryConfig = require('./defaults/lbryConfig.json');
}
let loggerConfig;
try {
loggerConfig = require('../config/loggerConfig.json');
loggerConfig = require('../site/config/loggerConfig.json');
} catch (error) {
loggerConfig = require('./defaults/loggerConfig.json');
}
let slackConfig;
try {
slackConfig = require('../config/slackConfig.json');
slackConfig = require('../site/config/slackConfig.json');
} catch (error) {
slackConfig = require('./defaults/slackConfig.json');
}