From 727145ed50d60655590c0199656c2378d32bfffc Mon Sep 17 00:00:00 2001
From: Dan Fandrich <danf@mageia.org>
Date: Wed, 20 Nov 2024 15:36:06 -0800
Subject: Use @ when accessing variables in templates

Access without the @ symbol is the older method and is discouraged.
This take leaves alone accesses of variables that are defined within the
template, which don't seem to allow an @.

This is the second batch of files.
---
 deployment/main_mirror/templates/rsyncd.conf   | 6 +++---
 deployment/releasekey/templates/sign_checksums | 2 +-
 deployment/reports/templates/socket.yaml       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'deployment')

diff --git a/deployment/main_mirror/templates/rsyncd.conf b/deployment/main_mirror/templates/rsyncd.conf
index b9186083..3d0f28a8 100644
--- a/deployment/main_mirror/templates/rsyncd.conf
+++ b/deployment/main_mirror/templates/rsyncd.conf
@@ -9,8 +9,8 @@ gid = nogroup
     hosts allow = \
         10.42.0.0/24 \
         2a02:2178:2:7::/64 \
-        rabbit.<%= domain %> \
-        sucuk.<%= domain %> \
+        rabbit.<%= @domain %> \
+        sucuk.<%= @domain %> \
         distrib-coffee.ipsl.jussieu.fr \
         ftp.proxad.net \
         jobbot0.ibiblio.org \
@@ -27,4 +27,4 @@ gid = nogroup
 [git]
     path = /git
     comment = Mageia Git repos
-    hosts allow = sucuk.<%= domain %>
+    hosts allow = sucuk.<%= @domain %>
diff --git a/deployment/releasekey/templates/sign_checksums b/deployment/releasekey/templates/sign_checksums
index 9483a1c9..5edf7e57 100644
--- a/deployment/releasekey/templates/sign_checksums
+++ b/deployment/releasekey/templates/sign_checksums
@@ -7,5 +7,5 @@ fi
 directory=$1
 cd "$directory"
 for chksum in *.md5 *.sha3 *.sha512; do
-	gpg --homedir "<%= sign_keydir %>" --yes --sign "$chksum"
+	gpg --homedir "<%= @sign_keydir %>" --yes --sign "$chksum"
 done
diff --git a/deployment/reports/templates/socket.yaml b/deployment/reports/templates/socket.yaml
index 075d7a9f..6b0a8b33 100644
--- a/deployment/reports/templates/socket.yaml
+++ b/deployment/reports/templates/socket.yaml
@@ -1,2 +1,2 @@
 ---
-socket_path: /var/lib/ii/<%= nick %>/<%= server %>/<%= channel %>/in
+socket_path: /var/lib/ii/<%= @nick %>/<%= @server %>/<%= @channel %>/in
-- 
cgit v1.2.1