Y6c

.gitignore

@@ -1,5 +1,6 @@
 __pycache__
 *.pyc
+.ipynb_checkpoints/
 static/workdir/*
 easyweb/static/workdir/*
 easyweb/static/internal/emails/*
@@ -17,3 +18,12 @@ venv/
 dump.rdb
 setup.sh
 .access
+*.ipynb
+chart/
+deploy/
+kubernetes/
+*.sql
+easyweb/static/des_components/des-pages/des-my-tables-old.html
+easyweb/static/files/
+easyweb/static/internal/stats/
+

README.md

@@ -9,7 +9,7 @@
     celery multi start worker1 -A ea_tasks --loglevel=info
     celery worker -A ea_tasks --loglevel=info -E -c 2
 ## start server
-	python3 public.py
+	python3 deslabs.py
 
 
 

Settings.py

@@ -3,9 +3,12 @@
 import random
 import string
 import logging
+import yaml
 DEBUG = False
 DIRNAME = os.path.dirname(__file__)
+TOKEN_TTL = 3600
 STATIC_PATH = os.path.join(DIRNAME, 'easyweb/static')
+URLPATH = 'http://desdr-server.ncsa.illinois.edu/easyweb'
 try:
     LOG_PATH = os.path.join(DIRNAME, 'logs', os.environ['POD_ID'])
 except:
@@ -15,17 +18,20 @@
     os.makedirs(LOG_PATH)
 TEMPLATE_PATH = os.path.join(DIRNAME, 'templates')
 WORKDIR = os.path.join(STATIC_PATH, "workdir/")
+PLTDATA = os.path.join(STATIC_PATH, "plotdata/")
 DBFILE = os.path.join(STATIC_PATH, "workdir/admin/users.db")
+DBFILE2 = os.path.join(STATIC_PATH, "workdir/admin/users.db")
 ROOT_URL = 'https://des.ncsa.illinois.edu'
 #ROOT_URL = 'http://localhost:8080'
 LOGFILE = os.path.join(LOG_PATH, "access.log")
 LOG_GENERALFILE = os.path.join(LOG_PATH, "general.log")
 LOG_APPFILE = os.path.join(LOG_PATH, "app.log")
 WORKERS = os.path.join(DIRNAME, 'workers')
 # TODO: read from file since there will be a race conition between pods
-with open('config/ranC.tk', 'r') as fi:
-    COOKIE_SECRET = fi.readline().strip()
-    SKEY = fi.readline().strip()
+with open('config/desaccess.yaml', 'r') as cfile:
+    conf = yaml.load(cfile)['secrets']
+COOKIE_SECRET = conf['cookie']
+SKEY = conf['skey']
 # COOKIE_SECRET = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(16))
 # SKEY = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(16))
 formatter = logging.Formatter(fmt='%(asctime)s - %(levelname)-8s - %(message)s',
@@ -49,7 +55,9 @@
 handler_app.setFormatter(formatter)
 app_log.addHandler(handler_app)
 
+
 class dbConfig(object):
     def __init__(self):
-        self.host = 'desdb-dr.ncsa.illinois.edu'
+        # self.host = 'desdb-dr.ncsa.illinois.edu'
+        self.host = 'desdb.ncsa.illinois.edu'
         self.port = '1521'