Skip to content

Commit

Permalink
Merge pull request #60 from ic4f/master
Browse files Browse the repository at this point in the history
(1) Fix typo in sample code; (2) Selection of client build type
  • Loading branch information
hexylena committed Feb 8, 2019
2 parents 971f7dd + bdd33aa commit 3e9ff55
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,13 @@ Several variables control which functions this role will perform (all default to
- `galaxy_manage_database`: Upgrade the database schema as necessary, when new schema versions become available.
- `galaxy_fetch_dependencies`: Fetch Galaxy dependent modules to the Galaxy virtualenv.
- `galaxy_build_client`: Build the Galaxy client application (web UI).
- `galaxy_client_make_target` (default: `client-production-maps`): Set the client build type. Options include: `client`,
`client-production` and `client-production-maps`. See [Galaxy client readme][client-build] for details.
- `galaxy_manage_errordocs` (default: `no`): Install Galaxy-styled 413 and 502 HTTP error documents for nginx. Requires
write privileges for the nginx error document directory.

[client-build]: https://github.com/galaxyproject/galaxy/blob/dev/client/README.md#complete-client-build

**Galaxy code and configuration**

Options for configuring Galaxy and controlling which version is installed.
Expand Down Expand Up @@ -251,7 +255,7 @@ Install Galaxy as per the current production server best practices:
galaxy_root: /srv/galaxy
galaxy_commit_id: release_18.09
galaxy_separate_privileges: yes
galaxy_create_users: yes
galaxy_create_user: yes
galaxy_manage_paths: yes
galaxy_user: galaxy
galaxy_privsep_user: gxpriv
Expand Down
8 changes: 8 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,3 +249,11 @@ galaxy_uwsgi_config_default:

# TODO: Implement something like this for starter/restarter
#galaxy_server_type: paste_singleprocess

#
# Client build settings
#

# Options include: client / client-production / client-production-maps (default)
galaxy_client_make_target: client-production-maps

2 changes: 1 addition & 1 deletion tasks/client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
- name: Build client
make:
chdir: "{{ galaxy_server_dir }}"
target: client-production-maps
target: "{{ galaxy_client_make_target }}"
environment:
PATH: "{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
Expand Down

0 comments on commit 3e9ff55

Please sign in to comment.