diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 19:28:06 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 19:28:06 -0700 |
| commit | 2c7da66570999dcd21f11f976dc6ec27d820f45c (patch) | |
| tree | b97dd9f25df691c66b2be31b658cc6fec638d47e /modules/youri-check | |
| parent | a69863ece1973cf3eae488f30c657b57dfb89779 (diff) | |
| download | puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar.gz puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar.bz2 puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar.xz puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.zip | |
Use @ when accessing variables in templates
Access without the @ symbol is the older method and is discouraged.
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 28028080..c2a97970 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 651da40c..5774423e 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 2cf598b5..c3edca69 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 |