pinecrypt/pinecrypt-gateway-backend
2
1
Fork 0
Code Issues 10 Pull Requests Projects Activity

Add ADVERTISE_ADDRESS env variable

Browse Source
This commit is contained in:
Lauri Võsandi 2021-06-01 12:38:25 +03:00
parent f880fbcef8
commit 3f6604921d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pinecrypt/server/cli.py
View File

@ -350,13 +350,8 @@ def pinecone_provision():
from pinecrypt.server import authority from pinecrypt.server import authority
authority.self_enroll(skip_notify=True) authority.self_enroll(skip_notify=True)
myips = set()
for fam, _, _, _, addrs in socket.getaddrinfo(const.FQDN, None):
if fam in(2, 10):
myips.add(addrs[0])
# Insert/update DNS records for the replica itself # Insert/update DNS records for the replica itself
click.echo("Updating self DNS records: %s -> %s" % (const.FQDN, repr(myips))) click.echo("Advertising via DNS: %s -> %s" % (const.FQDN, repr(const.ADVERTISE_ADDRESS)))
db.certificates.update_one({ db.certificates.update_one({
"common_name": const.FQDN, "common_name": const.FQDN,
"status": "signed", "status": "signed",
@ -366,7 +361,7 @@ def pinecone_provision():
"fqdn": const.FQDN, "fqdn": const.FQDN,
"san": const.AUTHORITY_NAMESPACE, "san": const.AUTHORITY_NAMESPACE,
}, },
"ip": list(myips), "ip": list(const.ADVERTISE_ADDRESS),
} }
}) })

8
pinecrypt/server/const.py
View File

@ -78,6 +78,14 @@ AUTHORITY_COMMON_NAME = "Pinecrypt Gateway at %s" % AUTHORITY_NAMESPACE
AUTHORITY_ORGANIZATION = os.getenv("AUTHORITY_ORGANIZATION") AUTHORITY_ORGANIZATION = os.getenv("AUTHORITY_ORGANIZATION")
AUTHORITY_LIFETIME_DAYS = 20*365 AUTHORITY_LIFETIME_DAYS = 20*365
# Advertise following IP addresses via DNS record
ADVERTISE_ADDRESS = os.getenv("ADVERTISE_ADDRESS", "").split(",")
if not ADVERTISE_ADDRESS:
ADVERTISE_ADDRESS = set()
for fam, _, _, _, addrs in socket.getaddrinfo(const.FQDN, None):
if fam in(2, 10):
ADVERTISE_ADDRESS.add(addrs[0])
# Mailer settings # Mailer settings
SMTP_HOST = os.getenv("SMTP_HOST", "localhost") SMTP_HOST = os.getenv("SMTP_HOST", "localhost")
SMTP_PORT = os.getenv("SMTP_PORT", 25) SMTP_PORT = os.getenv("SMTP_PORT", 25)