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/bugzilla/templates/params | |
| 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/bugzilla/templates/params')
| -rw-r--r-- | modules/bugzilla/templates/params | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/bugzilla/templates/params b/modules/bugzilla/templates/params index a2561d6a..2e71a39d 100644 --- a/modules/bugzilla/templates/params +++ b/modules/bugzilla/templates/params @@ -1,9 +1,9 @@ %param = ( - 'LDAPBaseDN' => 'ou=People,<%= @dc_suffix %>', - 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= @dc_suffix %>:<%= @ldap_password %>', + 'LDAPBaseDN' => 'ou=People,<%= dc_suffix %>', + 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= ldap_password %>', 'LDAPfilter' => '', 'LDAPmailattribute' => 'mail', - 'LDAPserver' => 'ldap.<%= @domain %>', + 'LDAPserver' => 'ldap.<%= domain %>', 'LDAPstarttls' => '1', 'LDAPuidattribute' => 'uid', 'RADIUS_NAS_IP' => '', @@ -45,7 +45,7 @@ 'emailregexp' => '^[\\w\\.\\+\\-=]+@[\\w\\.\\-]+\\.[\\w\\-]+$', 'emailregexpdesc' => 'A legal address must contain exactly one \'@\', and at least one \'.\' after the @.', 'emailsuffix' => '', - 'globalwatchers' => 'bugs@ml.<%= @domain %>', + 'globalwatchers' => 'bugs@ml.<%= domain %>', 'inbound_proxies' => '', 'insidergroup' => 'secteam', 'letsubmitterchoosemilestone' => 1, @@ -53,8 +53,8 @@ 'lxr_root' => '', 'lxr_url' => '', 'mail_delivery_method' => 'SMTP', - 'mailfrom' => 'bugzilla_noreply@ml.<%= @domain %>', - 'maintainer' => 'sysadmin@group.<%= @domain %>', + 'mailfrom' => 'bugzilla_noreply@ml.<%= domain %>', + 'maintainer' => 'sysadmin@group.<%= domain %>', 'makeproductgroups' => 0, 'maxattachmentsize' => '1000', 'maxlocalattachment' => '0', @@ -88,11 +88,11 @@ 'smtpserver' => 'localhost', 'specific_search_allow_empty_words' => 1, 'ssl_redirect' => 1, - 'sslbase' => 'https://bugs.<%= @domain %>/', + 'sslbase' => 'https://bugs.<%= domain %>/', 'strict_isolation' => 0, 'timetrackinggroup' => '', 'upgrade_notification' => 'latest_stable_release', - 'urlbase' => 'https://bugs.<%= @domain %>/', + 'urlbase' => 'https://bugs.<%= domain %>/', 'use_mailer_queue' => 0, 'use_see_also' => 1, 'usebugaliases' => 0, |