From a311d7ff9fedece2e361fb2cdf6607378fcba407 Mon Sep 17 00:00:00 2001
From: Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
Date: Wed, 11 Nov 2020 11:49:01 +0100
Subject: [PATCH] flask port as parameter
---
server | 10 +++++++---
webapps-deliverer.service | 3 ++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/server b/server
index 2388f2b..6afa075 100755
--- a/server
+++ b/server
@@ -1,10 +1,14 @@
#!/bin/bash
-if [ -z "$1" ]; then
- echo "error: missing data path"
+# $1 = flask port
+# $2 = data path
+
+if [ $# -lt 2 ]; then
+ echo "error: missing parameter"
exit -1
fi
+export FLASK_RUN_PORT="$1"
export FLASK_APP=server.py
export FLASK_DEBUG=1
export FLASK_ENV=development # TODO: FLASK_ENV=production
@@ -12,4 +16,4 @@ export FLASK_ENV=development # TODO: FLASK_ENV=production
python3 -m venv ./
source bin/activate
pip3 install -e .
-python3 server.py "$1"
+python3 server.py "$2"
diff --git a/webapps-deliverer.service b/webapps-deliverer.service
index 96b3145..bd09d3b 100644
--- a/webapps-deliverer.service
+++ b/webapps-deliverer.service
@@ -4,13 +4,14 @@ After=network.target
[Service]
User=nobody
+Environment=FLASK_PORT=8081
Environment=DATA_PATH=/srv/www/data/
Type=simple
StandardOutput=null
StandardError=null
Restart=no
WorkingDirectory=/usr/local/share/webapps-deliverer
-ExecStart=/bin/bash -l -c "source bin/activate;./server ${DATA_PATH}"
+ExecStart=/bin/bash -l -c "source bin/activate;./server ${FLASK_PORT} ${DATA_PATH}"
[Install]
WantedBy=multi-user.target
--
GitLab