From 9da713ab063000f97f6d8dab7ea23ca51b971fd1 Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Fri, 4 Sep 2015 15:29:57 -0700
Subject: [PATCH] cleaning up references to netflix

---
 lemur/manage.py                                        | 10 +++++-----
 lemur/plugins/lemur_email/templates/expiration.html    |  2 +-
 .../app/angular/authorities/authority/edit.tpl.html    |  2 +-
 .../angular/authorities/authority/tracking.tpl.html    |  2 +-
 .../angular/certificates/certificate/upload.tpl.html   |  4 ++--
 lemur/static/app/angular/welcome/welcome.html          |  7 -------
 lemur/status/views.py                                  |  6 ++++--
 7 files changed, 14 insertions(+), 19 deletions(-)

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 @@
                             <hr />
                        </div>
                         <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.
                         </p>
                         <p>
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
                 </label>
                 <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/>
 
                     <p ng-show="editForm.owner.$invalid && !editForm.owner.$pristine" class="help-block">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
       </label>
       <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>
       </div>
     </div>
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 @@
                 </label>
 
                 <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/>
 
                     <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>
                 </label>
                 <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 class="form-group"
diff --git a/lemur/static/app/angular/welcome/welcome.html b/lemur/static/app/angular/welcome/welcome.html
index a3c44176..f80e8645 100644
--- a/lemur/static/app/angular/welcome/welcome.html
+++ b/lemur/static/app/angular/welcome/welcome.html
@@ -8,12 +8,5 @@
 <div class="row featurette">
   <div class="col-md-10">
     <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>
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'),