multiple changes

settings.py

@@ -1,20 +1,41 @@
+'''Settings für das interne Experimentierprojekt
+
+    TARGET  '2020.fet.at'
+
+    URL_HOSTNAME 'bot.fet.at'
+
+    SOLR_HOST  'solr:8930'
+
+    ETHERPAD_API
+
+    ETHERPAD_EXT
+
+    ETHERPAD_KEYFILE
+
+    ETHERPAD_GROUP
+
+    CHATFILE Speicherpfad für Chats 'chats.yaml'
+
+    USERFILE Speicerpfad für User 'users.yaml'
+'''
+
 import environ
-STUFF="sdf"
+
+
 env = environ.Env(
-    SOLR_HOST=(str, "http://localhost:8980"), TARGET=(str, "https://alpha.2020.fet.at")
+    CHATFILE=(str, "chats.yaml"),
+    USERFILE=(str, "users.yaml"),
+    TARGET=(str, "https://alpha.2020.fet.at"),
+    URL_HOSTNAME=(str, "bot.2020.fet.at"),
+    SOLR_HOST=(str, "http://solr:8983"),
 )
+SOLR_HOST = env("SOLR_HOST")
+CHATFILE = env("CHATFILE")
+USERFILE = env("USERFILE")
+TARGET = env("TARGET")
+URL_HOSTNAME = env("URL_HOSTNAME")
 
-TARGET=env("TARGET")
-SOLR_HOST=env("SOLR_HOST")
-env=environ.Env(
-    CHATFILE=(str,"chats.yaml"),
-    USERFILE=(str,"users.yaml"),
-    TARGET=(str,"https://alpha.2020.fet.at"),
-    URL_HOSTNAME=(str, "bot.2020.fet.at" ),
-    
-)
-
-CHATFILE= env('CHATFILE')
-USERFILE=env('USERFILE')
-TARGET=env('TARGET')
-URL_HOSTNAME=env('URL_HOSTNAME')
+ETHERPAD_API = ("http://etherpad:9001",)
+ETHERPAD_EXT = ("https://bot.2020.fet.at/etherpad/",)
+ETHERPAD_KEYFILE = ("services/etherpad/APIKEY.txt",)
+ETHERPAD_GROUP = "fetwiki"