Unverified Commit e08d0c2c authored by mvdbeek's avatar mvdbeek
Browse files

Fix gunicorn_extra_args, this is just extra_args nows

parent 9abb53a2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ previous section:
      gunicorn:
        # ...
        bind: /srv/galaxy/var/gunicorn.sock
        gunicorn_extra_args: '--forwarded-allow-ips="*"'
        extra_args: '--forwarded-allow-ips="*"'
    galaxy:
        # ...
        galaxy_url_prefix: /galaxy
+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ previous section:
      gunicorn:
        # ...
        bind: /srv/galaxy/var/gunicorn.sock
        gunicorn_extra_args: '--forwarded-allow-ips="*"'
        extra_args: '--forwarded-allow-ips="*"'
        # ...
    galaxy:
        # ...
+6 −6
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ gravity:
    # performance options
    workers: 1
    # Other options that will be passed to gunicorn
    gunicorn_extra_args:
    extra_args:

```

@@ -194,7 +194,7 @@ Some of these options deserve explanation:
* `workers`: Controls the number of Galaxy application processes Gunicorn will spawn. Increased web performance can be
  attained by increasing this value. If Gunicorn is the only application on the server, a good starting value is the number of CPUs * 2 + 1.
4-12 workers should be able to handle hundreds if not thousands of requests per second.
* `gunicorn_extra_args`: You can specify additional arguments to pass to gunicorn here.
* `extra_args`: You can specify additional arguments to pass to gunicorn here.

Note that the performance option values given above are just examples and should be tuned per your specific needs.
However, as given, they are a good place to start.
@@ -211,7 +211,7 @@ gravity:
  gunicorn:
    # listening options
    bind: 'unix:/srv/galaxy/var/gunicorn.sock'
    gunicorn_extra_args: '--forwarded-allow-ips="*"'
    extra_args: '--forwarded-allow-ips="*"'
```

Here we've used a UNIX domain socket because there's less overhead than a TCP socket and it can be secured by filesystem
@@ -239,7 +239,7 @@ for help with the proxy-side configuration.

By setting the `bind` option to a socket, `run.sh` will no longer automatically serve Galaxy via HTTP (since it is assumed that
you are setting a socket to serve Galaxy via a proxy server). If you wish to continue serving HTTP directly with Gunicorn
while using a socket, you can add an additional `--bind` argument via the `gunicorn_extra_args` option:
while using a socket, you can add an additional `--bind` argument via the `extra_args` option:

```yaml
gravity:
@@ -247,7 +247,7 @@ gravity:
  gunicorn:
    # listening options
    bind: 'unix:/srv/galaxy/var/gunicorn.sock'
    gunicorn_extra_args: '--forwarded-allow-ips="*" --bind 127.0.0.1:8080'
    extra_args: '--forwarded-allow-ips="*" --bind 127.0.0.1:8080'
```

Note that this should only be used for debugging purposes due to `--forwarded-allow-ips="*"`.
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ There is some built-in `Gunicorn <https://docs.gunicorn.org/en/stable/instrument
   gravity:
      ...
      gunicorn:
        gunicorn_extra_args: `--statsd-host 127.0.0.1:8125 --statsd-prefix=gunicorn`
        extra_args: `--statsd-host 127.0.0.1:8125 --statsd-prefix=gunicorn`
      ...

API / Route Timing Statistics