← Back to branch summary

~ubuntu-branches/debian/jessie/keystone/jessie

« back to all changes in this revision

Viewing changes to httpd/keystone.py

  • Committer: Package Import Robot
  • Author(s): Thomas Goirand
  • Date: 2013-07-25 23:24:18 UTC
  • mfrom: (32.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20130725232418-qc30tbfhaq03gky5
Tags: 2013.1.3-1
http://bugs.debian.org/717707
http://bugs.debian.org/720007
http://bugs.debian.org/720067
http://bugs.debian.org/720934
http://bugs.debian.org/721034
http://bugs.debian.org/721254
* New upstream point release.
* Added ja.po Debconf translation thanks to victory <victory.deb@gmail.com>,
  and several DDs (Closes: #717707).
* Several Debconf translations updates:
  - Danish, thanks to Joe Dalton (Closes: #720007).
  - Portuguese, thanks to the Traduz team (Closes: #720067).
  - Italian, thanks to Beatrice Torracca (Closes: #720934).
  - Czech, thanks to Michal Šimůnek (Closes: #721034).
  - Russian, thanks to Yuri Kozlov (Closes: #721254).
* Installs httpd/keystone.py in /usr/share/keystone/wsgi.py as requested
  by fc__.
* Removes CVE-2013-2157_Force_simple_Bind_for_authentication.patch now
  applied upstream.
* Refreshes patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
httpd/keystone.py
 
1
import os
 
2
 
 
3
from paste import deploy
 
4
 
 
5
from keystone import config
 
6
from keystone.common import logging
 
7
 
 
8
LOG = logging.getLogger(__name__)
 
9
CONF = config.CONF
 
10
config_files = ['/etc/keystone/keystone.conf']
 
11
CONF(project='keystone', default_config_files=config_files)
 
12
 
 
13
conf = CONF.config_file[0]
 
14
name = os.path.basename(__file__)
 
15
 
 
16
if CONF.debug:
 
17
    CONF.log_opt_values(logging.getLogger(CONF.prog), logging.DEBUG)
 
18
 
 
19
options = deploy.appconfig('config:%s' % CONF.config_file[0])
 
20
 
 
21
application = deploy.loadapp('config:%s' % conf, name=name)