@drumee/setup-infra 1.0.16 → 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 +4 -3
- package/package.json +1 -1
- package/templates/etc/drumee/drumee.sh.tpl +1 -0
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
|
@@ -17,6 +17,7 @@ const JSON_OPT = { spaces: 2, EOL: "\r\n" };
|
|
|
17
17
|
let {
|
|
18
18
|
ACME_DIR,
|
|
19
19
|
ACME_EMAIL_ACCOUNT,
|
|
20
|
+
ACME_ENV_FILE,
|
|
20
21
|
ADMIN_EMAIL,
|
|
21
22
|
BACKUP_STORAGE,
|
|
22
23
|
CERTS_DIR,
|
|
@@ -30,6 +31,7 @@ let {
|
|
|
30
31
|
MAIL_USER,
|
|
31
32
|
MAX_BODY_SIZE,
|
|
32
33
|
NSUPDATE_KEY,
|
|
34
|
+
OWN_CERTS_DIR,
|
|
33
35
|
PRIVATE_DOMAIN,
|
|
34
36
|
PRIVATE_IP4,
|
|
35
37
|
PRIVATE_IP6,
|
|
@@ -255,9 +257,6 @@ function makeData(opt) {
|
|
|
255
257
|
}
|
|
256
258
|
data.chroot = Template.chroot();
|
|
257
259
|
data.ca_server = data.ca_server || data.acme_ssl;
|
|
258
|
-
if (data.own_ssl && data.certs_dir) {
|
|
259
|
-
data.own_certs_dir = data.certs_dir;
|
|
260
|
-
}
|
|
261
260
|
for (let row of opt) {
|
|
262
261
|
let [key, value, fallback] = row;
|
|
263
262
|
if (!value) value = data[key] || fallback;
|
|
@@ -342,9 +341,11 @@ function getSysConfigs() {
|
|
|
342
341
|
const opt = [
|
|
343
342
|
["acme_dir", ACME_DIR],
|
|
344
343
|
["acme_email_account", ACME_EMAIL_ACCOUNT, ADMIN_EMAIL],
|
|
344
|
+
["acme_env_file", ACME_ENV_FILE, ""],
|
|
345
345
|
["admin_email", ADMIN_EMAIL],
|
|
346
346
|
["backup_storage", backup_storage, ""],
|
|
347
347
|
["certs_dir", CERTS_DIR],
|
|
348
|
+
["own_certs_dir", OWN_CERTS_DIR],
|
|
348
349
|
["data_dir", DRUMEE_DATA_DIR, '/data'],
|
|
349
350
|
["db_dir", DRUMEE_DB_DIR, '/srv/db'],
|
|
350
351
|
["domain_desc", DRUMEE_DESCRIPTION, 'My Drumee Box'],
|
package/package.json
CHANGED