From 353dd86523521aba7a4afc16bf32e2fce7bc602f Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Wed, 1 Mar 2023 13:28:02 +0100
Subject: [PATCH] fix

---
 conf/fittrackee_workers.service        |  9 ------
 conf/variables_fittrackee.conf         | 43 ++++++++------------------
 conf/variables_fittrackee_workers.conf | 40 ++++++------------------
 3 files changed, 23 insertions(+), 69 deletions(-)

diff --git a/conf/fittrackee_workers.service b/conf/fittrackee_workers.service
index f399b54..6d8ec6b 100644
--- a/conf/fittrackee_workers.service
+++ b/conf/fittrackee_workers.service
@@ -15,15 +15,6 @@ Group=__APP__
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=__APP___workers
-Environment="FLASK_APP=fittrackee"
-Environment="APP_SECRET_KEY="
-Environment="APP_LOG="
-Environment="UPLOAD_FOLDER="
-Environment="DATABASE_URL="
-Environment="UI_URL="
-Environment="EMAIL_URL="
-Environment="SENDER_EMAIL="
-Environment="REDIS_URL="
 WorkingDirectory=__INSTALL_DIR__/
 EnvironmentFile=/etc/systemd/system/${app}_workers.service.d/variables.conf
 ExecStart=__INSTALL_DIR__/.venv/bin/flask worker --processes 2
diff --git a/conf/variables_fittrackee.conf b/conf/variables_fittrackee.conf
index 5785462..5cec814 100644
--- a/conf/variables_fittrackee.conf
+++ b/conf/variables_fittrackee.conf
@@ -1,31 +1,14 @@
-APP_SECRET_KEY='__KEY__'
-# APP_WORKERS=
-APP_LOG=/var/log/__APP__/__APP__.log
-UPLOAD_FOLDER=/home/yunohost.app/__APP__/data
+[Service]
 
-# PostgreSQL
-DATABASE_URL=postgresql://__DB_USER__:__DB_PWD__@:5432/__DB_NAME__
-# export DATABASE_DISABLE_POOLING=
-
-# Redis (required for API rate limits and email sending)
-REDIS_URL=redis://127.0.0.1:6379/__REDIS_DB__
-
-# API rate limits
-# export API_RATE_LIMITS="300 per 5 minutes"
-
-# Emails
-UI_URL=__DOMAIN__
-EMAIL_URL=
-SENDER_EMAIL=
-# export WORKERS_PROCESSES=
-
-# Workouts
-TILE_SERVER_URL=
-STATICMAP_SUBDOMAINS=
-MAP_ATTRIBUTION=
-# export DEFAULT_STATICMAP=False
-
-# Weather
-# available weather API providers: darksky, visualcrossing
-# export WEATHER_API_PROVIDER=visualcrossing 
-WEATHER_API_KEY=
+Environment="APP_SECRET_KEY="
+Environment="APP_LOG="
+Environment="UPLOAD_FOLDER="
+Environment="DATABASE_URL="
+Environment="UI_URL="
+Environment="EMAIL_URL="
+Environment="SENDER_EMAIL="
+Environment="REDIS_URL="
+Environment="TILE_SERVER_URL="
+Environment="STATICMAP_SUBDOMAINS="
+Environment="MAP_ATTRIBUTION="
+Environment="WEATHER_API_KEY="
\ No newline at end of file
diff --git a/conf/variables_fittrackee_workers.conf b/conf/variables_fittrackee_workers.conf
index 6d68225..8d67cbe 100644
--- a/conf/variables_fittrackee_workers.conf
+++ b/conf/variables_fittrackee_workers.conf
@@ -1,31 +1,11 @@
-FLASK_APP=fittrackee
-APP_SECRET_KEY='__KEY__'
-APP_LOG=/var/log/__APP__/__APP__.log
-UPLOAD_FOLDER=/home/yunohost.app/__APP__/data
+[Service]
 
-# PostgreSQL
-DATABASE_URL=postgresql://__DB_USER__:__DB_PWD__@:5432/__DB_NAME__
-# export DATABASE_DISABLE_POOLING=
-
-# Redis (required for API rate limits and email sending)
-REDIS_URL=redis://127.0.0.1:6379/__REDIS_DB__
-
-# API rate limits
-# export API_RATE_LIMITS="300 per 5 minutes"
-
-# Emails
-UI_URL=__DOMAIN__
-EMAIL_URL=
-SENDER_EMAIL=
-# export WORKERS_PROCESSES=
-
-# Workouts
-# export TILE_SERVER_URL=
-# export STATICMAP_SUBDOMAINS=
-# export MAP_ATTRIBUTION=
-# export DEFAULT_STATICMAP=False
-
-# Weather
-# available weather API providers: darksky, visualcrossing
-# export WEATHER_API_PROVIDER=visualcrossing 
-# export WEATHER_API_KEY=
+Environment="FLASK_APP=fittrackee"
+Environment="APP_SECRET_KEY="
+Environment="APP_LOG="
+Environment="UPLOAD_FOLDER="
+Environment="DATABASE_URL="
+Environment="UI_URL="
+Environment="EMAIL_URL="
+Environment="SENDER_EMAIL="
+Environment="REDIS_URL="
\ No newline at end of file