switched to systemd template file to use with any conf file in /conf with default being caddy.conf file

Added trantor.conf file
giskard
David Kebler 2020-05-18 07:17:55 -07:00
parent c34205201a
commit e55b37072a
7 changed files with 28 additions and 14 deletions

View File

@ -16,7 +16,17 @@ https://git.238.kebler.net {
} }
# Home Assistant Server # Home Assistant Server
https://ha.238.kebler.net { https://ha.kebler.net, https://ha.238.kebler.net {
import r53 import r53
reverse_proxy /* hassio.kebler.net:8123 reverse_proxy /* hassio.kebler.net:8123
} }
https://docker.kebler.net {
import r53
reverse_proxy /* http://trantor.kebler.net:9000
}
https://geeks.kebler.net {
import r53
reverse_proxy /* http://trantor.kebler.net:9292
}

View File

@ -21,8 +21,8 @@ User=caddy
Group=caddy Group=caddy
EnvironmentFile=/opt/caddy/env/AWS EnvironmentFile=/opt/caddy/env/AWS
WorkingDirectory=/opt/caddy WorkingDirectory=/opt/caddy
ExecStart=/opt/caddy/caddy run --environ --config /opt/caddy/conf/caddy.conf --adapter=caddyfile ExecStart=/opt/caddy/caddy run --environ --config /opt/caddy/conf/%i.conf --adapter=caddyfile
ExecReload=/opt/caddy/caddy reload --config /opt/caddy/conf/caddy.conf --adapter=caddyfile ExecReload=/opt/caddy/caddy reload --config /opt/caddy/conf/%.conf --adapter=caddyfile
TimeoutStopSec=5s TimeoutStopSec=5s
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=512 LimitNPROC=512

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# makes link to this service file # copies template to systemd
DIR="$(dirname "$(readlink -f "$0")")" DIR="$(dirname "$(readlink -f "$0")")"
sudo rm /etc/systemd/system/caddy.service sudo rm /etc/systemd/system/caddy@.service
sudo ln -s $DIR/caddy.service /etc/systemd/system/ sudo cp $DIR/caddy@.service /etc/systemd/system/

View File

@ -1,3 +1,4 @@
#!/bin/bash #!/bin/bash
sudo journalctl --unit=caddy.service -n 50 --no-pager CONF=${1:-caddy}
sudo journalctl --unit=caddy@$CONF.service -n 50 --no-pager
exit 1 exit 1

View File

@ -1,2 +1,3 @@
#!/bin/bash #!/bin/bash
sudo systemctl enable caddy CONF=${1:-caddy}
sudo systemctl enable caddy@$CONF

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
CONF=${1:-caddy}
sudo systemctl daemon-reload sudo systemctl daemon-reload
sudo systemctl stop caddy sudo systemctl stop caddy@$CONF
sudo systemctl start caddy sudo systemctl start caddy@$CONF
sudo systemctl status caddy sudo systemctl status caddy@$CONF

View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
sudo systemctl stop caddy CONF=${1:-caddy}
sudo systemctl status caddy sudo systemctl stop caddy@$CONF
sudo journalctl --unit=caddy.service -n 100 --no-pager sudo systemctl status caddy@$CONF
sudo journalctl --unit=caddy@$CONF.service -n 100 --no-pager