Skip to content

Simplify host setup #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vnkmpf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Simplify host setup #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba261ff
fix typo
vnkmpf Jan 9, 2018
9638e2d
Extract hosts from serviceDomain
vnkmpf Jan 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions app/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@

app = Flask(__name__)


@app.route("/.well-known/acme-challenge/<path>")
def acme_challenge(path):
return send_from_directory(CERTBOT_WEBROOT_PATH,
".well-known/acme-challenge/{}".format(path))


@app.route("/v<int:version>/docker-flow-proxy-letsencrypt/reconfigure")
def reconfigure(version):

Expand All @@ -64,11 +66,33 @@ def reconfigure(version):

logger.info('request for service: {}'.format(args.get('serviceName')))

# Check if the newly registered service is usign letsencrypt companion.
# Check if the newly registered service is using letsencrypt companion.
# Labels required:
# * com.df.letsencrypt.host
# * com.df.letsencrypt.email
required_labels = ('letsencrypt.host', 'letsencrypt.email')

# explicitly make it a tuple
required_labels = ('letsencrypt.email', )

# v1: com.df.serviceDomain=example.com
# v2: com.df.serviceDomain=example.com,foo.bar
# v3: com.df.serviceDomain.1=example.com com.df.serviceDomain.2=foo.bar
# v4.1: 2+ domains are specified in serviceDomain and only one is in letsencrypt.host ?
# v4.2 ... the the other way around
# => we don't need to solve it - it's user's problem and / or user only wants 1 url behind HTTPS, the other not
le_hosts = []
extract_hosts_from_service_domain = False

if 'letsencrypt.host' in args:
le_hosts = args['letsencrypt.host'].split(',')
else:
extract_hosts_from_service_domain = True

if extract_hosts_from_service_domain:

for key, value in args.iteritems():
if 0 == key.find('serviceDomain'):
le_hosts += value.split(',')

if all([label in args.keys() for label in required_labels]):
logger.info('letsencrypt support enabled.')

Expand All @@ -78,7 +102,7 @@ def reconfigure(version):
if isinstance(testing, basestring):
testing = True if testing.lower() == 'true' else False

client.process(args['letsencrypt.host'].split(','), args['letsencrypt.email'], testing=testing)
client.process(le_hosts, args['letsencrypt.email'], testing=testing)

# proxy requests to docker-flow-proxy
# sometimes we can get an error back from DFP, this can happen when DFP is not fully loaded.
Expand All @@ -100,5 +124,6 @@ def reconfigure(version):

return "OK"


if __name__ == "__main__":
app.run(host='0.0.0.0', port=8080, debug=True, threaded=True)