Skip to content

Commit 5f6627c

Browse files
ljochamartenson
authored andcommitted
replace local copy of roles with their clean upstream versions
first shot more notes updated requirements to the most recent working versions save installed roles in the roles folder ignore the whole roles folder ideally it will be empty soon, until then it needs to be hand-managed remove copy of roles
1 parent 8fe3403 commit 5f6627c

File tree

1,031 files changed

+234
-29075
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,031 files changed

+234
-29075
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ ansible.log
1414

1515
# Macs
1616
.DS_Store
17+
18+
# ideally no local roles changes are present
19+
roles

ansible.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[defaults]
2+
roles_path = ./roles
23
interpreter_python = /usr/bin/python3
34
inventory = hosts.yml
45
retry_files_enabled = false

group_vars/galaxyservers.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,15 @@ rabbitmq_users:
380380
galaxy_tusd_port: 1080
381381
galaxy_tus_upload_store: "{{ galaxy_mutable_data_dir }}/tus" # /mnt/data/tus
382382

383+
# cf. original note in README.md:
384+
# On ubuntu < 22.04 and Debian < 12 the GLIBC version is incompatible with the ```galaxyproject.tusd``` GLIBC, therefore playbook ends in error.
385+
# - in `roles/galaxyproject.tusd/defaults/main.yml` you have to set the `tusd_version:` to 'v1.8.0' (tested, possibly higher)
386+
#
387+
# hope it's not needed anymore
388+
#
389+
# tusd_version: v1.8.0
390+
391+
383392
#Redis
384393
galaxy_additional_venv_packages:
385394
- redis
@@ -429,6 +438,8 @@ tiaas_info:
429438
owner_email: "[email protected]"
430439
owner_site: "https://{{ inventory_hostname }}"
431440
tiaas_send_email_to_requester: true
441+
tiaas_send_email_to: "{{ tiaas_info.owner_email }}"
442+
tiaas_send_email_from: "tiaas+noreply@{{ tiaas_info.domain }}"
432443

433444
# XXX: from Galaxy 24.1, disappered from /static/style/, but galaxyproject.tiaas2/defaults/main.yml is not updated yet
434445
tiaas_galaxy_stylesheet: "{{ galaxy_server_dir }}/client/dist/base.css"

requirements.yml

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,47 @@
1-
# Galaxy, Postgres, Nginx
21
- src: galaxyproject.galaxy
3-
version: 0.10.14
2+
version: 0.11.1
43
- src: galaxyproject.nginx
54
version: 0.7.1
65
- src: galaxyproject.postgresql
7-
version: 1.1.2
6+
version: 1.1.7
87
- src: galaxyproject.postgresql_objects
98
version: 1.2.0
109
- src: galaxyproject.miniconda
1110
version: 0.3.1
1211
- src: usegalaxy_eu.certbot
1312
version: 0.1.11
14-
# gxadmin (used in cleanup, and later monitoring.)
15-
- src: galaxyproject.gxadmin
16-
version: 0.0.12
17-
# TUS (uploads)
18-
- name: galaxyproject.tusd
13+
- src: galaxyproject.tusd
1914
version: 0.0.1
20-
# CVMFS Support role
2115
- src: galaxyproject.cvmfs
22-
version: 0.2.22
23-
# Singularity/Apptainer
16+
version: 0.3.0
2417
- src: usegalaxy_eu.apptainer
25-
version: 0.0.1
26-
# TPV Linting
27-
- name: usegalaxy_eu.tpv_auto_lint
18+
version: main
19+
- src: usegalaxy_eu.tpv_auto_lint
2820
version: 0.4.4
29-
# RabbitMQ for Pulsar
3021
- src: geerlingguy.docker
31-
version: 6.1.0
22+
version: 7.4.4
3223
- src: usegalaxy_eu.rabbitmqserver
33-
version: 1.4.4
34-
# Celery, Redis, and Flower (dashboard)
35-
- name: geerlingguy.redis
36-
version: 1.8.0
37-
- name: usegalaxy_eu.flower
38-
version: 1.0.2
24+
version: 1.4.5
25+
- src: geerlingguy.redis
26+
version: 1.9.0
27+
- src: usegalaxy_eu.flower
28+
version: 2.0.0
3929
- src: galaxyproject.gxadmin
40-
version: 0.0.12
30+
version: 0.0.13
4131
- src: usegalaxy_eu.influxdb
42-
version: v6.0.7
43-
# Monitoring
32+
version: v6.0.8
33+
#- name: dj-wasabi.telegraf
34+
# src: https://github.com/dj-wasabi/ansible-telegraf
35+
# version: 6f6fdf7f5ead491560783d52528b79e9e088bd5b
4436
- name: dj-wasabi.telegraf
4537
src: https://github.com/dj-wasabi/ansible-telegraf
46-
version: 6f6fdf7f5ead491560783d52528b79e9e088bd5b
47-
- src: cloudalchemy.grafana
4838
version: 0.14.2
49-
# Training Infrastructure as a Service
39+
- src: cloudalchemy.grafana
40+
version: 0.18.0
5041
- src: galaxyproject.tiaas2
51-
version: 2.2.0
52-
# Sentry
42+
version: 2.2.2
5343
- name: mvdbeek.sentry_selfhosted
5444
src: https://github.com/mvdbeek/ansible-role-sentry/archive/main.tar.gz
55-
# Our FTP Server
5645
- src: galaxyproject.proftpd
5746
version: 0.3.1
5847

roles/cloudalchemy.grafana/.ansible-lint

Lines changed: 0 additions & 3 deletions
This file was deleted.

roles/cloudalchemy.grafana/.github/lock.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

roles/cloudalchemy.grafana/.github/stale.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

roles/cloudalchemy.grafana/.gitignore

Lines changed: 0 additions & 14 deletions
This file was deleted.

roles/cloudalchemy.grafana/.travis.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

roles/cloudalchemy.grafana/.travis/releaser.sh

Lines changed: 0 additions & 71 deletions
This file was deleted.

roles/cloudalchemy.grafana/.yamllint

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)