.github/FUNDING.yml

@@ -1,2 +1 @@
 github: [hexagon]
-ko_fi: hexagon_56k

Dockerfile

@@ -1,6 +1,7 @@
-FROM keymetrics/pm2:16-alpine
+FROM node:16-alpine
 COPY . /usr/src/app
 WORKDIR /usr/src/app
-RUN npm install --no-cache --production
+RUN npm install --no-cache
 EXPOSE 8080
-CMD [ "pm2-runtime", "start", "pm2.json" ]
+RUN chmod +x /usr/src/app/docker-entrypoint.sh
+ENTRYPOINT ["/usr/src/app/docker-entrypoint.sh", "npm", "start"]

README.md

@@ -1,4 +1,4 @@
-![cryptalk](https://i.imgur.com/1sH36n5.png)
+![cryptalk](/screenshot.png)
 
 ![Node.js CI](https://github.com/Hexagon/cryptalk/workflows/Node.js%20CI/badge.svg?branch=master)
 [![npm version](https://badge.fury.io/js/cryptalk.svg)](https://badge.fury.io/js/cryptalk)

client/source/settings.js

@@ -1,15 +1,23 @@
 export default {
 
-	title: 'Claytonia Chat',
+	title: 'Cryptalk - Online',
 
 	ttl: 600000,
 
 	motd: '<pre>\n\n' +
-		' Welcome to Claytonia Chat                                           \n' +
+		'▄████▄   ██▀███ ▓██   ██▓ ██▓███  ▄▄▄█████▓ ▄▄▄       ██▓     ██ ▄█▀  \n' +
+		'▒██▀ ▀█  ▓██ ▒ ██▒▒██  ██▒▓██░  ██▒▓  ██▒ ▓▒▒████▄    ▓██▒     ██▄█▒  \n' +
+		'▒▓█    ▄ ▓██ ░▄█ ▒ ▒██ ██░▓██░ ██▓▒▒ ▓██░ ▒░▒██  ▀█▄  ▒██░    ▓███▄░  \n' +
+		'▒▓▓▄ ▄██▒▒██▀▀█▄   ░ ▐██▓░▒██▄█▓▒ ▒░ ▓██▓ ░ ░██▄▄▄▄██ ▒██░    ▓██ █▄  \n' +
+		'▒ ▓███▀ ░░██▓ ▒██▒ ░ ██▒▓░▒██▒ ░  ░  ▒██▒ ░  ▓█   ▓██▒░██████▒▒██▒ █▄ \n' +
+		'░ ░▒ ▒  ░░ ▒▓ ░▒▓░  ██▒▒▒ ▒▓▒░ ░  ░  ▒ ░░    ▒▒   ▓▒█░░ ▒░▓  ░▒ ▒▒ ▓▒ \n' +
+		'  ░  ▒     ░▒ ░ ▒░▓██ ░▒░ ░▒ ░         ░      ▒   ▒▒ ░░ ░ ▒  ░░ ░▒ ▒░ \n' +
+		'░          ░░   ░ ▒ ▒ ░░  ░░         ░        ░   ▒     ░ ░   ░ ░░ ░  \n' +
+		'░ ░         ░     ░ ░                             ░  ░    ░  ░░  ░    \n' +
+		'░                 ░ ░                                                 \n' +
+		'                                  https://github.com/hexagon/cryptalk \n' +
+		'                                                                      \n' +
 		' Tip of the day: /help                                                \n' +
-		' Public Room:    /join Claytonia                                      \n' +
-		' Public Key:     /key Claytonia                                       \n' +
-		' Everyone in the room must have the same key to decrypt messages.      \n' +
 		'----------------------------------------------------------------------' +
 		'</pre>',
 

cryptalk.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=Cryptalk Node.js App
-Documentation=https://github.com/Hexagon/cryptalk
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/npm run start
-WorkingDirectory=/home/cryptochat/cryptalk
-Restart=always
-RestartSec=10
-Environment=NODE_ENV=production
-Environment=PATH=/usr/bin
-User=cryptochat
-Group=cryptochat
-
-[Install]
-WantedBy=multi-user.target

docker-entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+# /usr/src/app/external-public kan be mounted as a volume on host to expose
+# statics to be hosted by host nginx
+if [ -d /usr/src/app/external-public ]; then
+	cp -R /usr/src/app/client/public/* /usr/src/app/external-public/
+fi
+
+exec "$@"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptalk",
-  "version": "1.2.9",
+  "version": "1.2.6",
   "description": "Encrypted HTML5/Node.JS instant chat",
   "main": "server/server.js",
   "preferGlobal": true,

pm2.json

@@ -1,11 +0,0 @@
-{
-  "name": "cryptalk",
-  "script": "server/server.js",
-  "instances": "1",
-  "env": {
-    "NODE_ENV": "development"
-  },
-  "env_production" : {
-    "NODE_ENV": "production"
-  }
-}