From ef72de89b3e38d1b911f0fa05476daf3a21bf378 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Fri, 18 Sep 2015 15:50:59 -0700 Subject: [PATCH] Minor fixes --- README.rst | 3 +-- docs/conf.py | 2 +- lemur/auth/views.py | 6 +++--- .../certificates/certificate/edit.tpl.html | 2 +- setup.cfg | 3 +++ setup.py | 18 ++++++++++++++++-- 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index 1776e03fd0..8e64dae765 100644 --- a/README.rst +++ b/README.rst @@ -19,8 +19,7 @@ Lemur Lemur manages SSL certificate creation. It provides a central portal for developers to issuer their own SSL certificates with 'sane' defaults. -It works on CPython 2.7, 3.3, 3.4 It is known -to work on Ubuntu Linux and OS X. +It works on CPython 2.7, 3.3, 3.4. We deploy on Ubuntu and develop on OS X. Project resources ================= diff --git a/docs/conf.py b/docs/conf.py index e27ea0781c..e45a789c14 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# security_monkey documentation build configuration file, created by +# lemur documentation build configuration file, created by # sphinx-quickstart on Sat Jun 7 18:43:48 2014. # # This file is execfile()d with the current directory set to its diff --git a/lemur/auth/views.py b/lemur/auth/views.py index 0c55f627a6..c579967315 100644 --- a/lemur/auth/views.py +++ b/lemur/auth/views.py @@ -125,7 +125,7 @@ def post(self): args = self.reqparse.parse_args() - # take the information we have received from Meechum to create a new request + # take the information we have received from the provider to create a new request params = { 'client_id': args['clientId'], 'grant_type': 'authorization_code', @@ -138,7 +138,7 @@ def post(self): access_token_url = current_app.config.get('PING_ACCESS_TOKEN_URL') user_api_url = current_app.config.get('PING_USER_API_URL') - # the secret and cliendId will be given to you when you signup for meechum + # the secret and cliendId will be given to you when you signup for the provider basic = base64.b64encode('{0}:{1}'.format(args['clientId'], current_app.config.get("PING_SECRET"))) headers = {'Authorization': 'Basic {0}'.format(basic)} @@ -220,7 +220,7 @@ def post(self): profile['email'], profile['email'], True, - profile.get('thumbnailPhotoUrl'), # Encase profile isn't google+ enabled + profile.get('thumbnailPhotoUrl'), # incase profile isn't google+ enabled roles ) diff --git a/lemur/static/app/angular/certificates/certificate/edit.tpl.html b/lemur/static/app/angular/certificates/certificate/edit.tpl.html index a3cf3888f5..aff493e31c 100644 --- a/lemur/static/app/angular/certificates/certificate/edit.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/edit.tpl.html @@ -10,7 +10,7 @@