web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #373 from zimbatm/nix-packaging

Browse Source 
Nix packaging
This commit is contained in:
ansuz 2019-06-03 10:34:49 +02:00 committed by GitHub
commit 961d385895
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -45,7 +45,7 @@
"localforage": "^1.5.2", "localforage": "^1.5.2",
"html2canvas": "^0.4.1", "html2canvas": "^0.4.1",
"croppie": "^2.5.0", "croppie": "^2.5.0",
"sortablejs": "#^1.6.0", "sortablejs": "^1.6.0",
"saferphore": "^0.0.1", "saferphore": "^0.0.1",
"jszip": "Stuk/jszip#^3.1.5", "jszip": "Stuk/jszip#^3.1.5",
"requirejs-plugins": "^1.0.3" "requirejs-plugins": "^1.0.3"

7
lib/load-config.js
View File

@ -1,11 +1,14 @@
/* jslint node: true */
"use strict";
var config; var config;
var configPath = process.env.CRYPTPAD_CONFIG || "../config/config";
try { try {
config = require("../config/config"); config = require(configPath);
if (config.adminEmail === 'i.did.not.read.my.config@cryptpad.fr') { if (config.adminEmail === 'i.did.not.read.my.config@cryptpad.fr') {
console.log("You can configure the administrator email (adminEmail) in your config/config.js file"); console.log("You can configure the administrator email (adminEmail) in your config/config.js file");
} }
} catch (e) { } catch (e) {
console.log("You can customize the configuration by copying config/config.example.js to config/config.js"); console.log("Config not found, loading the example config. You can customize the configuration by copying config/config.example.js to " + configPath);
config = require("../config/config.example"); config = require("../config/config.example");
} }
module.exports = config; module.exports = config;