Skip to content

Commit

Permalink
Merge pull request #212 from dometto/patch-2
Browse files Browse the repository at this point in the history
Add GRAVITY_CONFIG_FILE to systemd env
  • Loading branch information
hexylena authored Apr 17, 2024
2 parents 6d24332 + 81444b5 commit cc413b6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
15 changes: 14 additions & 1 deletion molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
galaxy_user: galaxy
galaxy_group: galaxy
galaxy_privsep_user: gxpriv
galaxy_clone_depth: 1
galaxy_config:
galaxy:
database_connection: sqlite:///{{ galaxy_mutable_data_dir }}/universe.sqlite
Expand All @@ -39,7 +40,18 @@
when: ansible_os_family == "RedHat" and ansible_distribution_major_version is version("8", ">=")
- name: Install dependencies (apt)
apt:
name: [sudo, git, make, python3-venv, python3-setuptools]
name:
- sudo
- git
- make
- python3-venv
- python3-setuptools
- python3-dev
- python3-psycopg2
- gcc
- acl
- gnutls-bin
- libmagic-dev
when: ansible_os_family == "Debian"

# This is to cheat at idempotence, which will fail if a commit is merged between converge and idempotence.
Expand All @@ -50,6 +62,7 @@
- name: Collect current commit id
git:
clone: false
depth: "{{ galaxy_clone_depth }}"
dest: "{{ galaxy_root }}/server"
repo: https://github.com/galaxyproject/galaxy.git
changed_when: false
Expand Down
1 change: 1 addition & 0 deletions templates/systemd/galaxy.service.j2
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Environment=PATH={{ galaxy_venv_dir }}/bin:/usr/local/bin:/bin:/usr/bin:/usr/loc
Environment=DOCUTILSCONFIG=
Environment=PYTHONPATH={{ galaxy_dynamic_job_rules_dir }}
Environment=GRAVITY_STATE_DIR={{ galaxy_gravity_state_dir }}
Environment=GRAVITY_CONFIG_FILE={{ galaxy_config_file }}
{% for env in galaxy_systemd_env %}
Environment={{ env }}
{% endfor %}
Expand Down

0 comments on commit cc413b6

Please sign in to comment.