From 5bd77daaf85f2331ae131b971aaebaf91f865170 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 10 Jun 2017 18:34:45 +0100 Subject: [PATCH] Checks when adding users --- src/freedombone-app-gogs | 6 ++++++ src/freedombone-app-ipfs | 4 ++++ src/freedombone-app-irc | 4 ++++ src/freedombone-app-pihole | 5 +++++ src/freedombone-app-turtl | 5 +++++ 5 files changed, 24 insertions(+) diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs index 1b6ca167..24ad210c 100755 --- a/src/freedombone-app-gogs +++ b/src/freedombone-app-gogs @@ -384,6 +384,12 @@ function install_gogs { fi adduser --disabled-login --gecos 'Gogs' $GOGS_USERNAME + + if [ ! -d /home/$GOGS_USERNAME ]; then + echo $"/home/$GOGS_USERNAME directory not created" + exit 783528 + fi + groupadd gogs gogs_parameters diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs index ca718213..bfeebc3c 100755 --- a/src/freedombone-app-ipfs +++ b/src/freedombone-app-ipfs @@ -450,6 +450,10 @@ function install_ipfs_go { if [ ! -d /home/git ]; then # add a gogs user account adduser --disabled-login --gecos 'Gogs' git + if [ ! -d /home/git ]; then + echo $"/home/git directory not created" + exit 735272 + fi # install Go if ! grep -q "export GOPATH=" ~/.bashrc; then diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc index ff0f1bce..ac5d6bb0 100755 --- a/src/freedombone-app-irc +++ b/src/freedombone-app-irc @@ -616,6 +616,10 @@ function install_irc_bouncer { apt-get -yq install znc adduser --disabled-login --gecos 'znc' znc + if [ ! -d /home/znc ]; then + echo $"/home/znc directory not created" + exit 7354262 + fi mkdir -p /home/znc/.znc/configs mkdir -p /home/znc/.znc/users diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole index ff0aaf12..ef0508e4 100755 --- a/src/freedombone-app-pihole +++ b/src/freedombone-app-pihole @@ -351,6 +351,11 @@ function remove_pihole { function install_pihole { apt-get -yq install dnsmasq curl adduser --disabled-login --gecos 'pi-hole' pihole + if [ ! -d /home/pihole ]; then + echo $"/home/pihole directory not created" + exit 538929 + fi + chmod 600 /etc/shadow chmod 600 /etc/gshadow usermod -a -G www-data pihole diff --git a/src/freedombone-app-turtl b/src/freedombone-app-turtl index 8da63fa5..e84dcffc 100755 --- a/src/freedombone-app-turtl +++ b/src/freedombone-app-turtl @@ -563,6 +563,11 @@ __ENDCONFIG__ fi adduser --disabled-login --home=$TURTL_BASE_DIR --gecos 'turtl' turtl + if [ ! -d /home/turtl ]; then + echo $"/home/turtl directory not created" + exit 263493 + fi + groupadd turtl chown -R turtl:turtl $TURTL_BASE_DIR