Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Update sn07 playbook and the requirements.yml file #535

Merged
merged 4 commits into from
Nov 29, 2022
Merged

WIP: Update sn07 playbook and the requirements.yml file #535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff05ae9
Update sn07 playbook and the requirements.yml file
sanjaysrikakulam Nov 25, 2022
512ab00
Add a comment to the ssh_hardening
sanjaysrikakulam Nov 28, 2022
be28052
Add selinux policy and firewalld tasks
sanjaysrikakulam Nov 29, 2022
22668b4
Update file ownership and job_conf template
sanjaysrikakulam Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ collections:
source: https://galaxy.ansible.com
type: galaxy
- name: devsec.hardening
version: 7.10.0
version: 8.3.0
source: https://galaxy.ansible.com
type: galaxy
- name: usegalaxy_eu.handy
Expand Down
16 changes: 12 additions & 4 deletions sn07.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
- secret_group_vars/file_sources.yml # file_sources_conf.yml creds
- secret_group_vars/all.yml # All of the other assorted secrets...
- templates/galaxy/config/job_conf.yml
collections:
- devsec.hardening
handlers:
- name: Restart Galaxy
shell: |
Expand Down Expand Up @@ -189,7 +191,6 @@
## GALAXY
- hxr.postgres-connection
- galaxyproject.gxadmin
- galaxyproject.tiaas2
- usegalaxy_eu.ansible_nginx_upload_module
- usegalaxy-eu.nginx
# TODO move under monitoring + telegraf.
Expand All @@ -208,6 +209,10 @@
galaxy_fetch_dependencies: true
galaxy_build_client: true

- role: galaxyproject.tiaas2
vars:
tiaas_virtualenv_command: "{{ galaxy_virtualenv_command }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Itsn't this installing TIaaS into the virtual env of Galaxy?

Copy link
Member Author

@sanjaysrikakulam sanjaysrikakulam Nov 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, galaxy_virtualenv_command contains only the path to the virtualenv command present in a conda environment. TIaaS env is created as usual inside /opt/tiaas2.


## Extras!
- usegalaxy-eu.fix-galaxy-server-dir # Fix details into the galaxy server dirs
- hxr.install-to-venv # Some extra packages our site needs.
Expand All @@ -225,14 +230,17 @@
- usegalaxy-eu.fix-stuck-handlers # Restart handlers to prevent several classes of issues
- usegalaxy-eu.log-cleaner # do not retain journalctl logs, they are unnecessary/risky under GDPR
- usegalaxy-eu.fix-ancient-ftp-data # Remove FTP data older than 3 months, create FTP user directories

# Some of our 'cleanups' also generate telegraf format so this goes at end.
# 25.11.2022: Moved here becuase the galaxy-procstat role fails
# as it is not able to find the /etc/telegraf/telegraf.d/ directory
- dj-wasabi.telegraf
- usegalaxy-eu.galaxy-procstat # Some custom telegraf monitoring that's templated
- usegalaxy-eu.fix-missing-api-keys # Workaround for IE users not have a key set.
- usegalaxy-eu.fix-user-quotas # Automatically recalculate user quotas and attribute ELIXIR quota to ELIXIR AAI user on a regular basis

# Some of our 'cleanups' also generate telegraf format so this goes at end.
- dj-wasabi.telegraf
# - dev-sec.os-hardening
- dev-sec.ssh-hardening
- ssh_hardening
sanjaysrikakulam marked this conversation as resolved.
Show resolved Hide resolved

## Setup docker
- geerlingguy.docker