diff --git a/compose.yaml b/compose.yaml index 54af549..8ac926d 100644 --- a/compose.yaml +++ b/compose.yaml @@ -13,7 +13,7 @@ services: dockerfile: Dockerfile - hostname: academy + hostname: shinobilinux domainname: linux.softwareshinobi.com diff --git a/servers/academy/Dockerfile b/servers/academy/Dockerfile index a8e0275..8891d79 100755 --- a/servers/academy/Dockerfile +++ b/servers/academy/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu +FROM ubuntu:noble ## diff --git a/servers/academy/provision/provision.bash b/servers/academy/provision/provision.bash index 9504a61..57214d3 100755 --- a/servers/academy/provision/provision.bash +++ b/servers/academy/provision/provision.bash @@ -19,7 +19,7 @@ set -x; cat /etc/issue; -##echo "Shinobi Academy Linux 10x" > /etc/issue; +echo "Shinobi Academy 24.04" > /etc/issue; cat /etc/issue; @@ -43,7 +43,7 @@ apt update; apt install -y vim nano; -apt install -y hollywood; +## apt install -y hollywood; apt install -y cmatrix; @@ -51,7 +51,11 @@ apt install -y cmatrix; ## shinobi academy user config ## -useradd -rm -d /home/shinobi -s /bin/bash -u 1042 shinobi; +groupadd -g 1042 shinobi + +useradd -u 1042 -g 1042 -rm -d /home/shinobi -s /bin/bash shinobi + +##useradd -rm -d /home/shinobi -s /bin/bash -u 1042 shinobi; echo 'shinobi:shinobi' | chpasswd @@ -59,12 +63,16 @@ echo 'shinobi:shinobi' | chpasswd ## restrict permissions on home ## -chown -R nobody: /home/shinobi/ - chmod -R 555 /home/shinobi/ chmod -R 555 /tmp/ +## +## change MOTD +## + +## echo "hey?" > /etc/motd + ## ## start ssh server ##