keep config.js in config/

and persist it via various docker mechanisms
This commit is contained in:
ansuz 2019-03-28 17:35:30 +01:00
parent 10e162e7e3
commit 744f212b26
5 changed files with 6 additions and 7 deletions

View File

@ -7,6 +7,7 @@ ENV STORAGE=\'./storage/file\'
ENV LOG_TO_STDOUT=true
# Persistent storage needs
VOLUME /cryptpad/config
VOLUME /cryptpad/datastore
VOLUME /cryptpad/customize
VOLUME /cryptpad/blobstage

View File

@ -4,10 +4,7 @@
mkdir -p customize
# Copying default config
[ ! -h customize/config.js ] && echo "Creating config.js" && cp config.example.js customize/config.js
# Linking config.js
[ ! -h config.js ] && echo "Linking config.js" && ln -s customize/config.js config.js
[ ! -f config/config.js ] && echo "Creating config.js" && cp config/config.example.js config/config.js
# Thanks to http://stackoverflow.com/a/10467453
sedeasy() {

View File

@ -26,3 +26,4 @@ services:
- ./data/blobstage:/cryptpad/blobstage:rw
- ./data/tasks:/cryptpad/tasks:rw
- ./data/block:/cryptpad/block:rw
- ./data/config:/cryptpad/config:rw

View File

@ -13,10 +13,10 @@ var nThen = require("nthen");
var config;
try {
config = require('./config');
config = require('./config/config');
} catch (e) {
console.log("You can customize the configuration by copying config.example.js to config.js");
config = require('./config.example');
console.log("You can customize the configuration by copying config/config.example.js to config/config.js");
config = require('./config/config.example');
}
var websocketPort = config.websocketPort || config.httpPort;
var useSecureWebsockets = config.useSecureWebsockets || false;