diff --git a/bin/amd64/caddy b/bin/amd64/caddy index 0e20c8f..6ae8017 100755 Binary files a/bin/amd64/caddy and b/bin/amd64/caddy differ diff --git a/bin/arm64/caddy b/bin/arm64/caddy index 42259cc..546d9b5 100755 Binary files a/bin/arm64/caddy and b/bin/arm64/caddy differ diff --git a/conf/test.conf b/conf/test.conf new file mode 100644 index 0000000..7176d45 --- /dev/null +++ b/conf/test.conf @@ -0,0 +1,21 @@ +#!/bin/bash +(r53) { + tls { + dns route53 { + max_retries 10 + } + } +} +(errors) { +handle_errors { + rewrite * /{http.error.status_code}.html + file_server + } +} + +https://testweb.kebler.net { +import r53 +root * /opt/caddy/testweb +file_server +import errors + } diff --git a/scripts/deploy b/scripts/deploy deleted file mode 100755 index ee0fdb5..0000000 --- a/scripts/deploy +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -HOST=${1:-rrock64} -# run as root -sudo rsync -chavzP -e 'ssh -p22 -i /home/david/.ssh/privatekeys/sysadmin.kebler.net' /opt/caddy/ root@${HOST}:/opt/caddy diff --git a/scripts/mkuser b/scripts/mkuser index 2ea53ab..97c1653 100755 --- a/scripts/mkuser +++ b/scripts/mkuser @@ -13,8 +13,8 @@ sudo useradd --system \ --comment "Caddy web server" \ caddy sudo passwd caddy -sudo usermod -a -G caddy sysadmin -source /opt/caddy/scripts/own +sudo usermod -a -G caddy $USER +sudo chown -R caddy:caddy /opt/caddy sudo chmod g+rw -R /opt/caddy cat /etc/passwd | grep caddy cat /etc/passwd | grep sysadmin diff --git a/scripts/own b/scripts/own index f6f63ce..4cf8aae 100755 --- a/scripts/own +++ b/scripts/own @@ -1,4 +1,4 @@ #!/bin/bash -sudo chown caddy:sysadmin -R /opt/caddy/conf -sudo chown caddy:sysadmin /opt/caddy +# reset ownership if need be. Assumes user is in caddy group +sudo chown -R caddy:caddy /opt/caddy sudo chmod g+rw -R /opt/caddy diff --git a/scripts/updatebin b/scripts/updatebin deleted file mode 100755 index 58050f3..0000000 --- a/scripts/updatebin +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# TODO needs work -SERVER="download.kebler.net" -DIR=$(dirname "$(dirname "$(readlink -f "$0")")") || exit -echo Getting updated binary -wget diff --git a/testweb/404.html b/testweb/404.html new file mode 100644 index 0000000..641af2a --- /dev/null +++ b/testweb/404.html @@ -0,0 +1,9 @@ + +Test Web + + +
+

Page Not Found 404

+
+ + diff --git a/testweb/index.html b/testweb/index.html new file mode 100644 index 0000000..3cbdccc --- /dev/null +++ b/testweb/index.html @@ -0,0 +1,13 @@ + + + + + +Test Web + + +
+

Test Web

+
+ +