From da5d968a3a2df43be22a73b4fbfe91785226cace Mon Sep 17 00:00:00 2001
From: David Kebler <d@kebler.net>
Date: Mon, 26 Oct 2020 13:34:42 -0700
Subject: [PATCH] reworking scripts

---
 .gitignore                | 2 +-
 conf/example.conf         | 2 +-
 scripts/convert           | 3 ++-
 scripts/{ => delete}/arch | 0
 {bin => scripts}/install  | 5 ++++-
 scripts/mkuser            | 9 +++++----
 scripts/newconf           | 5 +++--
 scripts/own               | 7 ++++---
 scripts/run               | 5 +++--
 9 files changed, 23 insertions(+), 15 deletions(-)
 rename scripts/{ => delete}/arch (100%)
 rename {bin => scripts}/install (97%)

diff --git a/.gitignore b/.gitignore
index b5587c7..b42437d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 env/AWS
 env/aws.sh
 .bash_history
-/caddy
+/bin/caddy
 conf/238lights.conf
 conf/645lights.conf
 conf/trantor.conf
diff --git a/conf/example.conf b/conf/example.conf
index 7f14385..8ca3b38 100644
--- a/conf/example.conf
+++ b/conf/example.conf
@@ -13,7 +13,7 @@ handle_errors {
   }
 }
 
-https://example.<mydomain.com> {
+https://example.kebler.net {
 import r53
 root * /opt/caddy/example-web
 file_server
diff --git a/scripts/convert b/scripts/convert
index 52ac30d..58e987e 100755
--- a/scripts/convert
+++ b/scripts/convert
@@ -1,3 +1,4 @@
 #!/bin/bash
+DIR=$(dirname "$(dirname "$(readlink -f "$0")")") || exit
 CONF=${1:-caddy}
-/opt/caddy/caddy adapt --config /opt/caddy/$CONF.conf --adapter caddyfile > caddy.json
+$DIR/bin/caddy adapt --config $DIR/conf/$CONF.conf --adapter caddyfile > caddy.json
diff --git a/scripts/arch b/scripts/delete/arch
similarity index 100%
rename from scripts/arch
rename to scripts/delete/arch
diff --git a/bin/install b/scripts/install
similarity index 97%
rename from bin/install
rename to scripts/install
index 74b760a..fff59c5 100755
--- a/bin/install
+++ b/scripts/install
@@ -96,11 +96,14 @@ echo Operating System $OS
 echo Architecture $ARCH
 echo Archive Type $ARCHIVE
 
-BIN_DIR="$(dirname "$(readlink -f "$0")")"
+REPO_DIR=$(dirname "$(dirname "$(readlink -f "$0")")") || exit
+BIN_DIR="$REPO_DIR/bin"
 BIN_NAME=${BIN_NAME:-caddy}
 [ "$OS" == windows ] && BIN_NAME=$BIN_NAME.exe
 BIN_PATH="$BIN_DIR/$BIN_NAME"
 
+echo $BIN_PATH
+
 if [ $LOCAL == true ]; then
  echo "Using Local Binary <$BIN_DIR/$OS-$ARCH> if Available"
    if [ -f "$BIN_DIR/$OS-$ARCH" ]; then
diff --git a/scripts/mkuser b/scripts/mkuser
index 97c1653..c5f32e5 100755
--- a/scripts/mkuser
+++ b/scripts/mkuser
@@ -1,5 +1,5 @@
 #!/bin/bash
-#!/bin/bash
+DIR=$(dirname "$(dirname "$(readlink -f "$0")")") || exit
 sudo userdel caddy
 sudo groupadd caddy
 sudo groupmod --gid 937 caddy
@@ -8,13 +8,14 @@ sudo useradd --system \
   --uid 937 \
 	--gid caddy \
 	--create-home \
-	--home-dir /opt/caddy \
+	--home-dir "$DIR" \
 	--shell /bin/bash \
 	--comment "Caddy web server" \
 	caddy
 sudo passwd caddy
 sudo usermod -a -G caddy $USER
-sudo chown -R caddy:caddy /opt/caddy
-sudo chmod g+rw -R /opt/caddy
+sudo chown -R caddy:caddy "$DIR"
+sudo chmod g+rw -R "$DIR"
 cat /etc/passwd | grep caddy
 cat /etc/passwd | grep sysadmin
+$DIR/scripts/own
diff --git a/scripts/newconf b/scripts/newconf
index 7e6fbb1..1a00ca1 100755
--- a/scripts/newconf
+++ b/scripts/newconf
@@ -1,3 +1,4 @@
 #!/bin/bash
-touch /opt/caddy/conf/$1.conf
-sudo chown caddy:sysadmin /opt/caddy/conf/$1.conf
+DIR=$(dirname "$(dirname "$(readlink -f "$0")")") || exit
+touch $DIR/conf/$1.conf
+sudo chown caddy:caddy $DIR/conf/$1.conf
diff --git a/scripts/own b/scripts/own
index 2fdef9f..c86472d 100755
--- a/scripts/own
+++ b/scripts/own
@@ -1,4 +1,5 @@
 #!/bin/bash
-# reset ownership if need be.  Assumes user is in caddy group
-sudo chown -R caddy:caddy /opt/caddy
-sudo chmod g+rwx -R /opt/caddy
+# reset ownership if need be.  User must be in caddy group
+DIR=$(dirname "$(dirname "$(readlink -f "$0")")") || exit
+sudo chown -R caddy:caddy $DIR
+sudo chmod g+rwx -R $DIR
diff --git a/scripts/run b/scripts/run
index 2fc91dc..a2f4f91 100755
--- a/scripts/run
+++ b/scripts/run
@@ -1,6 +1,7 @@
 #!/bin/bash
 # one off run command for testing without systemd
+DIR=$(dirname "$(dirname "$(readlink -f "$0")")") || exit
 CONF=${1:-caddy}
-source /opt/caddy/env/aws.sh
+$DIR/env/aws.sh
 sudo -E /usr/bin/env | grep AWS
-sudo -E /opt/caddy/caddy run --config /opt/caddy/conf/$CONF.conf --adapter caddyfile
+sudo -E $DIR/bin/caddy run --config $DIR/conf/$CONF.conf --adapter caddyfile