remove docker-compose.yml.dist

.gitignore

@@ -163,7 +163,6 @@ cython_debug/
 # television
 data/
 logs/
-docker-compose.yml
+variables.env
-certbot.env
 haproxy.cfg
 *.json

certbot.env.dist

@@ -1,2 +0,0 @@
-BASE_URL=example.com
-EMAIL=info@example.com

docker-compose.yml

@@ -41,10 +41,8 @@ services:
 
   restreamer:
     image: datarhei/restreamer:2.7.0
-    environment:
+    env_file:
-      - CORE_LOG_LEVEL=warn
+       - "variables.env"
-      - CORE_API_AUTH_USERNAME=admin
-      - CORE_API_AUTH_PASSWORD=pass
     ports:
       - "6000:6000/udp"
     volumes:
@@ -61,11 +59,8 @@ services:
       - "restreamer"
     build: ./src/scheduler
     image: stream-scheduler:latest
-    environment:
+    env_file:
-      - LOG_LEVEL=info
+       - "variables.env"
-      - CORE_API_HOSTNAME=stream.example.com
-      - CORE_API_USERNAME=admin
-      - CORE_API_PASSWORD=pass
     restart: unless-stopped
     networks:
       - net

renew-certificates.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source certbot.env
+source variables.env
 
 CB=`docker ps | grep certbot | cut -d ' ' -f 1`
 

src/scheduler/app.py

@@ -15,8 +15,8 @@ database = {}
 # Environment
 api_hostname = os.environ.get('CORE_API_HOSTNAME')
 api_port = os.environ.get('CORE_API_PORT')
-api_username = os.environ.get('CORE_API_USERNAME')
+api_username = os.environ.get('CORE_API_AUTH_USERNAME')
-api_password=os.environ.get('CORE_API_PASSWORD')
+api_password=os.environ.get('CORE_API_AUTH_PASSWORD')
 
 iway = {
     "head": "https://stream.deflax.net/memfs/ac2172fa-d8d5-4487-8bc6-5347dcf7c0dc.m3u8"
@@ -110,7 +110,7 @@ manager.register_task(name="read_database", job=analyze_db).period(35).start()
 
 @app.route('/', methods=['GET'])
 def root_query():
-    playhead = obs
+    playhead = iway
     return jsonify(playhead)
 
 def create_app():

variables.env.dist

@@ -0,0 +1,7 @@
+BASE_URL=example.com
+EMAIL=info@example.com
+CORE_LOG_LEVEL=warn
+CORE_API_HOSTNAME=stream.example.com
+CORE_API_AUTH_USERNAME=admin
+CORE_API_AUTH_PASSWORD=changeme
+SCHEDULER_LOG_LEVEL=info