Merge branch 'newinfra' into 'borgbackup' (d2a6501b) · Commits · Nounous / Ansible · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Ansible
- Activity
- Members
- Labels
- Releases
- Model registry

Snippets Groups Projects

d2a6501b

Commit d2a6501b authored 4 years ago by Maxime Bombar

Downloads
- Plain Diff

Merge branch 'newinfra' into 'borgbackup'

# Conflicts:
#   group_vars/crans_server/vars.yml
#   plays/backup.yml

parents 8798fa34 502c03d6

No related branches found

No related tags found

1 merge request!121Borgbackup

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

all.yml 1 addition, 4 deletions

all.yml
group_vars/crans_server/vars.yml 4 additions, 3 deletions

group_vars/crans_server/vars.yml
group_vars/reverseproxy.yml 22 additions, 22 deletions

group_vars/reverseproxy.yml
host_vars/bigbluebutton.adm.crans.org 4 additions, 0 deletions

host_vars/bigbluebutton.adm.crans.org
hosts 1 addition, 0 deletions

hosts
plays/network-interfaces.yml 1 addition, 1 deletion

plays/network-interfaces.yml
roles/debian-apt-sources/templates/apt/sources.list.j2 11 additions, 0 deletions

roles/debian-apt-sources/templates/apt/sources.list.j2
roles/ntp-client/tasks/main.yml 2 additions, 2 deletions

roles/ntp-client/tasks/main.yml
roles/prometheus-node-exporter/tasks/main.yml 13 additions, 1 deletion

roles/prometheus-node-exporter/tasks/main.yml

with 59 additions and 33 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