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.

3 files changed, 12 insertions, 12 deletions

diff --git a/modules/bugzilla-dev/templates/localconfig b/modules/bugzilla-dev/templates/localconfig
index 7e9925a5..2b7d6035 100755
--- a/modules/bugzilla-dev/templates/localconfig
+++ b/modules/bugzilla-dev/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
diff --git a/modules/bugzilla-dev/templates/params.json b/modules/bugzilla-dev/templates/params.json
index f6b00aa9..b51b4c00 100644
--- a/modules/bugzilla-dev/templates/params.json
+++ b/modules/bugzilla-dev/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-daemon@<%= @domain %>",
-   "maintainer" : "sysadmin@group.<%= @domain %>",
+   "mailfrom" : "bugzilla-daemon@<%= 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-dev.<%= @domain %>/",
+   "sslbase" : "https://bugs-dev.<%= domain %>/",
    "strict_isolation" : "0",
    "strict_transport_security" : "off",
    "timetrackinggroup" : "",
    "upgrade_notification" : "latest_stable_release",
-   "urlbase" : "http://bugs-dev.<%= @domain %>/",
+   "urlbase" : "http://bugs-dev.<%= domain %>/",
    "use_mailer_queue" : "0",
    "use_see_also" : "1",
    "useclassification" : "0",
diff --git a/modules/bugzilla-dev/templates/webapp_bugzilla.conf b/modules/bugzilla-dev/templates/webapp_bugzilla.conf
index b8194c00..a8f37a00 100755
--- a/modules/bugzilla-dev/templates/webapp_bugzilla.conf
+++ b/modules/bugzilla-dev/templates/webapp_bugzilla.conf
@@ -11,7 +11,7 @@ path_data_directory =  "/var/lib/bugzilla"
 
 # The duplicates.rdf must be accessible, as it is used by
 # duplicates.xul
-<Directory <%= @path_data_directory %>>
+<Directory <%= path_data_directory %>>
     <Files duplicates.rdf>
     <IfModule mod_authz_core.c>
         # Apache 2.4
@@ -26,7 +26,7 @@ path_data_directory =  "/var/lib/bugzilla"
 </Directory>
 
 # The png files locally created locally must be accessible
-<Directory <%= @path_data_directory %>/webdot>
+<Directory <%= path_data_directory %>/webdot>
     <FilesMatch \.png$>
     <IfModule mod_authz_core.c>
         # Apache 2.4
@@ -40,8 +40,8 @@ path_data_directory =  "/var/lib/bugzilla"
     </FilesMatch>
 </Directory>
 
-Alias /graphs/ <%= @path_data_directory %>/graphs/
-<Directory <%= @path_data_directory %>/graphs>
+Alias /graphs/ <%= path_data_directory %>/graphs/
+<Directory <%= path_data_directory %>/graphs>
     <FilesMatch \.png$>
     <IfModule mod_authz_core.c>
         # Apache 2.4