From 81278fa86b51b030465a90a0a9291864e946a1cf Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Fri, 12 Jun 2020 12:07:42 -0600 Subject: [PATCH] Various improvements for systemd --- scripts/install-scripts.bash | 1 + scripts/riju-serve.bash | 2 +- scripts/riju.service | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/install-scripts.bash b/scripts/install-scripts.bash index c0e3154..5f5c741 100755 --- a/scripts/install-scripts.bash +++ b/scripts/install-scripts.bash @@ -4,6 +4,7 @@ set -e set -o pipefail cp scripts/riju.service /etc/systemd/system/riju.service +cp scripts/riju-serve.bash /usr/bin/riju-serve cp scripts/certbot-pre.bash /etc/letsencrypt/renewal-hooks/pre/riju cp scripts/certbot-post.bash /etc/letsencrypt/renewal-hooks/post/riju cp scripts/deploy-phase1.py /usr/bin/riju-deploy diff --git a/scripts/riju-serve.bash b/scripts/riju-serve.bash index 15269dd..ff6630c 100755 --- a/scripts/riju-serve.bash +++ b/scripts/riju-serve.bash @@ -11,5 +11,5 @@ TLS_CERTIFICATE="$(base64 /etc/letsencrypt/live/riju.codes/fullchain.pem)" # the script. export TLS TLS_PRIVATE_KEY TLS_CERTIFICATE -docker run -e TLS -e TLS_PRIVATE_KEY -e TLS_CERTIFICATE \ +docker run -it -e TLS -e TLS_PRIVATE_KEY -e TLS_CERTIFICATE \ --rm -p 0.0.0.0:80:6119 -p 0.0.0.0:443:6120 riju:prod diff --git a/scripts/riju.service b/scripts/riju.service index 7c20330..2854d1f 100644 --- a/scripts/riju.service +++ b/scripts/riju.service @@ -1,8 +1,12 @@ [Unit] Description=Riju online coding sandbox +Requires=docker.service +After=docker.service [Service] +Type=exec ExecStart=riju-serve +Restart=always [Install] WantedBy=multi-user.target