mirror of
https://github.com/status-im/spiffworkflow-connector.git
synced 2025-02-22 19:48:07 +00:00
resolved merge conflicts w/ burnettk
This commit is contained in:
commit
81f1bb965b
@ -1,7 +1,5 @@
|
|||||||
from os import environ
|
from os import environ
|
||||||
|
|
||||||
CONNECTOR_PROXY_WAKU_BASE_URL = environ.get("CONNECTOR_PROXY_WAKU_BASE_URL", default="http://localhost:8545")
|
|
||||||
|
|
||||||
CONNECTOR_PROXY_XERO_CLIENT_ID = environ.get("CONNECTOR_PROXY_XERO_CLIENT_ID")
|
CONNECTOR_PROXY_XERO_CLIENT_ID = environ.get("CONNECTOR_PROXY_XERO_CLIENT_ID")
|
||||||
CONNECTOR_PROXY_XERO_CLIENT_SECRET = environ.get("CONNECTOR_PROXY_XERO_CLIENT_SECRET")
|
CONNECTOR_PROXY_XERO_CLIENT_SECRET = environ.get("CONNECTOR_PROXY_XERO_CLIENT_SECRET")
|
||||||
|
|
||||||
@ -10,3 +8,5 @@ CONNECTOR_PROXY_POSTGRESQL_USER_NAME = environ.get("CONNECTOR_PROXY_POSTGRESQL_U
|
|||||||
CONNECTOR_PROXY_POSTGRESQL_HOST = environ.get("CONNECTOR_PROXY_POSTGRESQL_HOST", default="localhost")
|
CONNECTOR_PROXY_POSTGRESQL_HOST = environ.get("CONNECTOR_PROXY_POSTGRESQL_HOST", default="localhost")
|
||||||
CONNECTOR_PROXY_POSTGRESQL_PORT = environ.get("CONNECTOR_PROXY_POSTGRESQL_PORT", default="7005")
|
CONNECTOR_PROXY_POSTGRESQL_PORT = environ.get("CONNECTOR_PROXY_POSTGRESQL_PORT", default="7005")
|
||||||
CONNECTOR_PROXY_POSTGRESQL_PASSWORD = environ.get("CONNECTOR_PROXY_POSTGRESQL_PASSWORD")
|
CONNECTOR_PROXY_POSTGRESQL_PASSWORD = environ.get("CONNECTOR_PROXY_POSTGRESQL_PASSWORD")
|
||||||
|
|
||||||
|
SECRET_KEY = environ.get("FLASK_SESSION_SECRET_KEY", default="super-secret-key-for-flask")
|
||||||
|
2
poetry.lock
generated
2
poetry.lock
generated
@ -1002,7 +1002,7 @@ Flask-OAuthlib = "^0.9.6"
|
|||||||
type = "git"
|
type = "git"
|
||||||
url = "https://github.com/sartography/spiffworkflow-proxy"
|
url = "https://github.com/sartography/spiffworkflow-proxy"
|
||||||
reference = "HEAD"
|
reference = "HEAD"
|
||||||
resolved_reference = "6cb2bbea923946cb2db3bf571a4ce28c776434b9"
|
resolved_reference = "4cdbd3b37a15a49fbb043528ff3f9aeee9784b2f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "stevedore"
|
name = "stevedore"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user