Minor fixes
This commit is contained in:
parent
e2962a4b8d
commit
ef72de89b3
|
@ -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
|
||||
=================
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -125,7 +125,7 @@ class Ping(Resource):
|
|||
|
||||
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 @@ class Ping(Resource):
|
|||
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 @@ class Ping(Resource):
|
|||
profile['email'],
|
||||
profile['email'],
|
||||
True,
|
||||
profile.get('thumbnailPhotoUrl'), # Encase profile isn't google+ enabled
|
||||
profile.get('thumbnailPhotoUrl'), # incase profile isn't google+ enabled
|
||||
roles
|
||||
)
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
Owner
|
||||
</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="editForm.owner.$invalid && !editForm.owner.$pristine" class="help-block">Enter a valid
|
||||
|
|
|
@ -10,3 +10,6 @@ exclude = .tox,.git,*/migrations/*,lemur/static/*,docs/*
|
|||
|
||||
[wheel]
|
||||
universal = 1
|
||||
|
||||
[metadata]
|
||||
description-file = README.rst
|
||||
|
|
18
setup.py
18
setup.py
|
@ -9,7 +9,9 @@ Is an SSL management and orchestration tool.
|
|||
"""
|
||||
from __future__ import absolute_import
|
||||
|
||||
import json
|
||||
import os.path
|
||||
import datetime
|
||||
|
||||
from distutils import log
|
||||
from distutils.core import Command
|
||||
|
@ -87,9 +89,18 @@ class DevelopWithBuildStatic(develop):
|
|||
|
||||
|
||||
class SdistWithBuildStatic(sdist):
|
||||
def make_distribution(self):
|
||||
def make_release_tree(self, *a, **kw):
|
||||
dist_path = self.distribution.get_fullname()
|
||||
|
||||
sdist.make_release_tree(self, *a, **kw)
|
||||
|
||||
self.reinitialize_command('build_static', work_path=dist_path)
|
||||
self.run_command('build_static')
|
||||
return sdist.make_distribution(self)
|
||||
|
||||
with open(os.path.join(dist_path, 'lemur-package.json'), 'w') as fp:
|
||||
json.dump({
|
||||
'createdAt': datetime.datetime.utcnow().isoformat() + 'Z',
|
||||
}, fp)
|
||||
|
||||
|
||||
class BuildStatic(Command):
|
||||
|
@ -114,6 +125,9 @@ setup(
|
|||
version='0.1.3',
|
||||
author='Kevin Glisson',
|
||||
author_email='kglisson@netflix.com',
|
||||
url='https://github.com/netflix/lemur',
|
||||
download_url='https://github.com/Netflix/lemur/archive/0.1.3.tar.gz',
|
||||
description='Certificate management and orchestration service',
|
||||
long_description=open(os.path.join(ROOT, 'README.rst')).read(),
|
||||
packages=find_packages(),
|
||||
include_package_data=True,
|
||||
|
|
Loading…
Reference in New Issue