cybershell-specific changes

app/views/otp/welcome.pug

@@ -41,7 +41,7 @@ block content
                 .uk-margin
                   button(type="submit").uk-button.dtp-button-primary.uk-border-pill Enable 2FA
 
-              div(class="uk-width-1-1 uk-text-center uk-text-left@m", hidden)
+              div(class="uk-width-1-1 uk-text-center uk-text-left@m")
                 .uk-margin
                   p Or, if your authenticator doesn't support scanning QR codes, you can enter the OTP configuration information shown here to begin displaying codes:
                   pre(

iconImport.js

@@ -0,0 +1,26 @@
+(async() => {
+    const siteDomain = "blog.cybershell.xyz";
+    const sharp = require('sharp');
+    const fs = require('fs');
+    const path = require('path');
+    // const iconDir = path.join(__dirname, siteDomain);
+    const siteImagesDir = path.join(__dirname, 'client', 'img');
+    const siteIconDir = path.join(siteImagesDir, 'icon', siteDomain)
+    const sourceIconFile = 'thumbnail.png';
+    const sourceIconFilePath = path.join(__dirname, sourceIconFile);
+    const sizes = [16, 32, 36, 48, 57, 60, 70, 72, 76, 96, 114, 120, 144, 150, 152, 180, 192, 256, 310, 384, 512];
+
+    await fs.promises.mkdir(siteIconDir, { force: true, recursive: true });
+    for (var size of sizes) {
+        await sharp(sourceIconFilePath).resize({
+            fit: sharp.fit.contain,
+            width: size,
+            height: size
+        }).png()
+            .toFile(path.join(siteIconDir, `icon-${size}x${size}.png`));
+    }
+
+    // await fs.promises.cp(sourceIconFilePath, path.join(siteIconDir, `${siteDomain}.png`));
+    await fs.promises.cp(sourceIconFilePath, path.join(siteImagesDir, 'social-cards', `${siteDomain}.png`));
+    // await fs.promises.cp(iconDir, path.join(siteImagesDir, 'icon' ), { recursive: true });
+})()

supervisord/dtp-sites-chat.conf

@@ -0,0 +1,16 @@
+[group:sites-chat]
+programs=dtp-sites-chat
+
+[program:dtp-sites-chat]
+numprocs=1
+process_name=%(program_name)s_%(process_num)02d
+command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/chat.js
+directory=/home/dtp/live/dtp-sites
+autostart=true
+autorestart=true
+startretries=3
+stopsignal=INT
+stderr_logfile=/var/log/dtp-sites/host-services.err.log
+stdout_logfile=/var/log/dtp-sites/host-services.out.log
+user=dtp
+environment=HOME='/home/dtp/live/dtp-sites',HTTP_BIND_PORT=30%(process_num)02d,NODE_ENV=production,LOGNAME=host-services

supervisord/dtp-sites-groups.conf

@@ -0,0 +1,8 @@
+
+
+[group:sites-media]
+program=dtp-sites-media
+[group:sites-chat]
+program=dtp-sites-chat
+[group:sites]
+program=dtp-sites

supervisord/dtp-sites-host-services.conf

@@ -1,7 +1,11 @@
+[group:sites-host-services]
+programs=host-services
+
+
 [program:host-services]
 numprocs=1
 process_name=%(program_name)s_%(process_num)02d
-command=/home/dtp/.nvm/versions/node/v16.13.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/host-services.js
+command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/host-services.js
 directory=/home/dtp/live/dtp-sites
 autostart=true
 autorestart=true

supervisord/dtp-sites-media.conf

@@ -0,0 +1,17 @@
+
+[group:sites-media]
+programs=dtp-sites-media
+
+[program:dtp-sites-media]
+numprocs=1
+process_name=%(program_name)s_%(process_num)02d
+command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/media.js
+directory=/home/dtp/live/dtp-sites
+autostart=true
+autorestart=true
+startretries=3
+stopsignal=INT
+stderr_logfile=/var/log/dtp-sites/host-services.err.log
+stdout_logfile=/var/log/dtp-sites/host-services.out.log
+user=dtp
+environment=HOME='/home/dtp/live/dtp-sites',HTTP_BIND_PORT=30%(process_num)02d,NODE_ENV=production,LOGNAME=host-services

supervisord/dtp-sites-newsletter.conf

@@ -1,7 +1,10 @@
-[program:dtp-sites:newsletter]
+[group:sites-newsletter]
+programs=dtp-sites-newsletter
+
+[program:dtp-sites-newsletter]
 numprocs=1
 process_name=%(program_name)s_%(process_num)02d
-command=/home/dtp/.nvm/versions/node/v16.13.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/newsletter.js
+command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/newsletter.js
 directory=/home/dtp/live/dtp-sites
 autostart=true
 autorestart=true

supervisord/dtp-sites-newsroom.conf

@@ -0,0 +1,16 @@
+[group:sites-newsroom]
+programs=dtp-sites-newsroom
+
+[program:dtp-sites-newsroom]
+numprocs=1
+process_name=%(program_name)s_%(process_num)02d
+command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/newsroom.js
+directory=/home/dtp/live/dtp-sites
+autostart=true
+autorestart=true
+startretries=3
+stopsignal=INT
+stderr_logfile=/var/log/dtp-sites/newsroom.err.log
+stdout_logfile=/var/log/dtp-sites/newsroom.out.log
+user=dtp
+environment=HOME='/home/dtp/live/dtp-sites',HTTP_BIND_PORT=30%(process_num)02d,NODE_ENV=production,LOGNAME=newsroom

supervisord/dtp-sites-reeper.conf

@@ -0,0 +1,16 @@
+[group:sites-reeeper]
+programs=reeeper
+
+[program:reeeper]
+numprocs=1
+process_name=%(program_name)s_%(process_num)02d
+command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/reeeper.js
+directory=/home/dtp/live/dtp-sites
+autostart=true
+autorestart=true
+startretries=3
+stopsignal=INT
+stderr_logfile=/var/log/dtp-sites/host-services.err.log
+stdout_logfile=/var/log/dtp-sites/host-services.out.log
+user=dtp
+environment=HOME='/home/dtp/live/dtp-sites',HTTP_BIND_PORT=30%(process_num)02d,NODE_ENV=production,LOGNAME=host-services

supervisord/dtp-sites.conf

@@ -1,7 +1,10 @@
+[group:sites]
+programs=dtp-sites
+
 [program:dtp-sites]
 numprocs=1
 process_name=%(program_name)s_%(process_num)02d
-command=/home/dtp/.nvm/versions/node/v16.13.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 dtp-sites.js
+command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 dtp-sites.js
 directory=/home/dtp/live/dtp-sites
 autostart=true
 autorestart=true

update-master

@@ -0,0 +1,3 @@
+#!/bin/bash
+git fetch origin master
+git merge -s ours origin/master