more stuff

lemur/dns_providers/models.py

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

lemur/dns_providers/service.py

@@ -7,10 +7,4 @@ def get_all_dns_providers(status="active"):
 
     :return:
     """
-    all_dns_providers = DnsProviders.query.all()
+    return DnsProviders.query.all(status=status)
-    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

lemur/models.py

@@ -132,16 +132,3 @@ pending_cert_role_associations = db.Table('pending_cert_role_associations',
                                          )
 
 Index('pending_cert_role_associations_ix', pending_cert_role_associations.c.pending_cert_id, pending_cert_role_associations.c.role_id)
-
-dns_providers = 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'))

lemur/static/app/angular/certificates/certificate/options.tpl.html

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