Commit f3eefa02 authored by Sveinung Gundersen's avatar Sveinung Gundersen Committed by Cage, Gregory
Browse files

Merge 'Removed info about default pools value as this is currently incorrect....

Merge 'Removed info about default pools value as this is currently incorrect. Have also wasted time earlier due to this' into branch
parent 42743743
Loading
Loading
Loading
Loading
+2 −10
Original line number Diff line number Diff line
@@ -376,16 +376,8 @@ gravity:
```

In this example 4 processes will be started in total:
3 processes will act as job handlers and workflow schedulers, and one process will be dedicated to handling jobs for the `special` tag only. With the `job_conf.xml` configuration above these would be jobs created by the `test1` tool.
You can omit the `pools` argument, this will then default to:

```yaml
        ...
        pools:
          - job-handlers
          - workflow-schedulers
        ...
```
3 processes will act as job handlers and workflow schedulers, and one process will be dedicated to handling jobs for the 
`special` tag only. With the `job_conf.xml` configuration above these would be jobs created by the `test1` tool.

If you omit the `processes` argument this will default to a single process.
You can further customize the handler names using the `name_template` section,
+70 −29
Original line number Diff line number Diff line
@@ -333,9 +333,15 @@ gravity:
    # names.
    # environment: {}

  # Configure dynamic handlers in this section.
  # Configure dynamic handlers in this section. Below is a simple example
  # See https://docs.galaxyproject.org/en/latest/admin/scaling.html#dynamically-defined-handlers for details.
  # handlers: {}
  #handlers:
  #  handler:
  #    processes: 3
  #    pools:
  #      - job-handlers
  #      - workflow-schedulers

galaxy:

  # The directory that will be prepended to relative paths in options
@@ -1116,11 +1122,17 @@ galaxy:
  # message, before the 'Your Galaxy Team' signature.
  #custom_activation_email_message: null

  # URL of the support resource for the galaxy instance.  Used in
  # activation emails.
  # URL of the support resource for the galaxy instance.  Used outside
  # of web contexts such as in activation emails and in Galaxy markdown
  # report generation.
  # Example value 'https://galaxyproject.org/'
  #instance_resource_url: null

  # URL used to access this Galaxy server. Used outside of web contexts
  # such as in Galaxy markdown report generation.
  # Example value 'https://usegalaxy.org'
  #instance_access_url: null

  # E-mail domains blocklist is used for filtering out users that are
  # using disposable email addresses at registration.  If their
  # address's base domain matches any domain on the list, they are
@@ -1235,6 +1247,33 @@ galaxy:
  # pricing table. Please note, that those numbers are only estimates.
  #aws_estimate: false

  # This flag enables carbon emissions estimates for every job based on
  # its runtime metrics. CPU and RAM usage and the total job runtime are
  # used to determine an estimate value. These estimates and are based
  # off of the work of the Green Algorithms Project and the United
  # States Environmental Protection Agency (EPA). Visit
  # https://www.green-algorithms.org/ and
  # https://www.epa.gov/energy/greenhouse-gas-equivalencies-calculator.
  # for more detals.
  #carbon_emission_estimates: true

  # The estimated geographical location of the server hosting your
  # galaxy instance given as an ISO 3166 code. This is used to make
  # carbon emissions estimates more accurate as the location effects the
  # carbon intensity values used in the estimate calculation. This
  # defaults to "GLOBAL" if not set or the
  # `geographical_server_location_code` value is invalid or unsupported.
  # To see a full list of supported locations, visit
  # https://galaxyproject.org/admin/carbon_emissions
  #geographical_server_location_code: GLOBAL

  # The estimated power usage effectiveness of the data centre housing
  # the server your galaxy instance is running on. This can make carbon
  # emissions estimates more accurate. For more information on how to
  # calculate a PUE value, visit
  # https://en.wikipedia.org/wiki/Power_usage_effectiveness
  #power_usage_effectiveness: 1.67

  # Enable InteractiveTools.
  #interactivetools_enable: false

@@ -1255,19 +1294,11 @@ galaxy:
  # The value of this option will be resolved with respect to
  # <data_dir>.
  #interactivetools_map: interactivetools_map.sqlite
  # Note: the following config should still be used due to lack of
  # support of data_dir resolution in gx-it-proxy and gravity:
  #interactivetools_map: database/interactivetools_map.sqlite

  # Prefix to use in the formation of the subdomain or path for
  # interactive tools
  #interactivetools_prefix: interactivetool

  # Shorten the uuid portion of the subdomain or path for interactive
  # tools. Especially useful for avoiding the need for wildcard
  # certificates by keeping subdomain under 63 chars
  #interactivetools_shorten_url: false

  # Galaxy Interactive Tools (GxITs) can be stopped from within the
  # Galaxy interface, killing the GxIT job without completing its
  # metadata setting post-job steps. In such a case it may be desirable
@@ -2171,6 +2202,28 @@ galaxy:
  # production server.
  #bootstrap_admin_api_key: null

  # The name of the organization that operates this Galaxy instance.
  # Serves as the default for the GA4GH service organization name and
  # can be exposed through Galaxy markdown for reports and such. For
  # instance, "Not Evil Corporation".
  # For GA4GH APIs, this is exposed via the service-info endpoint for
  # the Galaxy DRS API. If unset, one will be generated using
  # ga4gh_service_id (but only in the context of GA4GH APIs).
  # For more information on GA4GH service definitions - check out
  # https://github.com/ga4gh-discovery/ga4gh-service-registry and
  # https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
  #organization_name: null

  # The URL of the organization that operates this Galaxy instance.
  # Serves as the default for the GA4GH service organization name and
  # can be exposed through Galaxy markdown for reports and such. For
  # instance, "notevilcorp.com".
  # For GA4GH APIs, this is exposed via the service-info endpoint.
  # For more information on GA4GH service definitions - check out
  # https://github.com/ga4gh-discovery/ga4gh-service-registry and
  # https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
  #organization_url: null

  # Service ID for GA4GH services (exposed via the service-info endpoint
  # for the Galaxy DRS API). If unset, one will be generated using the
  # URL the target API requests are made against.
@@ -2185,22 +2238,6 @@ galaxy:
  # be org.usegalaxy.drs.
  #ga4gh_service_id: null

  # Service name for host organization (exposed via the service-info
  # endpoint for the Galaxy DRS API). If unset, one will be generated
  # using ga4gh_service_id.
  # For more information on GA4GH service definitions - check out
  # https://github.com/ga4gh-discovery/ga4gh-service-registry and
  # https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
  #ga4gh_service_organization_name: null

  # Organization URL for host organization (exposed via the service-info
  # endpoint for the Galaxy DRS API). If unset, one will be generated
  # using the URL the target API requests are made against.
  # For more information on GA4GH service definitions - check out
  # https://github.com/ga4gh-discovery/ga4gh-service-registry and
  # https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
  #ga4gh_service_organization_url: null

  # Service environment (exposed via the service-info endpoint for the
  # Galaxy DRS API) for implemented GA4GH services.
  # Suggested values are prod, test, dev, staging.
@@ -2706,6 +2743,10 @@ galaxy:
  # https://docs.galaxyproject.org/en/master/admin/production.html
  #enable_celery_tasks: false

  # If set to a non-0 value, upper limit on number of tasks that can be
  # executed per user per second.
  #celery_user_rate_limit: 0.0

  # Allow disabling pbkdf2 hashing of passwords for legacy situations.
  # This should normally be left enabled unless there is a specific
  # reason to disable it.