diff --git a/lemur/manage.py b/lemur/manage.py index 42137576..5f9418ad 100755 --- a/lemur/manage.py +++ b/lemur/manage.py @@ -569,11 +569,11 @@ class ProvisionELB(Command): 'authority': authority, 'owner': owner, # defaults: - 'organization': u'Netflix, Inc.', - 'organizationalUnit': u'Operations', - 'country': u'US', - 'state': u'California', - 'location': u'Los Gatos' + 'organization': current_app.config.get('LEMUR_DEFAULT_ORGANIZATION'), + 'organizationalUnit': current_app.config.get('LEMUR_DEFAULT_ORGANIZATIONAL_UNIT'), + 'country': current_app.config.get('LEMUR_DEFAULT_COUNTRY'), + 'state': current_app.config.get('LEMUR_DEFAULT_STATE'), + 'location': current_app.config.get('LEMUR_DEFAULT_LOCATION') } return options diff --git a/lemur/plugins/lemur_email/templates/expiration.html b/lemur/plugins/lemur_email/templates/expiration.html index f3584bd2..32d6883a 100644 --- a/lemur/plugins/lemur_email/templates/expiration.html +++ b/lemur/plugins/lemur_email/templates/expiration.html @@ -53,7 +53,7 @@

- Lemur, Netflix's SSL management portal has noticed that the following certificates are expiring soon, if you rely on these certificates + Lemur, has noticed that the following certificates are expiring soon, if you rely on these certificates you should create new certificates to replace the certificates that are expiring.

diff --git a/lemur/static/app/angular/authorities/authority/edit.tpl.html b/lemur/static/app/angular/authorities/authority/edit.tpl.html index fe3d3eac..a11e9177 100644 --- a/lemur/static/app/angular/authorities/authority/edit.tpl.html +++ b/lemur/static/app/angular/authorities/authority/edit.tpl.html @@ -10,7 +10,7 @@ Owner

-

Enter a valid diff --git a/lemur/static/app/angular/authorities/authority/tracking.tpl.html b/lemur/static/app/angular/authorities/authority/tracking.tpl.html index a2d0def6..b019bcf9 100644 --- a/lemur/static/app/angular/authorities/authority/tracking.tpl.html +++ b/lemur/static/app/angular/authorities/authority/tracking.tpl.html @@ -16,7 +16,7 @@ Owner

- +

You must enter an Certificate Authority owner

diff --git a/lemur/static/app/angular/certificates/certificate/upload.tpl.html b/lemur/static/app/angular/certificates/certificate/upload.tpl.html index 55dc850f..f97d8d67 100644 --- a/lemur/static/app/angular/certificates/certificate/upload.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/upload.tpl.html @@ -11,7 +11,7 @@
-

Enter a valid @@ -24,7 +24,7 @@ Custom Name

- +

SSL In The Cloud Encrypt it all

- -

The Security Operations team manages all of the SSL certificate generation at Netflix. This - portal was created to serve as both a self service application so that application owners can provision - their own certificates and to help enforce some key naming and security conventions, in order provide - Netflix with scalable and manageable SSL security.

- -

See go/ssl for more info.

diff --git a/lemur/status/views.py b/lemur/status/views.py index 65d3af7a..fddfdb69 100644 --- a/lemur/status/views.py +++ b/lemur/status/views.py @@ -5,7 +5,7 @@ """ import os -from flask import app, Blueprint, jsonify +from flask import app, current_app, Blueprint, jsonify from flask.ext.restful import Api from lemur.auth.service import AuthenticatedResource @@ -25,7 +25,9 @@ class Status(AuthenticatedResource): return jsonify({ 'environment': app.config.get('ENVIRONMENT'), 'status': 'degraded', - 'message': "This Lemur instance is in a degraded state and is unable to issue certificates, please alert secops@netflix.com"}) + 'message': "This Lemur instance is in a degraded state and is unable to issue certificates, please alert {0}".format( + current_app.config.get('LEMUR_SECURITY_TEAM_EMAIL') + )}) else: return jsonify({ 'environment': app.config.get('ENVIRONMENT'),