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

DNS Providers list returned

Browse Source
This commit is contained in:
Curtis Castrapel 2018-04-11 15:56:00 -07:00
parent a66d85b63d
commit 2d6d2357b5
5 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/certificates/models.py
View File

@ -102,7 +102,7 @@ class Certificate(db.Model):
serial = Column(String(128))
cn = Column(String(128))
deleted = Column(Boolean, index=True)
dns_provider = Column(Integer(), nullable=True)
dns_provider_id = Column(Integer(), nullable=True)
not_before = Column(ArrowType)
not_after = Column(ArrowType)

22
lemur/dns_providers/models.py
View File

@ -6,15 +6,13 @@ from lemur.database import db
class DnsProviders(db.Model):
db.Table('dns_providers',
Column('id', Integer(), nullable=False),
Column('name', String(length=256), nullable=True),
Column('description', String(length=1024), nullable=True),
Column('provider_type', String(length=256), nullable=True),
Column('credentials', String(length=256), nullable=True),
Column('api_endpoint', String(length=256), nullable=True),
Column('date_created', ArrowType(), server_default=text('now()'), nullable=False),
Column('status', String(length=128), nullable=True),
Column('options', JSON),
PrimaryKeyConstraint('id'),
UniqueConstraint('name'))
__tablename__ = 'dns_providers'
id = Column(Integer(), primary_key=True)
name = Column(String(length=256), unique=True, nullable=True)
description = Column(String(length=1024), nullable=True)
provider_type = Column(String(length=256), nullable=True)
credentials = Column(String(length=256), nullable=True)
api_endpoint = Column(String(length=256), nullable=True)
date_created = Column(ArrowType(), server_default=text('now()'), nullable=False)
status = Column(String(length=128), nullable=True)
options = Column(JSON)

8
lemur/dns_providers/service.py
View File

@ -7,4 +7,10 @@ def get_all_dns_providers(status="active"):
:return:
"""
return DnsProviders.query.all(status=status)
all_dns_providers = DnsProviders.query.all()
dns_provider_result = []
for provider in all_dns_providers:
print(provider)
if provider.status == status:
dns_provider_result.append(provider.__dict__)
return dns_provider_result

20
lemur/static/app/angular/certificates/certificate/options.tpl.html
View File

@ -234,14 +234,18 @@
</label>
</div>
</div>
<!-- <div class="form-group">
<label class="control-label col-sm-2">
DNS Provider (Only needed for LetsEncrypt or ACME implementations)
</label>
<div class="col-sm-10">
<select class="form-control" ng-model="certificate.extensions.crlDistributionPoints.includeCrlDp"
ng-options="item for item in ['yes', 'no', 'default']"></select>
</div> -->
<div class="col-sm-10">
<!-- two -->
<div class="form-group">
<label class="control-label col-sm-2">
DNS Provider
</label>
<div class="col-sm-10">
<select class="form-control" ng-model="selected" ng-options="item as item.name for item in dnsProviders"></select>
</div>
</div>
</div>
</div>
</div>
</div>

2
lemur/static/app/angular/destinations/destination/destination.js vendored
View File

@ -47,8 +47,8 @@ angular.module('lemur')
PluginService.getByType('destination').then(function (plugins) {
$scope.plugins = plugins;
_.each($scope.plugins, function (plugin) {
_.each($scope.plugins, function (plugin) {
if (plugin.slug === $scope.destination.plugin.slug) {
plugin.pluginOptions = $scope.destination.plugin.pluginOptions;
$scope.destination.plugin = plugin;