diff --git a/compose.yaml b/compose.yaml index 2b8f826..03f796b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,12 +1,12 @@ services: linux.softwareshinobi.com-server: - + container_name: linux.softwareshinobi.com-server image: softwareshinobi/linux.softwareshinobi.com:server - build: + build: context: server @@ -20,17 +20,13 @@ services: - "2222:22" - volumes: - - - "./tmp:/tmp" - linux.softwareshinobi.com-landing: container_name: linux.softwareshinobi.com-landing image: softwareshinobi/linux.softwareshinobi.com:landing - build: + build: context: landing @@ -39,4 +35,3 @@ services: ports: - "2280:80" - diff --git a/server/provision/users/shinobi/bashrc/.bashrc b/server/provision/users/shinobi/bashrc/.bashrc index 370152e..760278e 100644 --- a/server/provision/users/shinobi/bashrc/.bashrc +++ b/server/provision/users/shinobi/bashrc/.bashrc @@ -1,2 +1,48 @@ +#!/bin/bash + + + + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + + alias a="ls -lha" +alias @ip="dig +short myip.opendns.com @resolver1.opendns.com" +alias r="reset;clear;" +## incoming + +alias ll='ls -l' + +alias r="reset;clear;" + +## + +alias cd..='cd ..' +alias ..='cd ..' +alias ...='cd ../../../' +alias ....='cd ../../../../' +alias .....='cd ../../../../' +alias .4='cd ../../../../' +alias .5='cd ../../../../..' + +## + +alias @memory-info='free -m -l -t' +alias @memory-top='ps auxf | sort -nr -k 4 | head -10' +alias @memory-top-10='ps auxf | sort -nr -k 4 | head -10' + +alias @cpu-info='lscpu' +alias @cpu-top='ps auxf | sort -nr -k 3' +alias @cpu-top-10='ps auxf | sort -nr -k 3 | head -10' + +alias @net-open-ports="sudo netstat -tlpn" + +alias @net-external-ip="dig +short myip.opendns.com @resolver1.opendns.com" + + + +alias @net-internal-interfaces="dig +short myip.opendns.com @resolver1.opendns.com" diff --git a/server/provision/users/shinobi/provision.bash b/server/provision/users/shinobi/provision.bash index b3a4d6c..8892ab8 100755 --- a/server/provision/users/shinobi/provision.bash +++ b/server/provision/users/shinobi/provision.bash @@ -39,6 +39,14 @@ chmod -R 700 /home/shinobi/.ssh chown -R shinobi: /home/shinobi/.ssh +## +## set up bashrc +## + +cp bashrc/.bashrc /home/shinobi/.bashrc + +chmod +x /home/shinobi/.bashrc + ## ## restrict permissions on home ##