From f98b89c44ad46052ea9738ef170444e7b0fd2e7a Mon Sep 17 00:00:00 2001
From: Michael Becker <alcexhim@gmail.com>
Date: Tue, 14 Jan 2025 17:36:11 -0500
Subject: [PATCH] provide ability to switch on SSH support per container

---
 docker-run                                | 19 ++++++++++++++++++-
 mocha-suv/common/libexec/create_suv_users | 21 +++++++++++++++++++++
 mocha-suv/docker/Dockerfile               |  3 +--
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100755 mocha-suv/common/libexec/create_suv_users

diff --git a/docker-run b/docker-run
index b886706..9b0d27c 100755
--- a/docker-run
+++ b/docker-run
@@ -19,6 +19,14 @@ if [ "$1" == "--port" ]; then
 
 fi
 
+ENABLE_SSH=""
+if [ "$1" == "--enable-ssh" ]; then
+
+	ENABLE_SSH="true"
+	shift
+
+fi
+
 # generate random UUID for new SUV
 # thanks https://stackoverflow.com/questions/34328759
 # SUV_ID=$(hexdump -vn8 -e'2/4 "%08x" 1 "\n"' /dev/urandom)
@@ -69,9 +77,11 @@ sleep 3
 # docker inspect $SUV_NAME
 SUV_IP=$(docker container exec $SUV_NAME hostname -i)
 
-if [ $? -ne 0 ]; then
+Q=$?
+if [ $Q -ne 0 ]; then
 
 	echo "Something went wrong; please check your configuration"
+	exit $Q
 
 else
 
@@ -81,3 +91,10 @@ else
 	echo "$SUV_NAME : $SUV_IP"
 
 fi
+
+if [ "$ENABLE_SSH" == "true" ]; then
+
+	docker container exec $SUV_NAME /usr/lib/mocha/create_suv_users
+	docker container exec $SUV_NAME service ssh start
+
+fi
diff --git a/mocha-suv/common/libexec/create_suv_users b/mocha-suv/common/libexec/create_suv_users
new file mode 100755
index 0000000..e32ecfb
--- /dev/null
+++ b/mocha-suv/common/libexec/create_suv_users
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# rm /var/www/html/index.html
+
+# set up mocha user accounts
+addgroup webmasters
+
+PASS1=$(pwgen 16 1)
+useradd -p $(openssl passwd -6 $PASS1) -g webmasters webmaster
+
+PASS2=$(pwgen 16 1)
+useradd -p $(openssl passwd -6 $PASS2) zqadmin
+
+echo "webmaster: $PASS1
+zqadmin: $PASS2" > /etc/mocha/passwd
+
+chown --recursive zqadmin /etc/mocha /usr/lib/mocha /usr/share/mocha /var/mocha
+chgrp --recursive zqadmin /etc/mocha /usr/lib/mocha /usr/share/mocha /var/mocha
+
+chown --recursive webmaster /var/www /var/mocha/uploads
+chgrp --recursive webmasters /var/www /var/mocha/uploads
diff --git a/mocha-suv/docker/Dockerfile b/mocha-suv/docker/Dockerfile
index e729ed9..dec5eb6 100644
--- a/mocha-suv/docker/Dockerfile
+++ b/mocha-suv/docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu
-RUN apt update && apt upgrade -y && apt install -y php php-mbstring php-curl php-xml pwgen dotnet-runtime-8.0
+RUN apt update && apt upgrade -y && apt install -y php php-mbstring php-curl php-xml pwgen dotnet-runtime-8.0 openssh-server
 
 RUN rm /var/www/html/index.html && a2enmod ssl && a2enmod rewrite && service apache2 restart
 
@@ -30,4 +30,3 @@ COPY mocha-suv/docker/site.conf /etc/apache2/sites-available/000-default.conf
 EXPOSE 443
 
 CMD [ "mochactl", "start" ]
-