diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /modules/youri-check | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
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.
Diffstat (limited to 'modules/youri-check')
| -rw-r--r-- | modules/youri-check/templates/9.conf | 12 | ||||
| -rw-r--r-- | modules/youri-check/templates/cauldron.conf | 14 | ||||
| -rw-r--r-- | modules/youri-check/templates/vhost_check.conf | 4 |
3 files changed, 15 insertions, 15 deletions
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 |