@drumee/setup-infra 1.0.19 → 1.0.21

package/bin/install

@@ -10,7 +10,7 @@ export base=$(dirname $script_dir)
 export PUBLIC_DOMAIN=$DRUMEE_DOMAIN_NAME
 
 if [ "$PUBLIC_DOMAIN" != "" ]; then
-  $base/bin/init-mail $DRUMEE_DOMAIN_NAME$PUBLIC_DOMAIN
+  $base/bin/init-mail $PUBLIC_DOMAIN
 fi
 
 # Generate all the required settings 
@@ -65,11 +65,10 @@ if [ "$PRIVATE_DOMAIN" != "" ]; then
   $base/bin/create-local-certs
 fi
 
-if [ "$PUBLIC_DOMAIN" != "" ]; then
+if [ "$PUBLIC_DOMAIN" != "" -a "$OWN_CERTS_DIR" = "" ]; then
   $base/bin/init-acme
 fi
 
-
 setup_dirs
 
 setup_prosody

package/index.js

@@ -31,6 +31,7 @@ let {
   MAIL_USER,
   MAX_BODY_SIZE,
   NSUPDATE_KEY,
+  OWN_CERTS_DIR,
   PRIVATE_DOMAIN,
   PRIVATE_IP4,
   PRIVATE_IP6,
@@ -48,6 +49,7 @@ if (PUBLIC_DOMAIN) {
 }
 
 PRIVATE_DOMAIN = PRIVATE_DOMAIN || 'local.drumee';
+if (OWN_CERTS_DIR) PRIVATE_DOMAIN = null;
 DRUMEE_HTTPS_PORT = DRUMEE_HTTPS_PORT || 443;
 DRUMEE_LOCAL_PORT = DRUMEE_LOCAL_PORT || 8443;
 DRUMEE_HTTP_PORT = DRUMEE_HTTP_PORT || 80;
@@ -256,9 +258,6 @@ function makeData(opt) {
   }
   data.chroot = Template.chroot();
   data.ca_server = data.ca_server || data.acme_ssl;
-  if (data.own_ssl && data.certs_dir) {
-    data.own_certs_dir = data.certs_dir;
-  }
   for (let row of opt) {
     let [key, value, fallback] = row;
     if (!value) value = data[key] || fallback;
@@ -340,13 +339,15 @@ function getSysConfigs() {
     exit(0)
   }
   const nsupdate_key = Template.chroot('etc/bind/keys/update.key')
+  if (OWN_CERTS_DIR && existsSync(OWN_CERTS_DIR)) CERTS_DIR = OWN_CERTS_DIR;
   const opt = [
     ["acme_dir", ACME_DIR],
     ["acme_email_account", ACME_EMAIL_ACCOUNT, ADMIN_EMAIL],
-    ["acme_env_file", ACME_ENV_FILE],
+    ["acme_env_file", ACME_ENV_FILE, ""],
     ["admin_email", ADMIN_EMAIL],
     ["backup_storage", backup_storage, ""],
     ["certs_dir", CERTS_DIR],
+    ["own_certs_dir", OWN_CERTS_DIR],
     ["data_dir", DRUMEE_DATA_DIR, '/data'],
     ["db_dir", DRUMEE_DB_DIR, '/srv/db'],
     ["domain_desc", DRUMEE_DESCRIPTION, 'My Drumee Box'],
@@ -391,7 +392,7 @@ function getSysConfigs() {
   configs.main_domain = data.domain;
   configs.domain_name = data.domain;
   configs.log_dir = data.log_dir;
-  
+
   configs.socketPath = getSocketPath();
   let filename = Template.chroot("etc/drumee/drumee.json");
   Template.makedir(dirname(filename));
@@ -475,7 +476,7 @@ function writeInfraConf(data) {
   const postfix = join(etc, 'postfix',);
   const mariadb = join(etc, 'mysql', 'mariadb.conf.d');
   const infra = join(drumee, 'infrastructure');
-  let { certs_dir, public_domain, private_domain, jitsi_private_domain, jits_public_domain } = data;
+  let { certs_dir, own_certs_dir, public_domain, private_domain, jitsi_private_domain } = data;
   let targets = [
 
     // Nginx 
@@ -494,7 +495,12 @@ function writeInfraConf(data) {
     `${mariadb}/50-client.cnf`,
     `${bind}/named.conf.local`,
   ];
-
+  if (own_certs_dir) {
+    certs_dir = own_certs_dir;
+    data.certs_dir = certs_dir;
+    private_domain = null;
+    jitsi_private_domain = null;
+  }
   if (data.public_ip4 && public_domain) {
     targets.push(
       `${infra}/internals/accel.public.conf`,
@@ -753,7 +759,7 @@ async function getAddresses(data) {
             for (let c of b) {
               if (c == '255') {
                 br.push(a[i])
-              }else{
+              } else {
                 br.push('255')
               }
               i++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drumee/setup-infra",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Drumee Infrastructure Setup Utilities",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   "author": "Somanos Sar <somanos@drumee.com>",
   "license": "AGPL V3",
   "dependencies": {
-    "@drumee/server-essentials": "^1.1.26",
+    "@drumee/server-essentials": "^1.1.37",
     "argparse": "^2.0.1",
     "crypto": "^1.0.1",
     "jsonfile": "^5.0.0",

package/templates/etc/drumee/infrastructure/routes/private.conf.tpl

@@ -52,6 +52,7 @@ location <%= location %> {
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection 'upgrade';
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Real-IP       $remote_addr;
     proxy_set_header X-Connecting-IP $remote_addr;
     proxy_set_header Host       	$host;
@@ -66,6 +67,7 @@ location <%= location %> {
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection 'upgrade';
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Real-IP       $remote_addr;
     proxy_set_header X-Connecting-IP $remote_addr;
     proxy_set_header Host       	$host;

package/templates/etc/drumee/infrastructure/routes/public.conf.tpl

@@ -52,6 +52,7 @@ location <%= location %> {
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection 'upgrade';
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Real-IP       $remote_addr;
     proxy_set_header X-Connecting-IP $remote_addr;
     proxy_set_header Host       	$host;
@@ -66,6 +67,7 @@ location <%= location %> {
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection 'upgrade';
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Real-IP       $remote_addr;
     proxy_set_header X-Connecting-IP $remote_addr;
     proxy_set_header Host       	$host;

package/templates/etc/nginx/sites-enabled/01-public.conf.tpl

@@ -12,6 +12,7 @@ proxy_cache_path <%= cache_dir %>/<%= public_domain %> levels=1:2 keys_zone=<%=
 server {
 	listen <%= public_http_port %>;
 	listen [::]:<%= public_http_port %>;
+	http2 on;
 	server_name <%= public_domain %>; 
 	location / {
 		return  301 https://$host$request_uri;
@@ -19,7 +20,8 @@ server {
 }
 server {
 	listen <%= public_https_port %> ssl;
-	listen [::]:<%= public_https_port %> ssl;	
+	listen [::]:<%= public_https_port %> ssl;
+	http2 on;
 	#
 	root <%= server_dir %>;
 	server_name <%= public_domain %>; 

package/templates/etc/nginx/sites-enabled/02-private.conf.tpl

@@ -12,6 +12,7 @@ proxy_cache_path <%= cache_dir %>/<%= private_domain %> levels=1:2 keys_zone=<%=
 server {
 	listen <%= public_http_port %>;
 	listen [::]:<%= public_http_port %>;
+	http2 on;
 	server_name <%= private_domain %>; 
 	location / {
 		return  301 https://$host$request_uri;
@@ -19,7 +20,8 @@ server {
 }
 server {
 	listen <%= public_https_port %> ssl;
-	listen [::]:<%= public_https_port %> ssl;	
+	listen [::]:<%= public_https_port %> ssl;
+	http2 on;
 	#
 	root <%= server_dir %>;
 	server_name <%= private_domain %>; 

package/templates/etc/nginx/sites-enabled/20-jitsi.private.conf.tpl

@@ -14,13 +14,15 @@ map $http_upgrade $connection_upgrade {
 server {
 	listen <%= public_http_port %> default_server;
 	listen [::]:<%= public_http_port %> default_server;
+	http2 on;
     server_name *.<%= jitsi_private_domain %>;
 	include /etc/jitsi/meet.private.conf;
 }
 
 server {
-	listen <%= public_https_port %> ssl http2;
-	listen [::]:<%= public_https_port %> ssl http2;
+	listen <%= public_https_port %> ssl;
+	listen [::]:<%= public_https_port %> ssl;
+	http2 on;
 	server_name <%= jitsi_private_domain %>; 
 	include /etc/jitsi/ssl.private.conf;
 	include /etc/jitsi/meet.private.conf;

package/templates/etc/nginx/sites-enabled/20-jitsi.public.conf.tpl

@@ -14,13 +14,15 @@ map $http_upgrade $connection_upgrade {
 server {
 	listen <%= public_http_port %> default_server;
 	listen [::]:<%= public_http_port %> default_server;
+	http2 on;
     server_name *.<%= jitsi_public_domain %>;
 	include /etc/jitsi/meet.public.conf;
 }
 
 server {
-	listen <%= public_https_port %> ssl http2;
-	listen [::]:<%= public_https_port %> ssl http2;
+	listen <%= public_https_port %> ssl ;
+	listen [::]:<%= public_https_port %> ssl;
+	http2 on;
 	server_name <%= jitsi_public_domain %>; 
 	include /etc/jitsi/ssl.public.conf;
 	include /etc/jitsi/meet.public.conf;