Infrastructure/fedora-infrastructure
1
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-infrastructure

Browse source
This commit is contained in:
Toshio Kuratomi 2008-03-09 23:45:18 -07:00
commit 2c11358c35
3 changed files with 35 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

33
fas/fas.cfg
View file

@ -1,4 +1,37 @@
[global] [global]
# TODO: better namespacing (maybe fas.admingroup, etc.)
admingroup = 'accounts'
accounts_email = "nobody@fedoraproject.org"
#accounts_email = "accounts@fedoraproject.org"
legal_cla_email = "nobody@fedoraproject.org"
#legal_cla_email = "legal-cla-archive@fedoraproject.org"
email_host = "fedoraproject.org" # as in, web-members@email_host
gpgexec = "/usr/bin/gpg"
gpghome = "/srv/fedora-infrastructure/fas/gnupg"
gpg_fingerprint = "C199 1E25 D00A D200 2D2E 54D1 BF7F 1647 C54E 8410"
gpg_passphrase = "m00!s@ysth3c0w"
gpg_keyserver = "hkp://subkeys.pgp.net"
cla_sign_group = "cla_sign"
cla_click_group = "cla_click"
privileged_view_groups = "(^cla_.*)|(^fas-.*)"
username_blacklist = "(.*-members)|(.*-sponsors)|(.*-administrators)|(root)|(webmaster)"
openidstore = "/var/tmp/fas/openid"
openssl_digest = "md5"
openssl_expire = 31536000 # 60*60*24*365 = 1 year
openssl_ca_file = "/srv/fedora-infrastructure/fas/ssl/ca-Upload"
openssl_c = "US"
openssl_st = "North Carolina"
openssl_l = "Raleigh"
openssl_o = "Fedora Project"
openssl_ou = "Upload Files"
# This is where all of your settings go for your development environment # This is where all of your settings go for your development environment
# Settings that are the same for both development and production # Settings that are the same for both development and production
# (such as template engine, encodings, etc.) all go in # (such as template engine, encodings, etc.) all go in

34
fas/fas/config/app.cfg
View file

@ -9,8 +9,6 @@
# Database values # Database values
sqlalchemy.convert_unicode=True sqlalchemy.convert_unicode=True
admingroup = 'accounts'
# VIEW # VIEW
# which view (template engine) to use if one is not specified in the # which view (template engine) to use if one is not specified in the
@ -153,38 +151,6 @@ identity.saprovider.model.group="fas.model.Groups"
# identity.saprovider.encryption_algorithm=None # identity.saprovider.encryption_algorithm=None
# CHANGE ME:
accounts_email = "nobody@fedoraproject.org"
#accounts_email = "accounts@fedoraproject.org"
legal_cla_email = "nobody@fedoraproject.org"
#legal_cla_email = "legal-cla-archive@fedoraproject.org"
#email_host = "bastion.fedora.phx.redhat.com"
email_host = "localhost"
gpgexec = "/usr/bin/gpg"
gpghome = "/srv/fedora-infrastructure/fas/gnupg"
gpg_fingerprint = "C199 1E25 D00A D200 2D2E 54D1 BF7F 1647 C54E 8410"
gpg_passphrase = "m00!s@ysth3c0w"
gpg_keyserver = "hkp://subkeys.pgp.net"
cla_sign_group = "cla_sign"
cla_click_group = "cla_click"
privileged_view_groups = "(^cla_.*)|(^fas-.*)"
username_blacklist = "(.*-members)|(.*-sponsors)|(.*-administrators)|(root)|(webmaster)"
openidstore = "/var/tmp/fas/openid"
openssl_digest = "md5"
openssl_expire = 31536000 # 60*60*24*365 = 1 year
openssl_ca_file = "/srv/fedora-infrastructure/fas/ssl/ca-Upload"
openssl_c = "US"
openssl_st = "North Carolina"
openssl_l = "Raleigh"
openssl_o = "Fedora Project"
openssl_ou = "Upload Files"
# compress the data sends to the web browser # compress the data sends to the web browser
# [/] # [/]
# gzip_filter.on = TrueNote: in the SVG XML, change the 'interviewee-name' text to be the name of whichever in # gzip_filter.on = TrueNote: in the SVG XML, change the 'interviewee-name' text to be the name of whichever in

9
fas/fas/controllers.py
View file

@ -29,15 +29,10 @@ turbogears.view.variable_providers.append(add_custom_stdvars)
def get_locale(locale=None): def get_locale(locale=None):
if locale: if locale:
return locale return locale
username = None
try: try:
username = turbogears.identity.current.user_name user = turbogears.identity.current.user
return turbogears.identity.user.locale or 'C'
except AttributeError: except AttributeError:
pass
if username:
person = People.by_username(turbogears.identity.current.user_name)
return person.locale or 'C'
else:
return turbogears.i18n.utils._get_locale() return turbogears.i18n.utils._get_locale()
config.update({'i18n.get_locale': get_locale}) config.update({'i18n.get_locale': get_locale})