Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

soctools
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

be32f15b

Commit be32f15b authored 4 years ago by Arne Øslebø

Downloads
- Plain Diff

Merge branch 'master' of gitlab.geant.org:gn4-3-wp8-t3.1-soc/soctools

parents 5e9aac83 a1d78eb9

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

roles/build/files/misp_rh-php72-php-fpm 21 additions, 0 deletions

roles/build/files/misp_rh-php72-php-fpm
roles/build/templates/misp/Dockerfile.j2 3 additions, 1 deletion

roles/build/templates/misp/Dockerfile.j2
roles/build/templates/misp/supervisord.conf.j2 46 additions, 1 deletion

roles/build/templates/misp/supervisord.conf.j2
roles/docker/tasks/misp.yml 0 additions, 2 deletions

roles/docker/tasks/misp.yml
roles/filebeat/templates/filebeat.yml.j2 5 additions, 0 deletions

roles/filebeat/templates/filebeat.yml.j2
roles/misp/tasks/main.yml 2 additions, 2 deletions

roles/misp/tasks/main.yml
roles/odfees/templates/config/log4j2.properties.j2 23 additions, 1 deletion

roles/odfees/templates/config/log4j2.properties.j2
soctools-inventory 9 additions, 9 deletions

soctools-inventory

with 109 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment