diff --git a/fas/COPYING b/fas/COPYING new file mode 100644 index 0000000..623b625 --- /dev/null +++ b/fas/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/fas/MANIFEST.in b/fas/MANIFEST.in index acf614e..e8c967c 100644 --- a/fas/MANIFEST.in +++ b/fas/MANIFEST.in @@ -1,3 +1,23 @@ include fas2.sql -include README COPYING -include *.cfg +include README COPYING TODO +include *.cfg *.conf +include convert.py start-fas +include client/*.conf +include fas/config/* +include fas/static/* +include fas/static/css/* +include fas/static/images/* +include fas/static/images/balloons/* +include fas/static/js/* +include fas/templates/cla/*.html +include fas/templates/cla/*.txt +include fas/templates/group/*.html +include fas/templates/group/*.txt +include fas/templates/openid/*.html +include fas/templates/openid/*.txt +include fas/templates/user/email/*.html +include fas/templates/user/email/*.txt +include fas/templates/user/*.html +include fas/templates/user/*.txt +include fas/templates/*.html +include fas/templates/*.txt diff --git a/fas/client/fasClient.py b/fas/client/fasClient similarity index 100% rename from fas/client/fasClient.py rename to fas/client/fasClient diff --git a/fas/dev.cfg b/fas/fas.cfg similarity index 68% rename from fas/dev.cfg rename to fas/fas.cfg index 219aa9e..7328608 100644 --- a/fas/dev.cfg +++ b/fas/fas.cfg @@ -1,4 +1,37 @@ [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 # Settings that are the same for both development and production # (such as template engine, encodings, etc.) all go in @@ -20,7 +53,7 @@ mail.encoding = 'utf-8' # If you have sqlite, here's a simple default to get you started # in development sqlalchemy.dburi="postgres://fedora:bunbunbun@localhost/fas2" - +sqlalchemy.echo=True # if you are using a database or table type without transactions # (MySQL default, for example), you should turn off transactions @@ -50,7 +83,7 @@ tg.strict_parameters = True server.webpath='/accounts' base_url_filter.on = True base_url_filter.use_x_forwarded_host = True -base_url_filter.base_url = "http://localhost/accounts" +base_url_filter.base_url = "http://localhost:8088/accounts" # Make the session cookie only return to the host over an SSL link # Disabled for testing. diff --git a/fas/fas/config/app.cfg b/fas/fas/config/app.cfg index 0e7f69d..0f2e71a 100644 --- a/fas/fas/config/app.cfg +++ b/fas/fas/config/app.cfg @@ -9,8 +9,6 @@ # Database values sqlalchemy.convert_unicode=True -admingroup = 'accounts' - # VIEW # 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 -# 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 # [/] # gzip_filter.on = TrueNote: in the SVG XML, change the 'interviewee-name' text to be the name of whichever in diff --git a/fas/fas/config/app.cfg.in b/fas/fas/config/app.cfg.in new file mode 100644 index 0000000..4813a03 --- /dev/null +++ b/fas/fas/config/app.cfg.in @@ -0,0 +1,168 @@ +[global] +# The settings in this file should not vary depending on the deployment +# environment. dev.cfg and prod.cfg are the locations for +# the different deployment settings. Settings in this file will +# be overridden by settings in those other files. + +# The commented out values below are the defaults + +# Database values +sqlalchemy.convert_unicode=True + +# VIEW + +# which view (template engine) to use if one is not specified in the +# template name +# tg.defaultview = "kid" +tg.defaultview = "genshi" + +# The following kid settings determine the settings used by the kid serializer. + +# One of (html|html-strict|xhtml|xhtml-strict|xml|json) +# kid.outputformat="html" +genshi.outputformat = "xhtml" + +# When @#%*( TG supports this.... +#genshi.outputformat = "html" +#genshi.default_doctype = "html-strict" + +# kid.encoding="utf-8" +genshi.encoding="utf-8" + +# The sitetemplate is used for overall styling of a site that +# includes multiple TurboGears applications +# tg.sitetemplate="" + +# Allow every exposed function to be called as json, +# tg.allow_json = False + +# Suppress the inclusion of the shipped MochiKit version, which is rather outdated. +# Attention: setting this to True and listing 'turbogears.mochikit' in 'tg.include_widgets' +# is a contradiction. This option will overrule the default-inclusion to prevent version +# mismatch bugs. +# tg.mochikit_suppress = True + +# List of Widgets to include on every page. +# for example ['turbogears.mochikit'] +# tg.include_widgets = [] + +# Set to True if the scheduler should be started +# tg.scheduler = False + +# Set to True to allow paginate decorator redirects when page number gets +# out of bound. Useful for getting the real page id in the url +# paginate.redirect_on_out_of_range = True + +# Set to True to allow paginate decorator redirects when last page is requested. +# This is useful for getting the real last page id in the url +# paginate.redirect_on_last_page = True + +# i18n +session_filter.on = True +i18n.run_template_filter = True +i18n.domain = 'fas' +i18n.locale_dir = 'po' + +# VISIT TRACKING +# Each visit to your application will be assigned a unique visit ID tracked via +# a cookie sent to the visitor's browser. +# -------------- + +# Enable Visit tracking +visit.on=True + +# Number of minutes a visit may be idle before it expires. +visit.timeout=20 + +# The name of the cookie to transmit to the visitor's browser. +# visit.cookie.name="tg-visit" + +# Domain name to specify when setting the cookie (must begin with . according to +# RFC 2109). The default (None) should work for most cases and will default to +# the machine to which the request was made. NOTE: localhost is NEVER a valid +# value and will NOT WORK. +# visit.cookie.domain=None + +# Specific path for the cookie +# visit.cookie.path="/" + +# The name of the VisitManager plugin to use for visitor tracking. +visit.manager="sqlalchemy" +#visit.manager="sqlobject" + +# Database class to use for visit tracking +visit.saprovider.model = "fas.model.Visit" +identity.saprovider.model.visit = "fas.model.VisitIdentity" +#visit.saprovider.model = "fedora.accounts.tgfas.visit_identity_table" +#visit.soprovider.model = "fas.model.Visit" + +#identity.saprovider.model.visit="fedora.accounts.tgfas.VisitIdentity" +#identity.saprovider.model= +#sqlalchemy.dburi='sqlite://' + +# IDENTITY +# General configuration of the TurboGears Identity management module +# -------- + +# Switch to turn on or off the Identity management module +identity.on=True + +# [REQUIRED] URL to which CherryPy will internally redirect when an access +# control check fails. If Identity management is turned on, a value for this +# option must be specified. +identity.failure_url="/login" + +identity.provider='safas3' +# identity.provider='sqlobject' + +# The names of the fields on the login form containing the visitor's user ID +# and password. In addition, the submit button is specified simply so its +# existence may be stripped out prior to passing the form data to the target +# controller. +# identity.form.user_name="user_name" +# identity.form.password="password" +# identity.form.submit="login" + +# What sources should the identity provider consider when determining the +# identity associated with a request? Comma separated list of identity sources. +# Valid sources: form, visit, http_auth +# identity.source="form,http_auth,visit" + +# SqlAlchemyIdentityProvider +# Configuration options for the default IdentityProvider +# ------------------------- + +# The classes you wish to use for your Identity model. Remember to not use reserved +# SQL keywords for class names (at least unless you specify a different table +# name using sqlmeta). +identity.saprovider.model.user="fas.model.People" +identity.saprovider.model.group="fas.model.Groups" +#identity.saprovider.model.permission="fas.model.Visit" + +# The password encryption algorithm used when comparing passwords against what's +# stored in the database. Valid values are 'md5' or 'sha1'. If you do not +# specify an encryption algorithm, passwords are expected to be clear text. +# The SqlAlchemyProvider *will* encrypt passwords supplied as part of your login +# form. If you set the password through the password property, like: +# my_user.password = 'secret' +# the password will be encrypted in the database, provided identity is up and +# running, or you have loaded the configuration specifying what encryption to +# use (in situations where identity may not yet be running, like tests). + +# identity.saprovider.encryption_algorithm=None + +# 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.mime_types = ["application/x-javascript", "text/javascript", "text/html", "text/css", "text/plain"] +[/robots.txt] +static_filter.on = True +static_filter.dir = "@DATADIR@/static/robots.txt" + +[/static] +static_filter.on = True +static_filter.dir = "@DATADIR@/static" + +[/favicon.ico] +static_filter.on = True +static_filter.file = "@DATADIR@/static/images/favicon.ico" diff --git a/fas/fas/controllers.py b/fas/fas/controllers.py index 7902051..54aa55d 100644 --- a/fas/fas/controllers.py +++ b/fas/fas/controllers.py @@ -29,15 +29,10 @@ turbogears.view.variable_providers.append(add_custom_stdvars) def get_locale(locale=None): if locale: return locale - username = None try: - username = turbogears.identity.current.user_name + user = turbogears.identity.current.user + return turbogears.identity.user.locale or 'C' 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() config.update({'i18n.get_locale': get_locale}) diff --git a/fas/fas/t.py b/fas/fas/t.py deleted file mode 100644 index 81824c3..0000000 --- a/fas/fas/t.py +++ /dev/null @@ -1,21 +0,0 @@ -class test: - __var = 'Uninitalized' - - def __getattr__(self, attr): - return self.__getattr__(attr) - - def __setattr__(self, attr, value): - self.__dict__[attr] = value - - @classmethod - def start(cls): - self = cls() - return self - -p = test.start() -p.var='first' -t = test.start() -t.var='second' - -print p.var -print t.var diff --git a/fas/fas/templates/group/view.html b/fas/fas/templates/group/view.html index 416139d..8b52457 100644 --- a/fas/fas/templates/group/view.html +++ b/fas/fas/templates/group/view.html @@ -4,7 +4,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> - ${_('Edit Group')} + ${_('View Group')}

${group.display_name} (${group.name})

@@ -29,7 +31,7 @@ ${_('Remove me')} -

Group Details ${_('(edit)')}

+

Group Details ${_('(edit)')}

${_('Name:')}
${group.name} 
@@ -49,14 +51,16 @@
${group.prerequisite.name} 
 
${_('Created:')}
${group.creation} 
-
${_('Add User:')}
-
+ +
${_('Add User:')}
+
+
- +
    -
  • - ${_('Sponsor')} - - ${_('Approve')} - +
  • + + ${_('Sponsor')} + + + + ${_('Approve')} + +
  • ${_('Remove')} diff --git a/fas/fas/user.py b/fas/fas/user.py index 089f12f..08b0ffc 100644 --- a/fas/fas/user.py +++ b/fas/fas/user.py @@ -250,6 +250,9 @@ class User(controllers.Controller): return dict() try: target.human_name = human_name + # FIXME: WARNING! This is deceptive. Remember that it + # changes the email object itself, not the email attached + # to the purpose. target.emails['primary'] = email # target.emails['bugzilla'] = bugzilla target.ircnick = ircnick diff --git a/fas/fas2.sql b/fas/fas2.sql index 9236aac..d92f887 100644 --- a/fas/fas2.sql +++ b/fas/fas2.sql @@ -282,65 +282,65 @@ create table visit_identity ( -- -- When a person's fedorabugs role is updated, add them to bugzilla queue. -- -create or replace function bugzilla_sync() returns trigger as $bz_sync$ - # Decide which row we are operating on and the action to take - if TD['event'] == 'DELETE': - # 'r' for removing an entry from bugzilla - newaction = 'r' - row = TD['old'] - else: - # insert or update - row = TD['new'] - if row['role_status'] == 'approved': - # approved so add an entry to bugzilla - newaction = 'a' - else: - # no longer approved so remove the entry from bugzilla - newaction = 'r' - - # Get the group id for fedorabugs - result = plpy.execute("select id from groups where name = 'fedorabugs'", 1) - if not result: - # Danger Will Robinson! A basic FAS group does not exist! - plpy.error('Basic FAS group fedorabugs does not exist') - # If this is not a fedorabugs role, no change needed - if row['group_id'] != result[0]['id']: - return None - - # Retrieve the bugzilla email address - plan = plpy.prepare("select email, purpose from person_emails as pee," - " email_purposes as epu" - " where epu.id = epu.email_id and pee.person_id = $1" - " and purpose in ('bugzilla', 'primary')", - ('text',)) - result = plpy.execute(plan, row['person_id']) - email = None - for record in result: - email = record['email'] - if record['purpose'] == 'bugzilla': - break - if not email: - raise plpy.error('Cannot approve fedorabugs for person_id(%s) because they have no email address to use with bugzilla' % row['person_id']) - - # If there is already a row in bugzilla_queue update, otherwise insert - plan = plpy.prepare("select email from bugzilla_queue where email = $1", - ('text',)) - result = plpy.execute(plan, (email,), 1) - if result: - plan = plpy.prepare("update bugzilla_queue set action = $1" - " where email = $2", ('char', 'text')) - plpy.execute(plan, (newaction, email)) - else: - plan = plpy.prepare("insert into bugzilla_queue (email, group_id" - ", person_id, action) values ($1, $2, $3, $4)", - ('text', 'text', 'text', 'char')) - plpy.execute(plan, (email, row['group_id'], row['person_id'], newaction)) - return None -$bz_sync$ language plpythonu; - -create trigger role_bugzilla_sync before update or insert or delete - on person_roles - for each row execute procedure bugzilla_sync(); +-- create or replace function bugzilla_sync() returns trigger as $bz_sync$ +-- # Decide which row we are operating on and the action to take +-- if TD['event'] == 'DELETE': +-- # 'r' for removing an entry from bugzilla +-- newaction = 'r' +-- row = TD['old'] +-- else: +-- # insert or update +-- row = TD['new'] +-- if row['role_status'] == 'approved': +-- # approved so add an entry to bugzilla +-- newaction = 'a' +-- else: +-- # no longer approved so remove the entry from bugzilla +-- newaction = 'r' +-- +-- # Get the group id for fedorabugs +-- result = plpy.execute("select id from groups where name = 'fedorabugs'", 1) +-- if not result: +-- # Danger Will Robinson! A basic FAS group does not exist! +-- plpy.error('Basic FAS group fedorabugs does not exist') +-- # If this is not a fedorabugs role, no change needed +-- if row['group_id'] != result[0]['id']: +-- return None +-- +-- # Retrieve the bugzilla email address +-- plan = plpy.prepare("select email, purpose from person_emails as pee," +-- " email_purposes as epu" +-- " where epu.id = epu.email_id and pee.person_id = $1" +-- " and purpose in ('bugzilla', 'primary')", +-- ('text',)) +-- result = plpy.execute(plan, row['person_id']) +-- email = None +-- for record in result: +-- email = record['email'] +-- if record['purpose'] == 'bugzilla': +-- break +-- if not email: +-- raise plpy.error('Cannot approve fedorabugs for person_id(%s) because they have no email address to use with bugzilla' % row['person_id']) +-- +-- # If there is already a row in bugzilla_queue update, otherwise insert +-- plan = plpy.prepare("select email from bugzilla_queue where email = $1", +-- ('text',)) +-- result = plpy.execute(plan, (email,), 1) +-- if result: +-- plan = plpy.prepare("update bugzilla_queue set action = $1" +-- " where email = $2", ('char', 'text')) +-- plpy.execute(plan, (newaction, email)) +-- else: +-- plan = plpy.prepare("insert into bugzilla_queue (email, group_id" +-- ", person_id, action) values ($1, $2, $3, $4)", +-- ('text', 'text', 'text', 'char')) +-- plpy.execute(plan, (email, row['group_id'], row['person_id'], newaction)) +-- return None +-- $bz_sync$ language plpythonu; +-- +-- create trigger role_bugzilla_sync before update or insert or delete +-- on person_roles +-- for each row execute procedure bugzilla_sync(); -- -- When an email address changes, check whether it needs to be changed in diff --git a/fas/setup.py b/fas/setup.py index b16be1d..542a93c 100644 --- a/fas/setup.py +++ b/fas/setup.py @@ -1,12 +1,88 @@ #!/usr/bin/python -tt import os +import re +import glob + +from distutils.command.build import build as _build +from distutils.command.install_data import install_data as _install_data +from distutils.dep_util import newer from setuptools import setup, find_packages -from turbogears.finddata import find_package_data +from turbogears.finddata import find_package_data, standard_exclude, \ + standard_exclude_directories execfile(os.path.join('fas', 'release.py')) +excludeFiles = ['*.cfg.in'] +excludeFiles.extend(standard_exclude) +excludeDataDirs = ['fas/static'] +excludeDataDirs.extend(standard_exclude_directories) + +SUBSTFILES = ('fas/config/app.cfg',) + +class Build(_build, object): + ''' + Build the package, changing the directories that data files are installed. + ''' + user_options = _build.user_options + user_options.extend([('install-data=', None, + 'Installation directory for data files')]) + # These are set in finalize_options() + substitutions = {'@DATADIR@': None} + subRE = re.compile('(' + '|'.join(substitutions.keys()) + ')+') + + def initialize_options(self): + self.install_data = None + super(Build, self).initialize_options() + + def finalize_options(self): + self.substitutions['@DATADIR@'] = self.install_data or \ + '%(top_level_dir)s' + super(Build, self).finalize_options() + + def run(self): + '''Substitute special variables for our installation locations.''' + for filename in SUBSTFILES: + # Change files to reference the data directory in the proper + # location + infile = filename + '.in' + if not os.path.exists(infile): + continue + try: + f = file(infile, 'r') + except IOError: + if not self.dry_run: + raise + f = None + outf = file(filename, 'w') + for line in f.readlines(): + matches = self.subRE.search(line) + if matches: + for pattern in self.substitutions: + line = line.replace(pattern, self.substitutions[pattern]) + outf.writelines(line) + outf.close() + f.close() + super(Build, self).run() + +class InstallData(_install_data, object): + def finalize_options(self): + '''Override to emulate setuptools in the default case. + install_data => install_dir + ''' + print 'DEBUG:', self.install_dir, '#' + haveInstallDir = self.install_dir + self.set_undefined_options('install', + ('install_lib', 'install_dir'), + ('root', 'root'), + ('force', 'force'), + ) + if not haveInstallDir: + # We set this above, now we need to add the module subdirectory to + # make it truly correct. + self.install_dir = os.path.join(self.install_dir, 'fas') + setup( name=NAME, version=VERSION, @@ -18,21 +94,31 @@ setup( download_url=DOWNLOAD_URL, license=LICENSE, - #cmdclass={'build_scripts': BuildScripts, - # 'build': Build, - # 'install': Install, - # 'install_lib': InstallApp}, + cmdclass={ + 'build': Build, + 'install_data': InstallData, + }, install_requires = [ 'TurboGears >= 1.0.4', 'SQLAlchemy >= 0.4', 'TurboMail', 'python_fedora >= 0.2.99.2' ], - scripts = ['client/fasClient.py'], + scripts = ['client/fasClient', 'client/restricted-shell'], zip_safe=False, packages=find_packages(), + data_files = (('static', [f for f in glob.glob('fas/static/*') if os.path.isfile(f)]), + ('static/css', [f for f in glob.glob('fas/static/css/*') if os.path.isfile(f)]), + ('static/images', [f for f in glob.glob('fas/static/images/*') if os.path.isfile(f)]), + ('static/images/balloons', + [f for f in glob.glob('fas/static/images/balloons/*') if os.path.isfile(f)]), + ('static/js', [f for f in glob.glob('fas/static/js/*') if os.path.isfile(f)]), + ), package_data = find_package_data(where='fas', - package='fas'), + package='fas', + exclude=excludeFiles, + exclude_directories=excludeDataDirs, + ), keywords = [ # Use keywords if you'll be adding your package to the # Python Cheeseshop @@ -76,4 +162,3 @@ setup( ) } ) - diff --git a/fas/start-fas b/fas/start-fas old mode 100644 new mode 100755 diff --git a/fas/start-fas.py b/fas/start-fas.py deleted file mode 100755 index a5d469a..0000000 --- a/fas/start-fas.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/python -import pkg_resources -pkg_resources.require("TurboGears") - -from turbogears import update_config, start_server -import cherrypy -cherrypy.lowercase_api = True -from os.path import * -import sys - -# first look on the command line for a desired config file, -# if it's not on the command line, then -# look for setup.py in this directory. If it's not there, this script is -# probably installed -if len(sys.argv) > 1: - update_config(configfile=sys.argv[1], - modulename="fas.config") -elif exists(join(dirname(__file__), "setup.py")): - update_config(configfile="dev.cfg",modulename="fas.config") -else: - update_config(configfile="prod.cfg",modulename="fas.config") - -from fas.controllers import Root - -start_server(Root())