diff --git a/.gitmodules b/.gitmodules index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cf345f40998545fbb0a7564c5bd4dab384392704 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "dev"] + path = dev + url = https://github.com/Blocp/dev diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..475fdb2f6221769b9ddf68efc0f263e9ac184a76 --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +# Create Test & Local Configuration Files +config: + cp ./app/config/test.default.py ./app/config/test.py && cp ./app/config/local.default.py ./app/config/local.py + +# Create an alias for localhost +# This will be useful to point docker-compose to postgres & redis running locally +alias: + sudo ifconfig lo0 alias 200.10.10.1 255.255.255.0 + + +# Generate Docker Compose File +dc: + svc_appservice='' svc_documentservice='' svc_userservice='' envtpl < dev/compose.yaml.jinja2 > docker-compose.yml diff --git a/app/config/local.default.py b/app/config/local.default.py index 87bf9f5af3c24ac239b4d2edff544e29074ce3af..484336faaacb073f68d0dfd51237dbaf02c60946 100644 --- a/app/config/local.default.py +++ b/app/config/local.default.py @@ -1,21 +1,23 @@ +import os + + SQLALCHEMY_TRACK_MODIFICATIONS = False -SQLALCHEMY_DATABASE_URI = 'postgresql:///buildingservice' +SQLALCHEMY_DATABASE_URI = os.environ['SQLALCHEMY_DATABASE_URI'] -REDIS_URI = 'redis://127.0.0.1:6379/' +REDIS_URI = os.environ['REDIS_URI'] DEBUG = True SERVICE_CONFIG = { - 'app_key': '$APP_KEY', - 'app_secret': '$APP_SECRET', + 'app_key': os.environ['APP_KEY'], + 'app_secret': os.environ['APP_SECRET'], 'headers': { 'app_key': 'x-blocpower-app-key', 'app_token': 'x-blocpower-app-token', 'app_secret': 'x-blocpower-app-secret'}, 'urls': { - 'app': 'http://127.0.0.1:5400', - 'user': 'http://127.0.0.1:5401', - } + 'app': os.environ['APP_SERVICE'], + 'user': os.environ['USER_SERVICE']} } # AppService @@ -30,7 +32,7 @@ HEADER_AUTH_KEY = 'x-blocpower-auth-key' HEADER_AUTH_TOKEN = 'x-blocpower-auth-token' # Mechanical Turk credentials -AWS_ACCESS_KEY = '$AWS_KEY' -AWS_SECRET_ACCESS_KEY = '$AWS_SECRET_KEY' -MECH_TURK_ENDPOINT_URL = '$MECH_TURK_ENDPOINT_URL' -MECH_TURK_REGION = '$MECH_TURK_REGION' +AWS_ACCESS_KEY = os.environ['AWS_ACCESS_KEY'] +AWS_SECRET_ACCESS_KEY = os.environ['AWS_SECRET_KEY'] +MECH_TURK_HOST = os.environ['MECH_TURK_HOST'] +MECH_TURK_REGION=os.environ['MECH_TURK_REGION'] diff --git a/app/config/test.default.py b/app/config/test.default.py index e7f5b221ddc2d4bbb8e86a5708d7bbace06200bf..dc46e0698f549228292256b99a8931c4731d0b92 100644 --- a/app/config/test.default.py +++ b/app/config/test.default.py @@ -1,21 +1,24 @@ +import os + + SQLALCHEMY_TRACK_MODIFICATIONS = False -SQLALCHEMY_DATABASE_URI = 'postgresql:///buildingservice-testing' +SQLALCHEMY_DATABASE_URI = os.environ['SQLALCHEMY_DATABASE_URI'] -REDIS_URI = 'redis://127.0.0.1:6379/' +REDIS_URI = os.environ['REDIS_URI'] DEBUG = True TESTING = True SERVICE_CONFIG = { - 'app_key': '$APP_KEY', - 'app_secret': '$APP_SECRET', + 'app_key': os.environ['APP_KEY'], + 'app_secret': os.environ['APP_SECRET'], 'headers': { 'app_key': 'x-blocpower-app-key', 'app_token': 'x-blocpower-app-token', 'app_secret': 'x-blocpower-app-secret'}, 'urls': { - 'app': 'http://127.0.0.1:5400', - 'user': 'http://127.0.0.1:5401'} + 'app': os.environ['APP_SERVICE'], + 'user': os.environ['USER_SERVICE']} } # App diff --git a/dev b/dev new file mode 160000 index 0000000000000000000000000000000000000000..585967c4ef82f7ebae32424bff13824cb0cf3c3c --- /dev/null +++ b/dev @@ -0,0 +1 @@ +Subproject commit 585967c4ef82f7ebae32424bff13824cb0cf3c3c