commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/059dd17a77e0/ Changeset: 059dd17a77e0 User: natefoo Date: 2014-08-20 23:51:33 Summary: Style fixes for sample universe_wsgi.ini Affected #: 1 file diff -r 871a781a05070d5a227469c55c4249dbe6945e2d -r 059dd17a77e02c515e42b63bf50d2a9e37058b6c universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -229,9 +229,9 @@ # Citation related caching. Tool citations information maybe fetched from # external sources such as http://dx.doi.org/ by Galaxy - the following parameters # can be used to control the caching used to store this information. -#citation_cache_type=file -#citation_cache_data_dir=database/citations/data -#citation_cache_lock_dir=database/citations/lock +#citation_cache_type = file +#citation_cache_data_dir = database/citations/data +#citation_cache_lock_dir = database/citations/lock # External service types config file, defines what types of external_services configurations # are available in Galaxy. @@ -309,7 +309,7 @@ #smtp_password = None # If your SMTP server requires SSL from the beginning of the connection -# smtp_ssl= False +# smtp_ssl = False # On the user registration form, users may choose to join the mailing list. # This is the address of the list they'll be subscribed to. @@ -450,7 +450,7 @@ # The URL linked by the "Galaxy Q&A" link in the "Help" menu # The Galaxy Q&A site is under development; when the site is done, this URL # will be set and uncommented. -# qa_url = +#qa_url = # Serve static content, which must be enabled if you're not serving it via a # proxy server. These options should be self explanatory and so are not @@ -620,7 +620,7 @@ #enable_lucene_library_search = False # maxiumum file size to index for searching, in MB #fulltext_max_size = 500 -#fulltext_noindex_filetypes=bam,sam,wig,bigwig,fasta,fastq,fastqsolexa,fastqillumina,fastqsanger +#fulltext_noindex_filetypes = bam,sam,wig,bigwig,fasta,fastq,fastqsolexa,fastqillumina,fastqsanger # base URL of server providing search functionality using lucene #fulltext_url = http://localhost:8081 @@ -709,7 +709,7 @@ # Master key that allows many API admin actions to be used without actually # having a defined admin user in the database/config. Only set this if you need # to bootstrap Galaxy, you probably do not want to set this on public servers. -#master_api_key=changethis +#master_api_key = changethis # Enable tool tags (associating tools with tags). This has its own option # since its implementation has a few performance implications on startup for https://bitbucket.org/galaxy/galaxy-central/commits/0c2fd93d22b7/ Changeset: 0c2fd93d22b7 User: natefoo Date: 2014-08-20 23:51:49 Summary: Set defaults for static so they do not need to be explicitly defined in the Galaxy config. Affected #: 1 file diff -r 059dd17a77e02c515e42b63bf50d2a9e37058b6c -r 0c2fd93d22b796bb38687ca5489e7c57c3e14c21 lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -561,12 +561,12 @@ # Send to dynamic app by default urlmap["/"] = app # Define static mappings from config - urlmap["/static"] = Static( conf.get( "static_dir" ), cache_time ) - urlmap["/images"] = Static( conf.get( "static_images_dir" ), cache_time ) - urlmap["/static/scripts"] = Static( conf.get( "static_scripts_dir" ), cache_time ) - urlmap["/static/style"] = Static( conf.get( "static_style_dir" ), cache_time ) - urlmap["/favicon.ico"] = Static( conf.get( "static_favicon_dir" ), cache_time ) - urlmap["/robots.txt"] = Static( conf.get( "static_robots_txt", 'static/robots.txt'), cache_time ) + urlmap["/static"] = Static( conf.get( "static_dir", "./static/" ), cache_time ) + urlmap["/images"] = Static( conf.get( "static_images_dir", "./static/images" ), cache_time ) + urlmap["/static/scripts"] = Static( conf.get( "static_scripts_dir", "./static/scripts/" ), cache_time ) + urlmap["/static/style"] = Static( conf.get( "static_style_dir", "./static/style/blue" ), cache_time ) + urlmap["/favicon.ico"] = Static( conf.get( "static_favicon_dir", "./static/favicon.ico" ), cache_time ) + urlmap["/robots.txt"] = Static( conf.get( "static_robots_txt", "./static/robots.txt" ), cache_time ) # wrap any static dirs for plugins plugin_frameworks = plugin_frameworks or [] Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org