Commit Graph
76 Commits
Author SHA1 Message Date
Nicola Soranzo 04ccca1434 Remove broken code
`scripts/build_universe_config.py` was removed in commit
9b287ef06c
2020-05-13 19:30:49 +01:00
John Chilton 03eae0db0f Enable interactivetools with other beta tools...
...when GALAXY_RUN_WITH_TEST_TOOLS set.
2019-10-30 13:37:03 -04:00
Nicola Soranzo 69ac88f319 Fix (re)starting Galaxy using paste, `GALAXY_RUN_ALL=1 and --wait` under macOS
xref. https://github.com/galaxyproject/bioblend/commit/99d05e6ad697edc82c58f8ce7302be2a005c6933
2019-04-11 01:33:21 +01:00
John Chilton 4b13917d86 Allow import format2 workflows by default.
Setup forcing export of format2 workflows by default in next release. There should be a least one release between enabling them to be imported by default and exporting them by default anyway I think - so 19.09 workflows can still be used on slightly older Galaxy instances.
2019-04-04 09:15:30 -04:00
Nicola Soranzo eaacc5bc9f Merge branch 'release_18.09' into dev 2018-11-15 14:06:09 +01:00
Nicola Soranzo fbd2284e5d Fix PID file handling for gunicorn
gunicorn uses `--pid`, not `--pid-file`.
2018-11-15 11:27:14 +01:00
John Chilton feddcfaa5a Allow upload format 2 workflows to Galaxy. 2018-10-12 13:41:06 -04:00
Nicola Soranzo 7b741a32cd Fix GALAXY_RUN_ALL=1 ./run.sh --daemon
Broken in commit 0ea8107191 .
Reported by @lparsons in
https://github.com/galaxyproject/galaxy/pull/6262#issuecomment-395113621
2018-06-06 18:29:15 +01:00
Nicola Soranzo aaff474142 Use consistent preference order for config files
1) galaxy.yml
2) galaxy.ini
3) universe_wsgi.ini

Also:
- properly quote variables which may contain spaces
- no need to pass the config file to `./scripts/manage_tool_dependencies.py`
- simplify `scripts/maintenance.sh` by moving the `cd` up and reusing
  functions from `scripts/common_startup_functions.sh`
2018-06-02 03:28:54 +01:00
Nicola Soranzo 87719b9f8e Check for empty pid file when using --wait
Fix this error message:

```
Executing: python ./scripts/paster.py serve config/galaxy.ini  --daemon --server-name="main" --pid-file="main.pid" --log-file="main.log"
Entering daemon mode
../run.sh: 96: [: Illegal number:
.....
```
2018-06-02 01:09:10 +01:00
Nicola Soranzo 0ea8107191 Use separate pid_log_paster_args variable
to store --pid-file and --log-file options of `./scripts/paster.py` .

https://github.com/galaxyproject/galaxy/pull/6239 fixed 3 bugs:

- `GALAXY_RUN_ALL=1 ./run.sh` was reusing the same pid and log files for
  all Galaxy processes;
- `./run.sh restart` was always using `paster.pid` and `paster.log` instead
  of the configured files
- `./run.sh status` was always using `paster.pid`

but also introduced a regression, i.e. the plain `./run.sh` started
writing to the log file instead of the standard output (console).

This fixes the regression by using a separate variable for these options
instead of conflating them in `paster_args` or `server_args`.
2018-06-02 01:09:10 +01:00
Nate Coraor 09feaf6f4d - Do all logging configuration other than paste fileConfig logging from
dictConfig. Default log message format varies by stack.
- Refactor a lot of file extension handling in to galaxy.util.path.
- Simplify and improve config file finding.
- Simplify and improve native app creation.
- Integrate uWSGI argument generation with @jmchilton's improvements to
  the startup scripts.
- Fix starting without a config file under uWSGI
2017-09-01 01:08:16 -04:00
Nate Coraor 17ea3d671f Improve automatic uWSGI startup options interaction with [uwsgi] section
in config file
2017-08-28 15:18:09 -04:00
Nate Coraor 092a6b4923 WIP uWSGI mule job handlers - it works! 2017-08-21 21:39:30 -04:00
Nate Coraor 85ea2d2728 Script reusage and generate uWSGI mule args 2017-08-21 21:36:48 -04:00
John Chilton 6a7cc34e1b Bring Galaxy, reports, and shed run scripts in sync.
- They now uniformly handle server option processing.
- Reports and Tool Shed now respect many new and important options such as --skip_venv.
- Reports and Tool Shed now do extra checking around Python version that Galaxy does.

In addition to improving the reports and tool shed startup scripts and reducing cognative load with respect to option handling, this is an important pre-condition to us being able us to switch on uwsgi by default for all three services simultaneously without a bunch of copy and pasting.
2017-08-10 13:14:55 -04:00
John Chilton 41d4eac28f Merge remote-tracking branch 'jmchilton/dev' into feature/webhooks_tests 2017-01-29 15:40:18 -05:00
John Chilton 867e8dc4ca Treat demo/test webhooks like demo/test tools.
- Populate test server with demo webhooks by default.
- Eliminate special logic needed to treat the demo directory differently.
- Document how to enable the demo webhooks in galaxy.ini.sample.
- Populate the demo webhooks when starting Galaxy with GALAXY_RUN_WITH_TEST_TOOLS=1 set.
2017-01-24 11:59:44 -05:00
John Chilton 3d9cdeb70c Outline infrastructure for managing Conda installations outside of Galaxy.
- Construct a DependencyManager according to Galaxy's configuration before Galaxy starts to allow auto installation of Conda.
- Add script for managing tool dependencies outside of a Galaxy environment.
- Refactor to allow this to be done without duplicating logic related to defaults, configuration handling, etc....

Implements #3426.
2017-01-23 09:47:18 -05:00
Nicola Soranzo 87d6239c36 Improve startup scripts
Fix errors reported by shellcheck
2016-08-11 15:28:28 +01:00
Kyle Ellrott d5c52cadfd Fixing error in run.sh script 2016-03-20 17:59:31 -07:00
Remi Marenco e61e596d88 Modify run.sh to add --restart option, for a more consisten use of parameters 2016-03-11 15:40:09 -05:00
John Chilton 8fd83df665 Allow override of location of virtual env Galaxy manages. 2016-01-13 13:55:36 +00:00
John Chilton 9dc9ddf8cd Add --replace-pip option to common_startup.sh.
Needed to restore correct functionality to planemo.
2016-01-13 13:55:35 +00:00
Nate Coraor 4eefd885ec Improve startup options related to wheel/dependency/virtualenv
management. Drop hard requirement on lzo (doubt anyone other than
usegalaxy.org is using it, but it will be added as a extras option for
bxlab/bx-python for anyone who is).

Fixes #1150
2015-12-22 14:03:50 -05:00
John Chilton ac0cfbd2e3 Add a quick shortcut for starting Galaxy with development tools.
Start Galaxy using

    GALAXY_RUN_WITH_TEST_TOOLS=1 run.sh

Enables beta tool formats (e.g. YAML, and CWL downstream), beta workflow modules, and the suite of Galaxy test tools used by testing framework.
2015-11-02 07:38:42 +00:00
Nate Coraor d90ba82e92 Add a --dev-wheels arg to common_startup.sh (called by run_tests.sh by
default) that will install things in dev-requirements.txt.
2015-10-26 14:07:00 -04:00
Nate Coraor 88683c3c40 Unset $PYTHONPATH in run.sh and common_startup.sh unless --skip-env is
provided.
2015-10-22 18:42:06 -04:00
Nate Coraor 737596413f Pass relevant args from run.sh to common_startup.sh. 2015-10-22 15:04:00 -04:00
Nate Coraor a44b2c2170 Rename galaxy.wheels to the more generalized galaxy.dependencies (since
technically we don't care whether they are wheels), handle optional deps
more correctly. Add error handling to common_startup.sh.
2015-09-22 12:54:03 -04:00
Nate Coraor 633061f3e0 WIP: Stop using eggs, start using prebuilt wheels. 2015-07-04 15:18:50 -04:00
Nicola Soranzo 7866f2dcfd Merge rolling_restart.sh in run.sh by adding --wait parameter.
Also add the following combination:

GALAXY_RUN_ALL=1 ./run.sh --daemon --wait

which, by preventing servers from starting simultaneously, is useful when
multiple servers are configured before creating the database, or when updating
to a new Galaxy release containing a database upgrade.
2015-02-02 16:08:13 +00:00
Nicola Soranzo 4c5c75ee4b Allow "GALAXY_RUN_ALL=1 ./run.sh restart" since --daemon is implied. 2015-02-02 15:46:48 +00:00
Dave Bouvier 05cdaadfb9 Allow a Galaxy admin to configure environment variables (e.g. $PATH) for their local Galaxy installation without altering the environment for their shell. 2015-01-28 11:50:31 -05:00
Dannon Baker 504d3b6ba2 Log when using virtualenv at Galaxy startup. 2015-01-26 08:54:29 -05:00
Nate Coraor b376ed7664 Fix a bug with config/galaxy.ini in run.sh 2014-09-16 17:13:17 -04:00
Nate Coraor 267e4d9b88 Don't create galaxy.ini, just use the sample if galaxy.ini does not exist. Also fix startup when galaxy.ini.sample. Fixes the universe_wsgi.ini skipping problem Dannon found. 2014-09-15 22:12:18 -04:00
Nate Coraor 8fadc6392b Rename universe_wsgi.ini -> galaxy.ini everywhere. 2014-09-15 16:43:51 -04:00
Lance Parsons 29d56e518d Source virtualenv before python check and for reports app 2014-09-04 15:12:04 -04:00
Nate Coraor 4d79575ed2 Automatically use a virtualenv in galaxy_root/.venv/ if it exists (a la Pulsar). 2014-07-11 09:58:08 -04:00
Dave Bouvier 8b45411adf Abstract common startup tasks into scripts/common_startup.sh, which used to be copy_sample_files.sh. 2014-06-13 16:39:59 -04:00
Dave Bouvier 4f2e506042 Enable running the create_users and create_categories scripts via run_tool_shed.sh 2014-05-22 10:59:18 -04:00
John Chilton efdafb2f68 Enable job metrics by default.
They should work with all stock Galaxy runners now.
2014-05-20 15:31:14 -05:00
Nate Coraor 794484e8c3 Rename ucsc_build_sites.txt to .sample. 2014-02-27 16:37:48 -05:00
Daniel Blankenberg 1c9861eca2 First pass at a plugable Data Manager. Data Managers can be defined locally or installed from a Tool Shed. TODO: Display Data Manager information in the Tool Shed. Do not install Data Managers into Tool Panel. Add tests. Write Docs. 2013-02-14 15:13:06 -05:00
Greg Von Kuster a2e5b2fe77 Maintain entries for Galaxy's ToolDataTableManager acquired from installed tool shed repositrories that contain a valid file named tool_data_table_conf.xmnl.sample in a separate config file name shed_tool_data_table_conf.xml. This will ensure that manual edits to the original tool_data_table_conf.xml will not be munged when Galaxy's tool shed installation process automatically adds entries into the file. This enhancement alos includes a bug fix where ToolDataTableEntries that should have been persisted to the XML file were not being handled correctly. 2012-11-07 16:36:28 -05:00
Nate Coraor 5752c297d9 Merged in jmchilton/galaxy-central-configuration-directory (pull request #44) 2012-08-15 10:57:14 -04:00
Dave Bouvier 36dbacf8f1 Cleaned up code, added searchable list of NCBI builds. 2012-07-05 09:56:54 -04:00
Scott McManus 6f589136da Added application of regular expressions and exit code. Pulling exit
codes from the runners will be part of a separate submission.
2012-06-19 11:35:36 -04:00
John Chilton 7ba16d90ad Augment run.sh to search for the optional environment variable
GALAXY_UNIVERSE_CONFIG_DIR. If this is set, before Galaxy is launched
the directory specified by the environment variable is searched for
ini config files. These files are merged into a single configuration
structure and written back out as universe.ini.

This should allow for a more modular configuration of Galaxy. The
files are merged in lexiographic order and later files can override
properties specified ealier on. If a consistent naming scheme is used
this can be really useful:

As an example, one might specify the files as such:

  000_galaxy_defaults.ini
  000_default_sqlite_config.ini
  100_institution_specific.ini
  500_job_runner.ini
  500_webapp_0.ini
  500_webapp_1.ini
  500_instance_specific.ini
  500_available_postgres.ini
2012-05-04 00:12:43 -05:00