From acea65d3705e7a0e54196ad79aca61f281f307da Mon Sep 17 00:00:00 2001
From: David Trattnig <david@subsquare.at>
Date: Mon, 29 Nov 2021 19:02:09 +0100
Subject: [PATCH] Generalize targets.
---
Dockerfile | 2 +-
config/supervisor/aura-engine.conf | 2 +-
config/systemd/aura-engine.service | 2 +-
run.sh | 10 +++++-----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 11050e39..85f1a7ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,4 +31,4 @@ VOLUME ["/srv/socket", "/srv/logs", "/var/audio/source", "/var/audio/playlist"]
# Start the Engine
EXPOSE 1337/tcp
-ENTRYPOINT ["./run.sh"]
+ENTRYPOINT ["./run.sh", "prod"]
diff --git a/config/supervisor/aura-engine.conf b/config/supervisor/aura-engine.conf
index df4e33c6..bada2f8d 100644
--- a/config/supervisor/aura-engine.conf
+++ b/config/supervisor/aura-engine.conf
@@ -1,7 +1,7 @@
[program:aura-engine]
user = engineuser
directory = /opt/aura/engine
-command = /opt/aura/engine/run.sh engine
+command = /opt/aura/engine/run.sh prod
priority = 666
autostart = true
diff --git a/config/systemd/aura-engine.service b/config/systemd/aura-engine.service
index 004b652a..02076fce 100644
--- a/config/systemd/aura-engine.service
+++ b/config/systemd/aura-engine.service
@@ -8,7 +8,7 @@ Requires=aura-engine-core.service
Type=simple
User=engineuser
WorkingDirectory=/opt/aura/engine
-ExecStart=/opt/aura/engine/run.sh
+ExecStart=/opt/aura/engine/run.sh prod
Restart=always
[Install]
diff --git a/run.sh b/run.sh
index 2bd3e6f5..39980cd8 100755
--- a/run.sh
+++ b/run.sh
@@ -8,16 +8,16 @@ docker="false"
# Call with one of these parameters:
#
# - dev
-# - engine
+# - prod
# - test
# - recreate-database
-# - docker:engine
+# - docker:dev
# - docker:build
# - docker:push
#
-if [[ $* =~ ^(dev|engine|test|recreate-database)$ ]]; then
+if [[ $* =~ ^(dev|prod|test|recreate-database)$ ]]; then
mode=$1
fi
@@ -50,7 +50,7 @@ if [[ $docker == "false" ]]; then
### Runs Engine ###
- if [[ $mode == "engine" ]]; then
+ if [[ $mode == "prod" ]]; then
/usr/bin/env $PYTHON_EXEC run.py
fi
@@ -79,7 +79,7 @@ if [[ $docker == "true" ]]; then
### Runs Engine Docker Container ###
- if [[ $mode == "engine" ]]; then
+ if [[ $mode == "dev" ]]; then
if [[ -z "${AURA_ENGINE_CONFIG_PATH}" ]]; then
AURA_ENGINE_CONFIG_PATH=$(readlink -f "${BASE_DIR}/config/engine.docker.ini")
--
GitLab