From 7de3ae47c60c579a83b9733de1a18aa705c8b1d8 Mon Sep 17 00:00:00 2001
From: Oli <oliver@opitz.ws>
Date: Thu, 5 Jun 2025 22:55:30 +0000
Subject: [PATCH] use metrics instead of rc

---
 .../templates/rclone_mount_nextcloud.service.j2          | 8 +-------
 roles/rclone/vars/main.yml                               | 9 ---------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2 b/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2
index 5577a97..4b33a0d 100644
--- a/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2
+++ b/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2
@@ -5,8 +5,6 @@ Description = rclone crypt mount {{ nextcloud_rclone_mount_dir }}
 After = network-online.target
 
 [Service]
-Environment=RCLONE_RCD_USER=rclone
-Environment=RCLONE_RCD_PASSWORD={{ vault_rclone_rcd_pass }}
 Type=notify
 ExecStart=/usr/bin/rclone mount DTSV_crypt:cloud_data {{ nextcloud_rclone_mount_dir }} \
         --devname rclone \
@@ -33,11 +31,7 @@ ExecStart=/usr/bin/rclone mount DTSV_crypt:cloud_data {{ nextcloud_rclone_mount_
         --cache-dir={{ rclone_cache_dir }} \
         --log-file={{ rclone_log_dir }}/mount_nextcloud.log \
         --log-level=INFO \
-        --rc \
-        --rc-addr "0.0.0.0:5572" \
-        --rc-enable-metrics \
-	--rc-user $RCLONE_RCD_USER \
-	--rc-pass $RCLONE_RCD_PASSWORD \
+        --metrics-addr "0.0.0.0:5573" \
         --user-agent "{{ rclone_user_agent_gd }}"
 ExecStop=/bin/fusermount -u -z {{ nextcloud_rclone_mount_dir }}
 Restart=on-failure
diff --git a/roles/rclone/vars/main.yml b/roles/rclone/vars/main.yml
index b921cf6..b6f4375 100644
--- a/roles/rclone/vars/main.yml
+++ b/roles/rclone/vars/main.yml
@@ -48,12 +48,3 @@ td_dtsv_service_account_remote: |
   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 |
-  $ANSIBLE_VAULT;1.2;AES256;dtsv-dev
-  34616137336639363734323532366663626166336638356538663534346530636564333066636337
-  6636626538653634383063616532393461393036383464620a613765363037306365666236396661
-  65356565383436383664356338333266353962396239316533303330626335303961383066633066
-  3032623266653639340a376361376361373235373939623137633630666333383237363138303933
-  66333735646465306165396536396166616462633766333732323965363566656132