From ee0379056a25862102a5068bc579889ed963f4e7 Mon Sep 17 00:00:00 2001 From: Sacheendra Talluri Date: Wed, 25 Jan 2017 15:07:53 +0100 Subject: gets static files from new directory structure --- main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 67ff72ac..bd2a3111 100644 --- a/main.py +++ b/main.py @@ -16,7 +16,7 @@ from opendc.util import exceptions, rest with open('/var/www/opendc.ewi.tudelft.nl/web-server/config/keys.json') as file: KEYS = json.load(file) -STATIC_ROOT = os.path.join(KEYS['ROOT_DIR'], 'static', 'build') +STATIC_ROOT = os.path.join(KEYS['ROOT_DIR'], 'opendc-frontend', 'build') FLASK_CORE_APP = Flask(__name__, static_url_path='') FLASK_CORE_APP.config['SECREY_KEY'] = KEYS['FLASK_SECRET'] @@ -55,7 +55,7 @@ def serve_projects(): def serve_web_server_test(): """Serve the web server test.""" - return send_from_directory(os.path.join(KEYS['ROOT_DIR'], 'web-server', 'static'), 'index.html') + return send_from_directory(os.path.join(KEYS['ROOT_DIR'], 'opendc-web-server', 'static'), 'index.html') @FLASK_CORE_APP.route('//') def serve_static(folder, filepath): @@ -64,7 +64,7 @@ def serve_static(folder, filepath): if not folder in ['bower_components', 'img', 'scripts', 'styles']: abort(404) - return send_from_directory(os.path.join(KEYS['ROOT_DIR'], 'static', 'build', folder), filepath) + return send_from_directory(os.path.join(STATIC_ROOT, folder), filepath) @FLASK_CORE_APP.route('/tokensignin', methods=['POST']) def sign_in(): -- cgit v1.2.3 From 532ecf39611113ac59b084935f68016bd353e73f Mon Sep 17 00:00:00 2001 From: Sacheendra Talluri Date: Wed, 25 Jan 2017 16:17:36 +0100 Subject: makes the app take config file as command line argument and opens port on all interfaces instead of localhost --- main.py | 8 ++++++-- opendc/util/database.py | 3 ++- opendc/util/rest.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index bd2a3111..56f8e7c1 100644 --- a/main.py +++ b/main.py @@ -12,8 +12,12 @@ from oauth2client import client, crypt from opendc.models.user import User from opendc.util import exceptions, rest +if len(sys.argv) < 2: + print "config file path not given as argument" + sys.exit(1) + # Get keys from config file -with open('/var/www/opendc.ewi.tudelft.nl/web-server/config/keys.json') as file: +with open(sys.argv[1]) as file: KEYS = json.load(file) STATIC_ROOT = os.path.join(KEYS['ROOT_DIR'], 'opendc-frontend', 'build') @@ -144,5 +148,5 @@ def receive_message(message): ) -SOCKET_IO_CORE.run(FLASK_CORE_APP, port=8081) +SOCKET_IO_CORE.run(FLASK_CORE_APP, host='0.0.0.0', port=8081) diff --git a/opendc/util/database.py b/opendc/util/database.py index 16fff5f0..2ef8b982 100644 --- a/opendc/util/database.py +++ b/opendc/util/database.py @@ -1,9 +1,10 @@ from datetime import datetime import json import sqlite3 +import sys # Get keys from config file -with open('/var/www/opendc.ewi.tudelft.nl/web-server/config/keys.json') as file: +with open(sys.argv[1]) as file: KEYS = json.load(file) DATETIME_STRING_FORMAT = '%Y-%m-%dT%H:%M:%S' diff --git a/opendc/util/rest.py b/opendc/util/rest.py index a52b0082..65747762 100644 --- a/opendc/util/rest.py +++ b/opendc/util/rest.py @@ -7,7 +7,7 @@ from oauth2client import client, crypt from opendc.util import exceptions, parameter_checker -with open('/var/www/opendc.ewi.tudelft.nl/web-server/config/keys.json') as file: +with open(sys.argv[1]) as file: KEYS = json.load(file) class Request(object): -- cgit v1.2.3