Infra/lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'lemur_vault_plugin' of github.com:/alwaysjolley/lemur into lemur_vault_plugin

Browse Source
This commit is contained in:
alwaysjolley 2019-03-07 15:42:40 -05:00
commit 7b0a3cf781
7 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lemur/__init__.py
View File

@ -62,8 +62,8 @@ LEMUR_BLUEPRINTS = (
)
def create_app(config=None):
app = factory.create_app(app_name=__name__, blueprints=LEMUR_BLUEPRINTS, config=config)
def create_app(config_path=None):
app = factory.create_app(app_name=__name__, blueprints=LEMUR_BLUEPRINTS, config=config_path)
configure_hook(app)
return app

4
lemur/manage.py
View File

@ -50,7 +50,7 @@ from lemur.pending_certificates.models import PendingCertificate # noqa
from lemur.dns_providers.models import DnsProvider # noqa
manager = Manager(create_app)
manager.add_option('-c', '--config', dest='config')
manager.add_option('-c', '--config', dest='config_path', required=False)
migrate = Migrate(create_app)
@ -391,7 +391,7 @@ class LemurServer(Command):
# run startup tasks on an app like object
validate_conf(current_app, REQUIRED_VARIABLES)
app.app_uri = 'lemur:create_app(config="{0}")'.format(current_app.config.get('CONFIG_PATH'))
app.app_uri = 'lemur:create_app(config_path="{0}")'.format(current_app.config.get('CONFIG_PATH'))
return app.run()

2
lemur/tests/conftest.py
View File

@ -43,7 +43,7 @@ def app(request):
Creates a new Flask application for a test duration.
Uses application factory `create_app`.
"""
_app = create_app(os.path.dirname(os.path.realpath(__file__)) + '/conf.py')
_app = create_app(config_path=os.path.dirname(os.path.realpath(__file__)) + '/conf.py')
ctx = _app.app_context()
ctx.push()

10
requirements-docs.txt
View File

@ -7,7 +7,7 @@
acme==0.31.0
alabaster==0.7.12 # via sphinx
alembic-autogenerate-enums==0.0.2
alembic==1.0.7
alembic==1.0.8
amqp==2.4.2
aniso8601==5.1.0
arrow==0.13.1
@ -17,8 +17,8 @@ babel==2.6.0 # via sphinx
bcrypt==3.1.6
billiard==3.5.0.5
blinker==1.4
boto3==1.9.106
botocore==1.12.106
boto3==1.9.107
botocore==1.12.107
celery[redis]==4.2.1
certifi==2018.11.29
certsrv==2.1.1
@ -51,7 +51,7 @@ jinja2==2.10
jmespath==0.9.4
josepy==1.1.0
jsonlines==1.2.0
kombu==4.4.0
kombu==4.3.0
lockfile==0.12.2
mako==1.0.7
markupsafe==1.1.1
@ -91,7 +91,7 @@ sphinx==1.8.4
sphinxcontrib-httpdomain==1.7.0
sphinxcontrib-websupport==1.1.0 # via sphinx
sqlalchemy-utils==0.33.11
sqlalchemy==1.2.18
sqlalchemy==1.3.0
tabulate==0.8.3
urllib3==1.24.1
vine==1.2.0

4
requirements-tests.txt
View File

@ -8,9 +8,9 @@ asn1crypto==0.24.0 # via cryptography
atomicwrites==1.3.0 # via pytest
attrs==19.1.0 # via pytest
aws-xray-sdk==0.95 # via moto
boto3==1.9.106 # via moto
boto3==1.9.107 # via moto
boto==2.49.0 # via moto
botocore==1.12.106 # via boto3, moto, s3transfer
botocore==1.12.107 # via boto3, moto, s3transfer
certifi==2018.11.29 # via requests
cffi==1.12.2 # via cryptography
chardet==3.0.4 # via requests

3
requirements.in
View File

@ -27,6 +27,7 @@ gunicorn
hvac # required for the vault destination plugin
inflection
jinja2
kombu==4.3.0 # kombu 4.4.0 requires redis 3
lockfile
marshmallow-sqlalchemy
marshmallow
@ -45,4 +46,4 @@ six
SQLAlchemy-Utils
tabulate
xmltodict
pyyaml>=4.2b1 #high severity alert
pyyaml>=4.2b1 #high severity alert

10
requirements.txt
View File

@ -6,7 +6,7 @@
#
acme==0.31.0
alembic-autogenerate-enums==0.0.2
alembic==1.0.7 # via flask-migrate
alembic==1.0.8 # via flask-migrate
amqp==2.4.2 # via kombu
aniso8601==5.1.0 # via flask-restful, relativetimebuilder
arrow==0.13.1
@ -15,8 +15,8 @@ asyncpool==1.0
bcrypt==3.1.6 # via flask-bcrypt, paramiko
billiard==3.5.0.5 # via celery
blinker==1.4 # via flask-mail, flask-principal, raven
boto3==1.9.106
botocore==1.12.106
boto3==1.9.107
botocore==1.12.107
celery[redis]==4.2.1
certifi==2018.11.29
certsrv==2.1.1
@ -48,7 +48,7 @@ jinja2==2.10
jmespath==0.9.4 # via boto3, botocore
josepy==1.1.0 # via acme
jsonlines==1.2.0 # via cloudflare
kombu==4.4.0 # via celery
kombu==4.3.0
lockfile==0.12.2
mako==1.0.7 # via alembic
markupsafe==1.1.1 # via jinja2, mako
@ -81,7 +81,7 @@ retrying==1.3.3
s3transfer==0.2.0 # via boto3
six==1.12.0
sqlalchemy-utils==0.33.11
sqlalchemy==1.2.18 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
sqlalchemy==1.3.0 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
tabulate==0.8.3
urllib3==1.24.1 # via botocore, requests
vine==1.2.0 # via amqp