From f5b2645d869b76598c18527d388ed76719c06bdd Mon Sep 17 00:00:00 2001
From: Dan Fandrich <danf@mageia.org>
Date: Fri, 4 Oct 2024 21:44:50 -0700
Subject: 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.
---
 modules/youri-check/templates/9.conf           | 12 ++++++------
 modules/youri-check/templates/cauldron.conf    | 14 +++++++-------
 modules/youri-check/templates/vhost_check.conf |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'modules/youri-check')

diff --git a/modules/youri-check/templates/9.conf b/modules/youri-check/templates/9.conf
index c2a97970..28028080 100644
--- a/modules/youri-check/templates/9.conf
+++ b/modules/youri-check/templates/9.conf
@@ -10,15 +10,15 @@ resultset:
     class: Youri::Check::Resultset::DBI
     options:
         driver: Pg
-        host: <%= @pgsql_server %>;sslmode=require
-        base: <%= @pgsql_db %>
-        user: <%= @pgsql_user %>
-        pass: <%= @pgsql_password %>
+        host: <%= pgsql_server %>;sslmode=require
+        base: <%= pgsql_db %>
+        user: <%= pgsql_user %>
+        pass: <%= pgsql_password %>
 
 resolver:
     class: Youri::Check::Maintainer::Resolver::CGI
     options:
-        url: https://pkgsubmit.<%= @domain %>/data/maintdb.txt
+        url: https://pkgsubmit.<%= domain %>/data/maintdb.txt
         exceptions:
             - nobody
 
@@ -36,7 +36,7 @@ reports:
     file:
         class: Youri::Check::Report::File
         options:
-            to: <%= @outdir %>
+            to: <%= outdir %>
             global: 1
             individual: 1
             formats:
diff --git a/modules/youri-check/templates/cauldron.conf b/modules/youri-check/templates/cauldron.conf
index 5774423e..651da40c 100644
--- a/modules/youri-check/templates/cauldron.conf
+++ b/modules/youri-check/templates/cauldron.conf
@@ -12,15 +12,15 @@ resultset:
     class: Youri::Check::Resultset::DBI
     options:
         driver: Pg
-        host: <%= @pgsql_server %>;sslmode=require
-        base: <%= @pgsql_db %>
-        user: <%= @pgsql_user %>
-        pass: <%= @pgsql_password %>
+        host: <%= pgsql_server %>;sslmode=require
+        base: <%= pgsql_db %>
+        user: <%= pgsql_user %>
+        pass: <%= pgsql_password %>
 
 resolver:
     class: Youri::Check::Maintainer::Resolver::CGI
     options:
-        url: https://pkgsubmit.<%= @domain %>/data/maintdb.txt
+        url: https://pkgsubmit.<%= domain %>/data/maintdb.txt
         exceptions:
             - nobody
 
@@ -278,7 +278,7 @@ tests:
     age:
         class: Youri::Check::Test::Age
         options:
-            max: <%= @max_days %> days
+            max: <%= max_days %> days
             pattern: "%d days"
 
 # reports definitions
@@ -286,7 +286,7 @@ reports:
     file:
         class: Youri::Check::Report::File
         options:
-            to: <%= @outdir %>
+            to: <%= outdir %>
             global: 1
             individual: 1
             formats:
diff --git a/modules/youri-check/templates/vhost_check.conf b/modules/youri-check/templates/vhost_check.conf
index c3edca69..2cf598b5 100644
--- a/modules/youri-check/templates/vhost_check.conf
+++ b/modules/youri-check/templates/vhost_check.conf
@@ -1,2 +1,2 @@
-Header set Access-Control-Allow-Origin "http://pkgsubmit.<%= @domain %>"
-Header set Access-Control-Allow-Origin "https://pkgsubmit.<%= @domain %>" env=HTTPS
+Header set Access-Control-Allow-Origin "http://pkgsubmit.<%= domain %>"
+Header set Access-Control-Allow-Origin "https://pkgsubmit.<%= domain %>" env=HTTPS
-- 
cgit v1.2.1