diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-11-20 15:36:06 -0800 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-11-20 15:36:06 -0800 |
| commit | 727145ed50d60655590c0199656c2378d32bfffc (patch) | |
| tree | 3a95f1ba2f64656879be8c857470155c7bde398d /modules/bcd | |
| parent | 7766681f7ef95a3ad7e6c7c1a26f829ec02d776b (diff) | |
| download | puppet-master.tar puppet-master.tar.gz puppet-master.tar.bz2 puppet-master.tar.xz puppet-master.zip | |
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.
Diffstat (limited to 'modules/bcd')
| -rw-r--r-- | modules/bcd/templates/sudoers.bcd | 2 | ||||
| -rw-r--r-- | modules/bcd/templates/vhost_bcd.conf | 4 |
2 files changed, 3 insertions, 3 deletions
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 |