cleaning up references to netflix
This commit is contained in:
parent
540d56f0b8
commit
9da713ab06
|
@ -569,11 +569,11 @@ class ProvisionELB(Command):
|
||||||
'authority': authority,
|
'authority': authority,
|
||||||
'owner': owner,
|
'owner': owner,
|
||||||
# defaults:
|
# defaults:
|
||||||
'organization': u'Netflix, Inc.',
|
'organization': current_app.config.get('LEMUR_DEFAULT_ORGANIZATION'),
|
||||||
'organizationalUnit': u'Operations',
|
'organizationalUnit': current_app.config.get('LEMUR_DEFAULT_ORGANIZATIONAL_UNIT'),
|
||||||
'country': u'US',
|
'country': current_app.config.get('LEMUR_DEFAULT_COUNTRY'),
|
||||||
'state': u'California',
|
'state': current_app.config.get('LEMUR_DEFAULT_STATE'),
|
||||||
'location': u'Los Gatos'
|
'location': current_app.config.get('LEMUR_DEFAULT_LOCATION')
|
||||||
}
|
}
|
||||||
|
|
||||||
return options
|
return options
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
<hr />
|
<hr />
|
||||||
</div>
|
</div>
|
||||||
<p>
|
<p>
|
||||||
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.
|
you should create new certificates to replace the certificates that are expiring.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
Owner
|
Owner
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<input type="email" name="owner" ng-model="authority.owner" placeholder="owner@netflix.com"
|
<input type="email" name="owner" ng-model="authority.owner" placeholder="owner@example.com"
|
||||||
class="form-control" required/>
|
class="form-control" required/>
|
||||||
|
|
||||||
<p ng-show="editForm.owner.$invalid && !editForm.owner.$pristine" class="help-block">Enter a valid
|
<p ng-show="editForm.owner.$invalid && !editForm.owner.$pristine" class="help-block">Enter a valid
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
Owner
|
Owner
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<input type="email" name="ownerEmail" ng-model="authority.ownerEmail" placeholder="TeamDL@netflix.com" tooltip="This is the authorities team distribution list or the main point of contact for this authority" class="form-control" required/>
|
<input type="email" name="ownerEmail" ng-model="authority.ownerEmail" placeholder="TeamDL@example.com" tooltip="This is the authorities team distribution list or the main point of contact for this authority" class="form-control" required/>
|
||||||
<p ng-show="trackingForm.ownerEmail.$invalid && !trackingForm.ownerEmail.$pristine" class="help-block">You must enter an Certificate Authority owner</p>
|
<p ng-show="trackingForm.ownerEmail.$invalid && !trackingForm.ownerEmail.$pristine" class="help-block">You must enter an Certificate Authority owner</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<input type="email" name="owner" ng-model="certificate.owner" placeholder="owner@netflix.com"
|
<input type="email" name="owner" ng-model="certificate.owner" placeholder="owner@example.com"
|
||||||
class="form-control" required/>
|
class="form-control" required/>
|
||||||
|
|
||||||
<p ng-show="uploadForm.owner.$invalid && !uploadForm.owner.$pristine" class="help-block">Enter a valid
|
<p ng-show="uploadForm.owner.$invalid && !uploadForm.owner.$pristine" class="help-block">Enter a valid
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
Custom Name <span class="glyphicon glyphicon-question-sign"></span>
|
Custom Name <span class="glyphicon glyphicon-question-sign"></span>
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<input name="name" ng-model="certificate.name" placeholder="example.netflix.net-SymantecCorporation-20150828-20160830" class="form-control"/>
|
<input name="name" ng-model="certificate.name" placeholder="the.example.net-SymantecCorporation-20150828-20160830" class="form-control"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group"
|
<div class="form-group"
|
||||||
|
|
|
@ -8,12 +8,5 @@
|
||||||
<div class="row featurette">
|
<div class="row featurette">
|
||||||
<div class="col-md-10">
|
<div class="col-md-10">
|
||||||
<h2 class="featurette-heading">SSL In The Cloud <span class="text-muted">Encrypt it all </span></h2>
|
<h2 class="featurette-heading">SSL In The Cloud <span class="text-muted">Encrypt it all </span></h2>
|
||||||
|
|
||||||
<p class="lead">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.</p>
|
|
||||||
|
|
||||||
<p>See <a href="http://go/ssl">go/ssl</a> for more info.</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
"""
|
"""
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from flask import app, Blueprint, jsonify
|
from flask import app, current_app, Blueprint, jsonify
|
||||||
from flask.ext.restful import Api
|
from flask.ext.restful import Api
|
||||||
|
|
||||||
from lemur.auth.service import AuthenticatedResource
|
from lemur.auth.service import AuthenticatedResource
|
||||||
|
@ -25,7 +25,9 @@ class Status(AuthenticatedResource):
|
||||||
return jsonify({
|
return jsonify({
|
||||||
'environment': app.config.get('ENVIRONMENT'),
|
'environment': app.config.get('ENVIRONMENT'),
|
||||||
'status': 'degraded',
|
'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:
|
else:
|
||||||
return jsonify({
|
return jsonify({
|
||||||
'environment': app.config.get('ENVIRONMENT'),
|
'environment': app.config.get('ENVIRONMENT'),
|
||||||
|
|
Loading…
Reference in New Issue