From ad0f9b6f5abfb8062cbdb8b8652b2f3b31eefa59 Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Wed, 30 Nov 2022 16:18:56 +0100
Subject: [PATCH] [home] gardening

---
 host_vars/cameron.adm.crans.org | 42 +++++++++++++++++++--------------
 plays/home.yml                  |  2 +-
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/host_vars/cameron.adm.crans.org b/host_vars/cameron.adm.crans.org
index 458e3205..ff977193 100644
--- a/host_vars/cameron.adm.crans.org
+++ b/host_vars/cameron.adm.crans.org
@@ -19,30 +19,36 @@ loc_service_home:
     remote: https://gitlab.adm.crans.org/nounous/home.git
     version: master
   config:
-    ldap_server: "ldap://{{ query('ldap', 'ip4', 'yson-partou', 'adm') }}"
-    binddn: "{{ vault.services.home.ldap.binddn }}"
-    password: "{{ vault.services.home.ldap.bindpass }}"
-    rootdn: cn=Utilisateurs,dc=crans,dc=org
-    home_dir: /pool/home
-    mail_dir: /pool/mail
-    home_quota: /usr/sbin/zfs set userquota@{user}=30G pool/home
-    mail_quota: /usr/sbin/zfs set userquota@{user}=10G pool/mail
+    ldap:
+      server: "ldap://{{ query('ldap', 'ip4', 'yson-partou', 'adm') }}/"
+      binddn: "{{ vault.services.home.ldap.binddn }}"
+      basedn: cn=Utilisateurs,dc=crans,dc=org
+      password: "{{ vault.services.home.ldap.bindpass }}"
+    home:
+      path: /pool/home
+      quota: 30G
+    mail:
+      path: /pool/mail
+      quota: 10G
 
-loc_service_backup:
-  name: backup
-  install_dir: /var/local/services/backup
+loc_service_borg:
+  name: borg
+  install_dir: /var/local/services/borg
   cron:
-    frequency: "0 0 * * *"
+    frequency: "06-51/15 * * * *"
   dependencies:
     - python3-jinja2
     - python3-ldap
   generated: yes
   git:
-    remote: https://gitlab.adm.crans.org/nounous/backup.git
-    version: master
+    remote: https://gitlab.adm.crans.org/nounous/borg.git
+    version: main
   config:
-    binddn: cn=home,ou=service-users,dc=crans,dc=org
-    password: "{{ vault.ldap_home_password }}"
-    rootdn: cn=Utilisateurs,dc=crans,dc=org
-    ldap_server: "ldap://{{ query('ldap', 'ip4', 'yson-partou', 'adm') }}"
+    ldap:
+      server: "ldap://{{ query('ldap', 'ip4', 'yson-partou', 'adm') }}"
+      binddn: "{{ vault.services.home.ldap.binddn }}"
+      rootdn: cn=Utilisateurs,dc=crans,dc=org
+      password: "{{ vault.services.home.ldap.bindpass }}"
     borg_key: "{{ vault.borg.encryption_passphrase }}"
+    count: 50
+    processes: 4
diff --git a/plays/home.yml b/plays/home.yml
index 6af8f220..c064aa4d 100755
--- a/plays/home.yml
+++ b/plays/home.yml
@@ -8,6 +8,6 @@
 
 - hosts: cameron.adm.crans.org
   vars:
-    service: "{{ glob_service_backup | default({}) | combine(loc_service_backup | default({})) }}"
+    service: "{{ glob_service_borg | default({}) | combine(loc_service_borg | default({})) }}"
   roles:
     - service