Merge branch 'master' into fetlab

2019-03-19 16:34:47 +01:00
parent 1fafdf2da9 f46321ae83
commit 48c881f948
46 changed files with 2038 additions and 95 deletions
--- a/site.yml
+++ b/site.yml
@@ -27,6 +27,11 @@
  - borg_client
 #  - rvm1-ansible

+- hosts: sputnik
+  roles:
+  - ldap
+  - nfs
+
 - hosts: betam
  roles:
  - ups
@@ -35,7 +40,7 @@
  roles:
  - gitea

- hosts: sojus
+- hosts: laika
  roles:
  - borg_server

@@ -61,6 +66,18 @@
  roles:
  - borg_client

+- hosts: ruby
+  roles:
+  - borg_client
+
+- hosts: fsdr
+  roles:
+  - borg_client
+
+- hosts: fsdrnas
+  roles:
+  - borg_server
+
 - hosts: progress
  roles:
  - scans