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.

4 files changed, 18 insertions, 18 deletions

diff --git a/modules/bugzilla/templates/localconfig b/modules/bugzilla/templates/localconfig
index 3f5b4a7e..61935552 100644
--- a/modules/bugzilla/templates/localconfig
+++ b/modules/bugzilla/templates/localconfig
@@ -64,7 +64,7 @@ $db_user = 'bugs';
 # If you use apostrophe (') or a backslash (\) in your password, you'll
 # need to escape it by preceding it with a '\' character. (\') or (\)
 # (It is far simpler to just not use those characters.)
-$db_pass = '<%= @pgsql_password %>';
+$db_pass = '<%= pgsql_password %>';
 
 # Sometimes the database server is running on a non-standard port. If that's
 # the case for your database server, set this to the port number that your
@@ -124,4 +124,4 @@ $diffpath = '/usr/bin';
 # security features in Bugzilla, to protect against certain types of attacks.
 # A random string is generated by default. It's very important that this key
 # is kept secret. It also must be very long.
-$site_wide_secret = '<%= @bugzilla_secret_key %>';
+$site_wide_secret = '<%= bugzilla_secret_key %>';
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,
diff --git a/modules/bugzilla/templates/params.json b/modules/bugzilla/templates/params.json
index 892d6400..05325bc7 100644
--- a/modules/bugzilla/templates/params.json
+++ b/modules/bugzilla/templates/params.json
@@ -1,9 +1,9 @@
 {
-   "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" : "",
@@ -49,8 +49,8 @@
    "letsubmitterchoosemilestone" : "1",
    "letsubmitterchoosepriority" : "1",
    "mail_delivery_method" : "SMTP",
-   "mailfrom" : "bugzilla_noreply@ml.<%= @domain %>",
-   "maintainer" : "sysadmin@group.<%= @domain %>",
+   "mailfrom" : "bugzilla_noreply@ml.<%= domain %>",
+   "maintainer" : "sysadmin@group.<%= domain %>",
    "makeproductgroups" : "0",
    "max_search_results" : "10000",
    "maxattachmentsize" : "1000",
@@ -81,12 +81,12 @@
    "smtp_username" : "",
    "smtpserver" : "localhost",
    "ssl_redirect" : "1",
-   "sslbase" : "https://bugs.<%= @domain %>/",
+   "sslbase" : "https://bugs.<%= domain %>/",
    "strict_isolation" : "0",
    "strict_transport_security" : "off",
    "timetrackinggroup" : "",
    "upgrade_notification" : "latest_stable_release",
-   "urlbase" : "https://bugs.<%= @domain %>/",
+   "urlbase" : "https://bugs.<%= domain %>/",
    "use_mailer_queue" : "0",
    "use_see_also" : "1",
    "useclassification" : "0",
diff --git a/modules/bugzilla/templates/webapp_bugzilla.conf b/modules/bugzilla/templates/webapp_bugzilla.conf
index 6873a842..d2e3f395 100644
--- a/modules/bugzilla/templates/webapp_bugzilla.conf
+++ b/modules/bugzilla/templates/webapp_bugzilla.conf
@@ -2,7 +2,7 @@
 path_data_directory =  "/usr/share/bugzilla/"
 %>
 
-<Directory <%= @path_data_directory %> >
+<Directory <%= path_data_directory %> >
   AddHandler cgi-script .cgi
   Options +ExecCGI +FollowSymLinks
   DirectoryIndex index.cgi index.html