@drumee/setup-infra 1.0.14 → 1.0.15

package/index.js

@@ -12,6 +12,7 @@ const {
 } = require("fs");
 const { args, hasExistingSettings } = require('./templates/utils')
 
+
 const JSON_OPT = { spaces: 2, EOL: "\r\n" };
 
 const {
@@ -100,7 +101,8 @@ function worker(data, instances = 1, exec_mode = 'fork_mode') {
 
   if (!server_dir) server_dir = join(runtime_dir, 'server');
   let base = `${server_dir}/${route}`;
-  return {
+  let iname = name.replace('/', '-');
+  let opt = {
     name,
     script,
     cwd: base,
@@ -113,8 +115,40 @@ function worker(data, instances = 1, exec_mode = 'fork_mode') {
     },
     dependencies: [`pm2-logrotate`],
     exec_mode,
-    instances
+    instances,
+    out_file: join(data.log_dir, `log-${iname}.log`),
+    error_file: join(data.log_dir, `error-${iname}.log`),
+    pm2_log_routes: {
+      rotateInterval: '0 0 * * *', // Rotate daily at midnight
+      rotateModule: true,
+      max_size: '10M', // Rotate when log reaches 10MB
+      retain: 30 // Keep 30 rotated logs
+    }
   };
+  if (args.watch_dirs) {
+    let dirs = args.watch_dirs.split(/,+/);
+    if (dirs.length) {
+      opt.watch = dirs;
+      opt.watch_delay = args.watch_delay;
+      if (args.watch_symlinks) {
+        opt.watch_options = {
+          followSymlinks: true
+        }
+      } else {
+        opt.watch_options = {
+          followSymlinks: false
+        }
+      }
+      if (args.watch_ignore) {
+        let ignored = args.watch_ignore.split(/,+/);
+        if (ignored.length) {
+          opt.ignore_watch = ignored;
+        }
+      }
+    }
+  }
+  return opt;
+
 }
 
 /***
@@ -296,10 +330,14 @@ function getSysConfigs() {
     ["drumee_root", args.drumee_root, "/var/lib/drumee"],
     ["use_email", use_email, 0],
     ["db_dir", args.db_dir, '/var/lib/mysql'],
+    ["log_dir", args.log_dir, '/var/log/drumee'],
+    ["system_user", args.system_user, 'www-data'],
+    ["system_group", args.system_group, 'www-data'],
     ["backup_storage", args.backup_storage, ""],
     ["data_dir", args.data_dir, '/var/lib/drumee/data'],
     ["http_port", args.http_port, 80],
     ["https_port", args.https_port, 443],
+    ["verbosity", args.verbosity, 2],
   ]
 
   if (!args.localhost) {
@@ -448,9 +486,13 @@ function writeInfraConf(data) {
     `${drumee}/conf.d/drumee.json`,
     `${drumee}/conf.d/myDrumee.json`,
 
+    `${nginx}/nginx.conf`,
+
     `${infra}/mfs.conf`,
     `${infra}/routes/main.conf`,
     `${infra}/internals/accel.conf`,
+    `${mariadb}/50-server.cnf`,
+    `${mariadb}/50-client.cnf`,
   ];
 
   if (args.localhost) {
@@ -465,18 +507,10 @@ function writeInfraConf(data) {
     targets.push(`${nginx}/sites-enabled/localhost.conf`)
     let dir = join(args.drumee_root, 'cache', 'localhost')
     mkdirSync(dir, { recursive: true });
-    if (args.db_dir != '/var/lib/mysql') {
-      targets.push(
-        `${mariadb}/50-server.cnf`,
-        `${mariadb}/50-client.cnf`,
-      )
-    }
   } else {
     targets.push(
       `${bind}/named.conf.log`,
       `${bind}/named.conf.options`,
-      `${mariadb}/50-server.cnf`,
-      `${mariadb}/50-client.cnf`,
     )
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drumee/setup-infra",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Drumee Infrastructure Setup Utilities",
   "main": "index.js",
   "scripts": {

package/templates/etc/drumee/conf.d/myDrumee.json.tpl

@@ -8,7 +8,7 @@
     "ru",
     "zh"
   ],
-  "verbosity": 2,
+  "verbosity": <%= verbosity %>,
   "useEmail":<%= use_email %>,
   "quota": {
     "watermark": "<%= quota_watermark %>"

package/templates/etc/drumee/drumee.sh.tpl

@@ -33,7 +33,7 @@ export DRUMEE_IMPORT_DIR=<%= import_dir %>
 export DRUMEE_LOG_DIR=<%= log_dir %>
 export DRUMEE_ROOT=<%= drumee_root %>
 export DRUMEE_RUNTIME_DIR=$DRUMEE_ROOT/runtime
-export DRUMEE_STATIC_DIR=$DRUMEE_ROOT/static
+export DRUMEE_STATIC_DIR=$DRUMEE_RUNTIME_DIR/static
 export DRUMEE_UI_HOME=$DRUMEE_RUNTIME_DIR/ui
 export DRUMEE_SERVER_HOME=$DRUMEE_RUNTIME_DIR/server
 export DRUMEE_SCHEMAS_DIR=$DRUMEE_SERVER_HOME/schemas

package/templates/etc/nginx/nginx.conf

@@ -1,5 +1,5 @@
 
-user www-data;
+user <%= system_user %>;
 worker_processes 4;
 pid /run/nginx.pid;
 include /etc/nginx/modules-enabled/*.conf;

package/templates/utils.js

@@ -60,6 +60,18 @@ parser.add_argument("--outdir", {
   help: "If set, takes precedent on chroot. Output root. Defaulted to /",
 });
 
+parser.add_argument("--log-dir", {
+  type: String,
+  default: '/var/log/drumee',
+  help: "Drumee server log location",
+});
+
+parser.add_argument("--verbosity", {
+  type: "int",
+  default: 2,
+  help: "Server log level",
+});
+
 parser.add_argument("--public-domain", {
   type: String,
   default: PUBLIC_DOMAIN,
@@ -137,6 +149,42 @@ parser.add_argument("--db-dir", {
   help: "Partition or directory dedicated to store drumee database",
 });
 
+parser.add_argument("--system-user", {
+  type: String,
+  default: "www-data",
+  help: "System user used to run Drumee",
+});
+
+parser.add_argument("--system-group", {
+  type: String,
+  default: "www-data",
+  help: "System group used to run Drumee",
+});
+
+parser.add_argument("--watch-dirs", {
+  type: String,
+  default: null,
+  help: "pm2 watch directories",
+});
+
+parser.add_argument("--watch-delay", {
+  type: 'int',
+  default: 1000,
+  help: "pm2 watch delay",
+});
+
+parser.add_argument("--watch-symlinks", {
+  type: 'int',
+  default: 0,
+  help: "pm2 watch delay",
+});
+
+parser.add_argument("--watch-ignore", {
+  type: String,
+  default: null,
+  help: "pm2 ignore directories",
+});
+
 parser.add_argument("--drumee-root", {
   type: String,
   default: DRUMEE_ROOT || "/var/lib/drumee",

package/thidima.sh

@@ -1,44 +0,0 @@
-# Change below values accordingly to you setup
-
-# This text will be shown on the login page
-export DRUMEE_DESCRIPTION="My Drumee Box"
-
-# This is the URL base to access your Drumee Instance
-# It's recommanded not to share the domain name 
-# with any oher applications
-export DRUMEE_DOMAIN_NAME="thidima.org"
-
-# Fix IPV4 address bound to your doamain_name
-export PUBLIC_IP4="51.195.89.55"
-
-# IPV6 address bound to your doamain_name
-export PUBLIC_IP6="2001:41d0:700:4837::"
-
-# This email will be use as the admin account
-export ADMIN_EMAIL="somanos@drumee.com"
-
-# Dedicated to data base server. Do not share with any
-# other application. Default value is /srv/db. 
-# At least 100GB should be allocated 
-export DRUMEE_DB_DIR="/db" 
-
-# Dedicated to Drumee Filesystem Management. 
-# Do not share with any # other application. 
-# Default value is /data 
-# At least 100GB should be allocated 
-export DRUMEE_DATA_DIR="/data" # defaulted to /data 
-
-# Optional setting
-# Drumee use rsync to backup data (FMS, DB and configs)
-# If you plan to make a backup on a remote host, ensure
-# ssh keys are properly setup
-export STORAGE_BACKUP="/backup" # [user@host-or-ip:]/path/
-
-# If not set, will be defaulted to ADMIN_EMAIL.
-# SSL certificates are generated using zerossl.com ACME server
-# This requires an emal to be provided.
-export ACME_EMAIL_ACCOUNT="" 
-
-mkdir -p $DRUMEE_DB_DIR
-mkdir -p $DRUMEE_DATA_DIR
-mkdir -p $STORAGE_BACKUP