Revert "Use @ when accessing variables in templates"

Variables defined within a template can't be accessed with @.  This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.

11 files changed, 55 insertions, 55 deletions

diff --git a/deployment/common/templates/i18n b/deployment/common/templates/i18n
index a96665e7..b85efe78 100644
--- a/deployment/common/templates/i18n
+++ b/deployment/common/templates/i18n
@@ -3,18 +3,18 @@
 locale = 'en_US.UTF-8' 
 
 -%>
-LC_TELEPHONE=<%= @locale %>
-LC_CTYPE=<%= @locale %>
-LANGUAGE=<%= @locale %>:<%= (@locale).split('.')[0] %>:<%= (@locale).split('.')[0].split('_')[0] %>
-LC_MONETARY=<%= @locale %>
-LC_ADDRESS=<%= @locale %>
-LC_COLLATE=<%= @locale %>
-LC_PAPER=<%= @locale %>
-LC_NAME=<%= @locale %>
-LC_NUMERIC=<%= @locale %>
+LC_TELEPHONE=<%= locale %>
+LC_CTYPE=<%= locale %>
+LANGUAGE=<%= locale %>:<%= locale.split('.')[0] %>:<%= locale.split('.')[0].split('_')[0] %>
+LC_MONETARY=<%= locale %>
+LC_ADDRESS=<%= locale %>
+LC_COLLATE=<%= locale %>
+LC_PAPER=<%= locale %>
+LC_NAME=<%= locale %>
+LC_NUMERIC=<%= locale %>
 SYSFONT=lat0-16
-LC_MEASUREMENT=<%= @locale %>
-LC_TIME=<%= @locale %>
-LANG=<%= @locale %>
-LC_IDENTIFICATION=<%= @locale %>
-LC_MESSAGES=<%= @locale %>
+LC_MEASUREMENT=<%= locale %>
+LC_TIME=<%= locale %>
+LANG=<%= locale %>
+LC_IDENTIFICATION=<%= locale %>
+LC_MESSAGES=<%= locale %>
diff --git a/deployment/common/templates/locale.conf b/deployment/common/templates/locale.conf
index 37520558..e9fc2e06 100644
--- a/deployment/common/templates/locale.conf
+++ b/deployment/common/templates/locale.conf
@@ -3,18 +3,18 @@
 locale = 'en_US.UTF-8'
 
 -%>
-LC_TELEPHONE=<%= @locale %>
-LC_CTYPE=<%= @locale %>
-LANGUAGE=<%= @locale %>:<%= @locale.split('.')[0] %>:<%= @locale.split('.')[0].split('_')[0] %>
-LC_MONETARY=<%= @locale %>
-LC_ADDRESS=<%= @locale %>
-LC_COLLATE=<%= @locale %>
-LC_PAPER=<%= @locale %>
-LC_NAME=<%= @locale %>
-LC_NUMERIC=<%= @locale %>
-LC_MEASUREMENT=<%= @locale %>
-LC_TIME=<%= @locale %>
-LANG=<%= @locale %>
-LC_IDENTIFICATION=<%= @locale %>
-LC_MESSAGES=<%= @locale %>
+LC_TELEPHONE=<%= locale %>
+LC_CTYPE=<%= locale %>
+LANGUAGE=<%= locale %>:<%= locale.split('.')[0] %>:<%= locale.split('.')[0].split('_')[0] %>
+LC_MONETARY=<%= locale %>
+LC_ADDRESS=<%= locale %>
+LC_COLLATE=<%= locale %>
+LC_PAPER=<%= locale %>
+LC_NAME=<%= locale %>
+LC_NUMERIC=<%= locale %>
+LC_MEASUREMENT=<%= locale %>
+LC_TIME=<%= locale %>
+LANG=<%= locale %>
+LC_IDENTIFICATION=<%= locale %>
+LC_MESSAGES=<%= locale %>
 
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone
index c2f24166..1dba603e 100644
--- a/deployment/dns/templates/mageia.org.zone
+++ b/deployment/dns/templates/mageia.org.zone
@@ -49,27 +49,27 @@ group  IN      MX 20   neru.mageia.org.
     nodes_txt += nodename + ' IN TXT "v=spf1 ' + spf + ' mx:mageia.org ~all" ' + "\n"
   }
 -%>
-<%= @nodes_txt %>
+<%= nodes_txt %>
 
 ;SSHFP
 
 ; sucuk
-ns0         IN  A       <%= @nodes['sucuk']['ipv4'] %>
-ns0         IN  AAAA    <%= @nodes['sucuk']['ipv6'] %>
+ns0         IN  A       <%= nodes['sucuk']['ipv4'] %>
+ns0         IN  AAAA    <%= nodes['sucuk']['ipv6'] %>
 ; neru
-ns1         IN  A       <%= @nodes['neru']['ipv4'] %>
-ns1         IN  AAAA    <%= @nodes['neru']['ipv6'] %>
+ns1         IN  A       <%= nodes['neru']['ipv4'] %>
+ns1         IN  AAAA    <%= nodes['neru']['ipv6'] %>
 
 ; mageia.org set to IP of neru
-mageia.org.	IN	A	<%= @nodes['neru']['ipv4'] %>
-mageia.org.	IN	AAAA	<%= @nodes['neru']['ipv6'] %>
+mageia.org.	IN	A	<%= nodes['neru']['ipv4'] %>
+mageia.org.	IN	AAAA	<%= nodes['neru']['ipv6'] %>
 
 ; madb on mageia.madb.org
 madb        IN  A       163.172.201.211
 
 ; since we have a subdomain, we cannot use a CNAME
-ml          IN  A       <%= @nodes['sucuk']['ipv4'] %>
-ml          IN  AAAA    <%= @nodes['sucuk']['ipv6'] %>
+ml          IN  A       <%= nodes['sucuk']['ipv4'] %>
+ml          IN  AAAA    <%= nodes['sucuk']['ipv6'] %>
 
 ; aliases
 ldap-slave-1 IN CNAME neru
@@ -108,7 +108,7 @@ forum       IN CNAME sucuk
 bugs        IN CNAME sucuk
 check       IN CNAME sucuk
 gitweb      IN CNAME sucuk
-identity    IN  A       <%= @nodes['sucuk']['ipv4'] %>
+identity    IN  A       <%= nodes['sucuk']['ipv4'] %>
 identity-trunk IN CNAME sucuk
 mirrors     IN CNAME sucuk
 nav         IN CNAME sucuk
diff --git a/deployment/main_mirror/templates/rsyncd.conf b/deployment/main_mirror/templates/rsyncd.conf
index b023e8e2..3053251d 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 \
         distribipsl.aero.jussieu.fr \
         jobbot0.ibiblio.org \
@@ -52,4 +52,4 @@ gid = nogroup
 [git]
     path = /git
     comment = Mageia Git repos
-    hosts allow = sucuk.<%= @domain %>
+    hosts allow = sucuk.<%= domain %>
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 7c5f9cc3..6b7ceb2b 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -617,9 +617,9 @@ class mga_buildsystem::config {
     }
     $checks_tag_options = {
         'tags' => {
-            'release'      => inline_template("^[^~]*<%= @std_macros['distsuffix'] %>\\d+"),
-            'distribution' => inline_template("^<%= @std_macros['distribution'] %>"),
-            'vendor'       => inline_template("^<%= @std_macros['vendor'] %>$"),
+            'release'      => inline_template("^[^~]*<%= std_macros['distsuffix'] %>\\d+"),
+            'distribution' => inline_template("^<%= std_macros['distribution'] %>"),
+            'vendor'       => inline_template("^<%= std_macros['vendor'] %>$"),
         },
     }
     class { 'buildsystem::var::youri':
diff --git a/deployment/releasekey/templates/sign_checksums b/deployment/releasekey/templates/sign_checksums
index 5edf7e57..9483a1c9 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 6b0a8b33..075d7a9f 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/deployment/websites/templates/vhost_meetbot.conf b/deployment/websites/templates/vhost_meetbot.conf
index 40a0f92a..a6f812c5 100644
--- a/deployment/websites/templates/vhost_meetbot.conf
+++ b/deployment/websites/templates/vhost_meetbot.conf
@@ -1,6 +1,6 @@
 <VirtualHost *:80>
     ServerAdmin sysadm@mageia.org
-    ServerName meetbot.<%= @domain %>
+    ServerName meetbot.<%= domain %>
     DocumentRoot <%= scope.lookupvar("websites::meetbot::vhostdir") %>
 
     CustomLog /var/log/httpd/access_meetbot_log combined
@@ -17,7 +17,7 @@
 
 <VirtualHost *:443>
     ServerAdmin sysadm@mageia.org
-    ServerName meetbot.<%= @domain %>
+    ServerName meetbot.<%= domain %>
     DocumentRoot <%= scope.lookupvar("websites::meetbot::vhostdir") %>
 
     CustomLog /var/log/httpd/access_meetbot_log combined
diff --git a/deployment/websites/templates/vhost_static.conf b/deployment/websites/templates/vhost_static.conf
index fcadc425..d250a712 100644
--- a/deployment/websites/templates/vhost_static.conf
+++ b/deployment/websites/templates/vhost_static.conf
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-    ServerName static.<%= @domain %>
+    ServerName static.<%= domain %>
 
     DocumentRoot <%= scope.lookupvar("websites::static::vhostdir") %>
     CustomLog /var/log/httpd/static_log combined
@@ -40,7 +40,7 @@
 </VirtualHost>
 
 <VirtualHost *:443>
-    ServerName static.<%= @domain %>
+    ServerName static.<%= domain %>
 
     DocumentRoot <%= scope.lookupvar("websites::static::vhostdir") %>
     CustomLog /var/log/httpd/static_log combined
diff --git a/deployment/wikis/templates/wiki_settings b/deployment/wikis/templates/wiki_settings
index ec6e647d..16d9245d 100644
--- a/deployment/wikis/templates/wiki_settings
+++ b/deployment/wikis/templates/wiki_settings
@@ -13,7 +13,7 @@ $wgScriptPath = "/mw-$wgLanguageCode";
 $wgArticlePath = "/$wgLanguageCode/$1";
 $wgUsePathInfo = true;
 $wgStylePath = "$wgScriptPath/skins";
-$wgStyleDirectory = '<%= @wikis_templates %>/skins';
+$wgStyleDirectory = '<%= wikis_templates %>/skins';
 $wgLogo = "";
 $wgDefaultSkin = 'vector';
 $wgFavicon = '/mw-en/skins/cavendish/favicon.png';
diff --git a/deployment/wikis/templates/wiki_vhost.conf b/deployment/wikis/templates/wiki_vhost.conf
index 2e0a1c95..d4e5e0a2 100644
--- a/deployment/wikis/templates/wiki_vhost.conf
+++ b/deployment/wikis/templates/wiki_vhost.conf
@@ -1,4 +1,4 @@
-<Directory <%= @wikis_root %>>
+<Directory <%= wikis_root %>>
   Options +FollowSymLinks
 </Directory>
 
@@ -7,11 +7,11 @@ RewriteRule ^/?$ /en/ [R]
 
 <%- for lang in wiki_languages -%>
 
-<Directory <%= @wikis_root %>/<%= @lang %>/images>
+<Directory <%= wikis_root %>/<%= lang %>/images>
   SetHandler default-handler
 </Directory>
 
-Alias /<%= @lang %> <%= @wikis_root %>/<%= @lang %>/index.php
-Alias /mw-<%= @lang %> <%= @wikis_root %>/<%= @lang %>
+Alias /<%= lang %> <%= wikis_root %>/<%= lang %>/index.php
+Alias /mw-<%= lang %> <%= wikis_root %>/<%= lang %>
 
 <%- end -%>