From d544cb9a2ff32467194f62077dab1a6036bd2e67 Mon Sep 17 00:00:00 2001
From: Oli <oliver@opitz.ws>
Date: Sat, 15 Oct 2022 10:48:21 +0000
Subject: [PATCH] change drive to team_drive

---
 .../rclone_mount_nextcloud.service.j2         |  2 +-
 ...ount.json => TD_DTSV_service_account.json} |  0
 roles/rclone/tasks/main.yml                   |  2 +-
 roles/rclone/vars/main.yml                    | 26 ++++++++++++-------
 roles/webserver/templates/rclone.conf.j2      |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)
 rename roles/rclone/files/{DTSV_GD_service_account.json => TD_DTSV_service_account.json} (100%)

diff --git a/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2 b/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2
index c54e0b0..3e07e11 100644
--- a/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2
+++ b/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2
@@ -8,7 +8,7 @@ After = network-online.target
 Environment=RCLONE_RCD_USER=rclone
 Environment=RCLONE_RCD_PASSWORD={{ vault_rclone_rcd_pass }}
 Type=notify
-ExecStart=/usr/bin/rclone mount GD3_crypt:cloud_data {{ nextcloud_rclone_mount_dir }} \
+ExecStart=/usr/bin/rclone mount DTSV_crypt:cloud_data {{ nextcloud_rclone_mount_dir }} \
         --devname rclone \
         --use-mmap \
         --allow-other \
diff --git a/roles/rclone/files/DTSV_GD_service_account.json b/roles/rclone/files/TD_DTSV_service_account.json
similarity index 100%
rename from roles/rclone/files/DTSV_GD_service_account.json
rename to roles/rclone/files/TD_DTSV_service_account.json
diff --git a/roles/rclone/tasks/main.yml b/roles/rclone/tasks/main.yml
index c29b783..b6c2821 100644
--- a/roles/rclone/tasks/main.yml
+++ b/roles/rclone/tasks/main.yml
@@ -81,7 +81,7 @@
     dest: "{{ rclone_config_dir }}/{{ item }}"
     mode: 0600
   loop:
-    - DTSV_GD_service_account.json
+    - TD_DTSV_service_account.json
 
 - name: Copy config password script
   copy:
diff --git a/roles/rclone/vars/main.yml b/roles/rclone/vars/main.yml
index ff0fd1e..007d977 100644
--- a/roles/rclone/vars/main.yml
+++ b/roles/rclone/vars/main.yml
@@ -8,7 +8,14 @@ rclone_cache_dir: "/var/cache/rclone"
 rclone_log_dir: "/var/log/rclone"
 rclone_user_agent_gd: 'GoogleDriveFS/64.0.4.0 (Windows;OSVer=10.0.22621;)'
 
-vault_gd3_crypt_password: !vault |
+vault_td_dtsv_id: !vault |
+  $ANSIBLE_VAULT;1.2;AES256;dtsv-dev
+  39633561666535323062306235303764346437346265366239643766323562356131346131383532
+  3465383161646130343434653034663931633864333565660a383234623565336464646531366636
+  66396336373536313234323261306135303266353337313136656231353864346430363530646230
+  3534663435636333390a336533613865386233346663353364316534646438383031623937333963
+  39326239653734343463636364356264393537376336663961636530613766636566
+vault_td_dtsv_crypt_password: !vault |
   $ANSIBLE_VAULT;1.2;AES256;dtsv-dev
   37663062636264363661343664303536653930393430353735366135633739333732353937666362
   3164313666363530643666303430326334326462393665390a363831326239363032323939613732
@@ -17,7 +24,7 @@ vault_gd3_crypt_password: !vault |
   39313938373366623461636666393432333663663134396334353931353465393137366665363165
   64353236376133396364656561333962636635623832366461303831346338666364353239316634
   356138346235666165653061313636346364
-vault_gd3_crypt_password2: !vault |
+vault_td_dtsv_crypt_password2: !vault |
   $ANSIBLE_VAULT;1.2;AES256;dtsv-dev
   30383339356132613064653366633531663963343665636439343862653965366662353836646633
   6634346435313962396365396338633032663937616361370a386531663266353732643561346464
@@ -28,18 +35,19 @@ vault_gd3_crypt_password2: !vault |
   386631653433313336636339363839316266
 
 # Rclone Service Account Block
-DTSV_GD_service_account_remote: |
-  [GD3]
+td_dtsv_service_account_remote: |
+  [DTSV]
   type = drive
   scope = drive
   server_side_across_configs = true
-  service_account_file = {{ rclone_config_dir }}/DTSV_GD_service_account.json
+  service_account_file = /root/.config/rclone/DTSV_GD_service_account.json
+  team_drive = {{ vault_td_dtsv_id }}
 
-  [GD3_crypt]
+  [DTSV_crypt]
   type = crypt
-  remote = GD3:crypt
-  password = {{ vault_gd3_crypt_password }}
-  password2 = {{ vault_gd3_crypt_password2 }}
+  remote = DTSV:crypt
+  password = {{ vault_td_dtsv_crypt_password }}
+  password2 = {{ vault_td_dtsv_crypt_password2 }}
 
 # Rclone Exporter (same password see monitoring role)
 vault_rclone_rcd_pass: !vault |
diff --git a/roles/webserver/templates/rclone.conf.j2 b/roles/webserver/templates/rclone.conf.j2
index 9bfccaf..841b94f 100644
--- a/roles/webserver/templates/rclone.conf.j2
+++ b/roles/webserver/templates/rclone.conf.j2
@@ -1,3 +1,3 @@
 ## Managed by Ansible ##
 
-{{ DTSV_GD_service_account_remote }}
+{{ td_dtsv_service_account_remote }}