@drumee/setup-infra 1.0.19 → 1.0.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/install +1 -2
- package/index.js +3 -4
- package/package.json +1 -1
package/bin/install
CHANGED
|
@@ -65,11 +65,10 @@ if [ "$PRIVATE_DOMAIN" != "" ]; then
|
|
|
65
65
|
$base/bin/create-local-certs
|
|
66
66
|
fi
|
|
67
67
|
|
|
68
|
-
if [ "$PUBLIC_DOMAIN" != "" ]; then
|
|
68
|
+
if [ "$PUBLIC_DOMAIN" != "" -a "$OWN_CERTS_DIR" = "" ]; then
|
|
69
69
|
$base/bin/init-acme
|
|
70
70
|
fi
|
|
71
71
|
|
|
72
|
-
|
|
73
72
|
setup_dirs
|
|
74
73
|
|
|
75
74
|
setup_prosody
|
package/index.js
CHANGED
|
@@ -31,6 +31,7 @@ let {
|
|
|
31
31
|
MAIL_USER,
|
|
32
32
|
MAX_BODY_SIZE,
|
|
33
33
|
NSUPDATE_KEY,
|
|
34
|
+
OWN_CERTS_DIR,
|
|
34
35
|
PRIVATE_DOMAIN,
|
|
35
36
|
PRIVATE_IP4,
|
|
36
37
|
PRIVATE_IP6,
|
|
@@ -256,9 +257,6 @@ function makeData(opt) {
|
|
|
256
257
|
}
|
|
257
258
|
data.chroot = Template.chroot();
|
|
258
259
|
data.ca_server = data.ca_server || data.acme_ssl;
|
|
259
|
-
if (data.own_ssl && data.certs_dir) {
|
|
260
|
-
data.own_certs_dir = data.certs_dir;
|
|
261
|
-
}
|
|
262
260
|
for (let row of opt) {
|
|
263
261
|
let [key, value, fallback] = row;
|
|
264
262
|
if (!value) value = data[key] || fallback;
|
|
@@ -343,10 +341,11 @@ function getSysConfigs() {
|
|
|
343
341
|
const opt = [
|
|
344
342
|
["acme_dir", ACME_DIR],
|
|
345
343
|
["acme_email_account", ACME_EMAIL_ACCOUNT, ADMIN_EMAIL],
|
|
346
|
-
["acme_env_file", ACME_ENV_FILE],
|
|
344
|
+
["acme_env_file", ACME_ENV_FILE, ""],
|
|
347
345
|
["admin_email", ADMIN_EMAIL],
|
|
348
346
|
["backup_storage", backup_storage, ""],
|
|
349
347
|
["certs_dir", CERTS_DIR],
|
|
348
|
+
["own_certs_dir", OWN_CERTS_DIR],
|
|
350
349
|
["data_dir", DRUMEE_DATA_DIR, '/data'],
|
|
351
350
|
["db_dir", DRUMEE_DB_DIR, '/srv/db'],
|
|
352
351
|
["domain_desc", DRUMEE_DESCRIPTION, 'My Drumee Box'],
|