Use @ when accessing variables in templatesHEADmaster

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.

25 files changed, 66 insertions, 66 deletions

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
diff --git a/modules/bcd/templates/sudoers.bcd b/modules/bcd/templates/sudoers.bcd
index c597fe5c..c462bffd 100644
--- a/modules/bcd/templates/sudoers.bcd
+++ b/modules/bcd/templates/sudoers.bcd
@@ -7,4 +7,4 @@
 /usr/bin/urpmq, \
 /bin/rm
 
-%<%= isomakers_group %> ALL=(<%= scope.lookupvar('bcd::login') %>) SETENV: NOPASSWD: ALL
+%<%= @isomakers_group %> ALL=(<%= scope.lookupvar('bcd::login') %>) SETENV: NOPASSWD: ALL
diff --git a/modules/bcd/templates/vhost_bcd.conf b/modules/bcd/templates/vhost_bcd.conf
index 78528e48..c89955e2 100644
--- a/modules/bcd/templates/vhost_bcd.conf
+++ b/modules/bcd/templates/vhost_bcd.conf
@@ -1,8 +1,8 @@
-<Directory <%= location %>>
+<Directory <%= @location %>>
     AuthUserFile <%= scope.lookupvar('bcd::home') %>/htpasswd
     AuthGroupFile /dev/null
     AuthName "QA test isos, restricted access"
-    ErrorDocument 403  "For the password, please contact the QA team ( https://wiki.<%= domain %>/en/QA_Team )"
+    ErrorDocument 403  "For the password, please contact the QA team ( https://wiki.<%= @domain %>/en/QA_Team )"
 
     AuthType Basic
     require valid-user
diff --git a/modules/catdap/templates/catdap_local.yml b/modules/catdap/templates/catdap_local.yml
index b23ee46c..d982b40b 100644
--- a/modules/catdap/templates/catdap_local.yml
+++ b/modules/catdap/templates/catdap_local.yml
@@ -6,15 +6,15 @@ ldap_account = "cn=catdap-#{hostname},ou=System Accounts,#{dc_suffix}"
 
 organisation: Mageia
 apptitle: Mageia Identity Management
-emailfrom: noreply@<%= domain %>
+emailfrom: noreply@<%= @domain %>
 
 Model::Proxy:
-    base:      ou=People,<%= dc_suffix %>
+    base:      ou=People,<%= @dc_suffix %>
     dn:        <%= ldap_account %>
     password:  <%= scope.lookupvar("catdap::ldap_password") %>
 
 Model::User:
-    base:      <%= dc_suffix %>
+    base:      <%= @dc_suffix %>
     host:      <%= ldap_server %>
     start_tls: 1
 
@@ -26,8 +26,8 @@ authentication:
                 ldap_server: <%= ldap_server %>
                 binddn: <%= ldap_account %>
                 bindpw: <%= scope.lookupvar("catdap::ldap_password") %>
-                user_basedn: ou=People,<%= dc_suffix %>
-                role_basedn: <%= dc_suffix %>
+                user_basedn: ou=People,<%= @dc_suffix %>
+                role_basedn: <%= @dc_suffix %>
 
 register:
         login_regex: ^[a-z][a-z0-9]*$
diff --git a/modules/dashboard/templates/make_report b/modules/dashboard/templates/make_report
index 25c2f316..5da59617 100644
--- a/modules/dashboard/templates/make_report
+++ b/modules/dashboard/templates/make_report
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-dashboard_dir='<%= dashboard_dir %>'
-dashboard_wwwdir='<%= dashboard_wwwdir %>'
+dashboard_dir='<%= @dashboard_dir %>'
+dashboard_wwwdir='<%= @dashboard_wwwdir %>'
 
 cd "$dashboard_dir"
 /usr/bin/php ./make_report.php > "$dashboard_wwwdir/index.html"
diff --git a/modules/draklive/templates/sudoers.draklive b/modules/draklive/templates/sudoers.draklive
index 25cea69e..536e4e9f 100644
--- a/modules/draklive/templates/sudoers.draklive
+++ b/modules/draklive/templates/sudoers.draklive
@@ -1,3 +1,3 @@
-<%= login %> ALL=(root) NOPASSWD: /usr/sbin/draklive
-<%= login %> ALL=(root) NOPASSWD: /usr/bin/draklive2
-%<%= isomakers_group %> ALL=(<%= login %>) SETENV: NOPASSWD: ALL
+<%= @login %> ALL=(root) NOPASSWD: /usr/sbin/draklive
+<%= @login %> ALL=(root) NOPASSWD: /usr/bin/draklive2
+%<%= isomakers_group %> ALL=(<%= @login %>) SETENV: NOPASSWD: ALL
diff --git a/modules/git/templates/xinetd b/modules/git/templates/xinetd
index 2cbf78e3..654ae2be 100644
--- a/modules/git/templates/xinetd
+++ b/modules/git/templates/xinetd
@@ -4,10 +4,10 @@ service git
         type            = UNLISTED
         port            = 9418
         socket_type     = stream
-        server          = <%= lib_dir %>/git-core/git-daemon
+        server          = <%= @lib_dir %>/git-core/git-daemon
         wait            = no
         user            = nobody
-        server_args     = --inetd --verbose --export-all --base-path=<%= git_base_path %>
+        server_args     = --inetd --verbose --export-all --base-path=<%= @git_base_path %>
         log_on_failure  += HOST
         flags           = IPv6
 }
diff --git a/modules/gnupg/templates/batch b/modules/gnupg/templates/batch
index f4be84d9..d55bdd52 100644
--- a/modules/gnupg/templates/batch
+++ b/modules/gnupg/templates/batch
@@ -1,8 +1,8 @@
 %echo Generating a standard key
-Key-Type: <%= key_type %>
-Key-Length: <%= key_length %>
-Name-Real: <%= key_name %>
-Name-Email: <%= email %>
-Expire-Date: <%= expire_date %>
+Key-Type: <%= @key_type %>
+Key-Length: <%= @key_length %>
+Name-Real: <%= @key_name %>
+Name-Email: <%= @email %>
+Expire-Date: <%= @expire_date %>
 %commit
 %echo done
diff --git a/modules/icecream/templates/sysconfig b/modules/icecream/templates/sysconfig
index 36c511f2..8a5bc92c 100644
--- a/modules/icecream/templates/sysconfig
+++ b/modules/icecream/templates/sysconfig
@@ -55,7 +55,7 @@ ICECREAM_NETNAME=""
 # If the daemon can't find the scheduler by broadcast (e.g. because 
 # of a firewall) you can specify it.
 #
-ICECREAM_SCHEDULER_HOST="<%= host %>"
+ICECREAM_SCHEDULER_HOST="<%= @host %>"
 
 #
 ## Type: string
diff --git a/modules/ii/templates/ii_wrapper.pl b/modules/ii/templates/ii_wrapper.pl
index 5e5cc65e..68128314 100644
--- a/modules/ii/templates/ii_wrapper.pl
+++ b/modules/ii/templates/ii_wrapper.pl
@@ -3,8 +3,8 @@ use warnings;
 use strict;
 use POSIX;
 use Proc::Daemon;
-my $nick = "<%= nick %>";
-my $server = "<%= server %>";
+my $nick = "<%= @nick %>";
+my $server = "<%= @server %>";
 
 
 Proc::Daemon::Init();
diff --git a/modules/libvirtd/templates/50-template-libvirt-remote-access.pkla b/modules/libvirtd/templates/50-template-libvirt-remote-access.pkla
index 201e89a0..8806e3cb 100644
--- a/modules/libvirtd/templates/50-template-libvirt-remote-access.pkla
+++ b/modules/libvirtd/templates/50-template-libvirt-remote-access.pkla
@@ -1,5 +1,5 @@
 [Remote libvirt SSH access]
-Identity=unix-user:root;unix-group:<%= name %>
+Identity=unix-user:root;unix-group:<%= @name %>
 Action=org.libvirt.unix.manage
 ResultAny=yes
 ResultInactive=yes
diff --git a/modules/mga-mirrors/templates/mga-mirrors.ini b/modules/mga-mirrors/templates/mga-mirrors.ini
index b0703f28..b438edd1 100644
--- a/modules/mga-mirrors/templates/mga-mirrors.ini
+++ b/modules/mga-mirrors/templates/mga-mirrors.ini
@@ -1,4 +1,4 @@
 [db]
-pgconn=host=pg.<%= domain %>;dbname=mirrors
+pgconn=host=pg.<%= @domain %>;dbname=mirrors
 user=mirrors
-password=<%= pgsql_password %>
+password=<%= @pgsql_password %>
diff --git a/modules/mgasoft/templates/mgasoft.conf b/modules/mgasoft/templates/mgasoft.conf
index eaf6e416..81cce013 100644
--- a/modules/mgasoft/templates/mgasoft.conf
+++ b/modules/mgasoft/templates/mgasoft.conf
@@ -1,5 +1,5 @@
 svn_soft=svn+ssh://svn.mageia.org/svn/soft
-anonsvn_soft=<%= anonsvn_soft %>
-svn_soft_publish=<%= svn_soft_publish %>
-pubinfodir=<%= pubinfodir %>
-pubmirrordir=<%= pubmirrordir %>
+anonsvn_soft=<%= @anonsvn_soft %>
+svn_soft_publish=<%= @svn_soft_publish %>
+pubinfodir=<%= @pubinfodir %>
+pubmirrordir=<%= @pubmirrordir %>
diff --git a/modules/mirror/templates/mirrordir b/modules/mirror/templates/mirrordir
index b8bf9fb6..9cf09650 100644
--- a/modules/mirror/templates/mirrordir
+++ b/modules/mirror/templates/mirrordir
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-remoteurl="<%= remoteurl%>"
-localdir="<%= localdir %>"
-rsync_options="<%= rsync_options %>"
-lockfile="<%= lockfile %>"
+remoteurl="<%= @remoteurl%>"
+localdir="<%= @localdir %>"
+rsync_options="<%= @rsync_options %>"
+lockfile="<%= @lockfile %>"
 
 if [ -f "$lockfile" ]; then
     # show error message when run from command line
diff --git a/modules/mirrorbrain/templates/mirrorbrain.conf b/modules/mirrorbrain/templates/mirrorbrain.conf
index 9f7002d1..94bef340 100644
--- a/modules/mirrorbrain/templates/mirrorbrain.conf
+++ b/modules/mirrorbrain/templates/mirrorbrain.conf
@@ -3,9 +3,9 @@ instances = main
 
 [main]
 dbuser   = mirrorbrain
-dbpass   = <%= mb_pgsql_pw %>
+dbpass   = <%= @mb_pgsql_pw %>
 dbdriver = postgresql
-dbhost   = pgsql.<%= domain %>
+dbhost   = pgsql.<%= @domain %>
 # optional: dbport = ...
 dbname   = mirrorbrain
 
diff --git a/modules/openssh/templates/ldap-sshkey2file.py b/modules/openssh/templates/ldap-sshkey2file.py
index 6718b053..934e2865 100755
--- a/modules/openssh/templates/ldap-sshkey2file.py
+++ b/modules/openssh/templates/ldap-sshkey2file.py
@@ -15,7 +15,7 @@ except ImportError:
     print("Please install python-ldap before running this program")
     sys.exit(1)
 
-basedn = "<%= dc_suffix %>"
+basedn = "<%= @dc_suffix %>"
 peopledn = f"ou=people,{basedn}"
 <%-
   ldap_servers.map! { |l| "'ldaps://#{l}'" }
@@ -24,9 +24,9 @@ uris = [<%= ldap_servers.join(", ") %>]
 random.shuffle(uris)
 uri = " ".join(uris)
 timeout = 5
-binddn = f"cn=<%= fqdn %>,ou=Hosts,{basedn}"
-ldap_secret_file = "<%= ldap_pwfile %>"
-nslcd_conf_file = "<%= nslcd_conf_file %>"
+binddn = f"cn=<%= @fqdn %>,ou=Hosts,{basedn}"
+ldap_secret_file = "<%= @ldap_pwfile %>"
+nslcd_conf_file = "<%= @nslcd_conf_file %>"
 # filter out disabled accounts also
 # too bad uidNumber doesn't support >= filters
 objfilter = "(&(objectClass=inetOrgPerson)(objectClass=ldapPublicKey)(objectClass=posixAccount)(sshPublicKey=*))"
diff --git a/modules/rsnapshot/templates/rsnapshot.conf b/modules/rsnapshot/templates/rsnapshot.conf
index 2ec5edcf..4eeee4d0 100644
--- a/modules/rsnapshot/templates/rsnapshot.conf
+++ b/modules/rsnapshot/templates/rsnapshot.conf
@@ -24,7 +24,7 @@ config_version	1.2
 
 # All snapshots will be stored under this root directory.
 #
-snapshot_root	<%= snapshot_root %>
+snapshot_root	<%= @snapshot_root %>
 
 # If no_create_root is enabled, rsnapshot will not automatically create the
 # snapshot_root directory. This is particularly useful if you are backing
diff --git a/modules/ssmtp/templates/ssmtp.conf b/modules/ssmtp/templates/ssmtp.conf
index b535bc29..d7a9125f 100644
--- a/modules/ssmtp/templates/ssmtp.conf
+++ b/modules/ssmtp/templates/ssmtp.conf
@@ -1,9 +1,9 @@
-root=mageia-sysadm@<%= domain %>
+root=mageia-sysadm@<%= @domain %>
 
-mailhub=mx.<%= domain %>
+mailhub=mx.<%= @domain %>
 
 rewriteDomain=
 
 # The full hostname
-hostname=<%= fqdn %>
+hostname=<%= @fqdn %>
 
diff --git a/modules/transifex/templates/20-engines.conf b/modules/transifex/templates/20-engines.conf
index 6523dfd4..620a9556 100644
--- a/modules/transifex/templates/20-engines.conf
+++ b/modules/transifex/templates/20-engines.conf
@@ -9,8 +9,8 @@ DATABASE_ENGINE = 'postgresql_psycopg2'
 DATABASE_NAME = 'transifex'
 # The following are not used for sqlite3
 DATABASE_USER = 'transifex'
-DATABASE_PASSWORD = '<%= pgsql_password %>'
-DATABASE_HOST = 'pgsql.<%= domain %>'           # Set to empty string for local socket
+DATABASE_PASSWORD = '<%= @pgsql_password %>'
+DATABASE_HOST = 'pgsql.<%= @domain %>'           # Set to empty string for local socket
 DATABASE_PORT = ''             # Set to empty string for default
 
 ## Caching (optional)
diff --git a/modules/transifex/templates/30-site.conf b/modules/transifex/templates/30-site.conf
index 4d4e9e4c..3c386354 100644
--- a/modules/transifex/templates/30-site.conf
+++ b/modules/transifex/templates/30-site.conf
@@ -1,7 +1,7 @@
 # Sites
 SITE_ID = 1
 # Your site's domain. This is used only in this file.
-SITE_DOMAIN = '<%= domain %>'
+SITE_DOMAIN = '<%= @domain %>'
 
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
diff --git a/modules/transifex/templates/45-ldap.conf b/modules/transifex/templates/45-ldap.conf
index dd215dc9..2532edf5 100644
--- a/modules/transifex/templates/45-ldap.conf
+++ b/modules/transifex/templates/45-ldap.conf
@@ -17,16 +17,16 @@ from django_auth_ldap.config import LDAPSearch, GroupOfNamesType
 
 
 # Baseline configuration.
-AUTH_LDAP_SERVER_URI = "ldap://ldap.<%= domain %> ldap://ldap-slave-1.<%= domain %>"
+AUTH_LDAP_SERVER_URI = "ldap://ldap.<%= @domain %> ldap://ldap-slave-1.<%= @domain %>"
 
-AUTH_LDAP_BIND_DN = "cn=transifex-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>"
-AUTH_LDAP_BIND_PASSWORD = "<%= ldap_password %>"
+AUTH_LDAP_BIND_DN = "cn=transifex-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %>"
+AUTH_LDAP_BIND_PASSWORD = "<%= @ldap_password %>"
 
-AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= dc_suffix %> ",
+AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= @dc_suffix %> ",
     ldap.SCOPE_SUBTREE, "(|(uid=%(user)s)(mail=%(user)s))")
 
 # Set up the basic group parameters.
-AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= dc_suffix %>",
+AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= @dc_suffix %>",
     ldap.SCOPE_SUBTREE, "(objectClass=groupOfNames)"
 )
 AUTH_LDAP_GROUP_TYPE = GroupOfNamesType(name_attr="cn")
@@ -42,7 +42,7 @@ AUTH_LDAP_USER_ATTR_MAP = {
 }
 
 AUTH_LDAP_USER_FLAGS_BY_GROUP = {
-    "is_active": "cn=mga-i18n,ou=Group,<%= dc_suffix %>",
-    "is_staff": "cn=mga-i18n-committers,ou=Group,<%= dc_suffix %>",
-    "is_superuser": "cn=mga-sysadmin,ou=Group,<%= dc_suffix %>"
+    "is_active": "cn=mga-i18n,ou=Group,<%= @dc_suffix %>",
+    "is_staff": "cn=mga-i18n-committers,ou=Group,<%= @dc_suffix %>",
+    "is_superuser": "cn=mga-sysadmin,ou=Group,<%= @dc_suffix %>"
 }
diff --git a/modules/transifex/templates/50-project.conf b/modules/transifex/templates/50-project.conf
index 17281d9a..013741b2 100644
--- a/modules/transifex/templates/50-project.conf
+++ b/modules/transifex/templates/50-project.conf
@@ -40,7 +40,7 @@ MIDDLEWARE_CLASSES = [
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = [
-    '<%= templates_dir %>',
+    '<%= @templates_dir %>',
     os.path.join(TX_ROOT, 'templates'),
 ]
 
diff --git a/modules/xinetd/templates/port_forward b/modules/xinetd/templates/port_forward
index 1b76b0e1..99518dcd 100644
--- a/modules/xinetd/templates/port_forward
+++ b/modules/xinetd/templates/port_forward
@@ -1,15 +1,15 @@
-service <%= name %>
+service <%= @name %>
 {
         disable         = no
         type            = UNLISTED
-<%- if proto == 'tcp' -%>
+<%- if @proto == 'tcp' -%>
         socket_type     = stream
 <%- else -%>
         socket_type     = dgram
 <%- end -%>
-        protocol        = <%= proto %>
+        protocol        = <%= @proto %>
         user            = nobody
         wait            = no
-        redirect        = <%= target_ip %> <%= target_port %>
-        port            = <%= port %>
+        redirect        = <%= @target_ip %> <%= @target_port %>
+        port            = <%= @port %>
 }