diff --git a/SQL/site_data.sql b/SQL/site_data.sql index da1de3a..d30138d 100644 --- a/SQL/site_data.sql +++ b/SQL/site_data.sql @@ -693,6 +693,9 @@ INSERT INTO custom_templates(custom_id,provision_name) VALUES('icare_template', INSERT INTO custom_templates(custom_id,provision_name) VALUES('kevkem_template','registry.chiefsoft.com/custom/mermskevkem-mermshostedicare-001:latest'); + +INSERT INTO custom_templates(custom_id,provision_name) VALUES('sanya_pers_template','registry.chiefsoft.com/custom/mermssanyaameye-mermshosted-pers-sanyamaeye-001:latest'); + icare_template registry.chiefsoft.com/custom/mermsicare-mermshostedicare-001:latest diff --git a/app/api/services/subscriptions.py b/app/api/services/subscriptions.py index 47e64d0..5a6b431 100644 --- a/app/api/services/subscriptions.py +++ b/app/api/services/subscriptions.py @@ -47,6 +47,8 @@ class SubscriptionsService(BaseService): 'internal_url': subs.internal_url, 'external_url': subs.external_url, 'dns_group': subs.dns_group, + 'primary_server': subs.primary_server, + 'provision_port': subs.provision_port, 'status': subs.status, 'updated': subs.updated, "added": subs.added, diff --git a/app/models/members_products.py b/app/models/members_products.py index 7d8a871..5ab0f0c 100644 --- a/app/models/members_products.py +++ b/app/models/members_products.py @@ -31,7 +31,11 @@ class MembersProducts(db.Model): added = db.Column(db.DateTime(timezone=True), server_default=func.now()) updated = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now()) product_template= db.Column(db.String(100), nullable=True) - custom_template = db.Column(db.String(100), nullable=True) + product_template = db.Column(db.String(100), nullable=True) + primary_server = db.Column(db.String(100), nullable=True) + provision_port = db.Column(db.Integer, nullable=True, default=0) + + # name = db.Column(db.String(100), nullable=False) # description = db.Column(db.String(250), nullable=False) @@ -155,6 +159,8 @@ class MembersProducts(db.Model): 'dns_group': self.dns_group, 'status': self.status, 'added': self.added, + 'primary_server': self.primary_server, + 'provision_port': self.provision_port, 'product_template': self.product_template, 'custom_template': self.custom_template, 'updated': self.updated