From f5b2645d869b76598c18527d388ed76719c06bdd Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Fri, 4 Oct 2024 21:44:50 -0700 Subject: 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. --- modules/transifex/templates/20-engines.conf | 4 ++-- modules/transifex/templates/30-site.conf | 2 +- modules/transifex/templates/45-ldap.conf | 16 ++++++++-------- modules/transifex/templates/50-project.conf | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'modules/transifex') diff --git a/modules/transifex/templates/20-engines.conf b/modules/transifex/templates/20-engines.conf index 620a9556..6523dfd4 100644 --- a/modules/transifex/templates/20-engines.conf +++ b/modules/transifex/templates/20-engines.conf @@ -9,8 +9,8 @@ DATABASE_ENGINE = 'postgresql_psycopg2' DATABASE_NAME = 'transifex' # The following are not used for sqlite3 DATABASE_USER = 'transifex' -DATABASE_PASSWORD = '<%= @pgsql_password %>' -DATABASE_HOST = 'pgsql.<%= @domain %>' # Set to empty string for local socket +DATABASE_PASSWORD = '<%= pgsql_password %>' +DATABASE_HOST = 'pgsql.<%= domain %>' # Set to empty string for local socket DATABASE_PORT = '' # Set to empty string for default ## Caching (optional) diff --git a/modules/transifex/templates/30-site.conf b/modules/transifex/templates/30-site.conf index 3c386354..4d4e9e4c 100644 --- a/modules/transifex/templates/30-site.conf +++ b/modules/transifex/templates/30-site.conf @@ -1,7 +1,7 @@ # Sites SITE_ID = 1 # Your site's domain. This is used only in this file. -SITE_DOMAIN = '<%= @domain %>' +SITE_DOMAIN = '<%= domain %>' ADMINS = ( # ('Your Name', 'your_email@domain.com'), diff --git a/modules/transifex/templates/45-ldap.conf b/modules/transifex/templates/45-ldap.conf index 2532edf5..dd215dc9 100644 --- a/modules/transifex/templates/45-ldap.conf +++ b/modules/transifex/templates/45-ldap.conf @@ -17,16 +17,16 @@ from django_auth_ldap.config import LDAPSearch, GroupOfNamesType # Baseline configuration. -AUTH_LDAP_SERVER_URI = "ldap://ldap.<%= @domain %> ldap://ldap-slave-1.<%= @domain %>" +AUTH_LDAP_SERVER_URI = "ldap://ldap.<%= domain %> ldap://ldap-slave-1.<%= domain %>" -AUTH_LDAP_BIND_DN = "cn=transifex-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %>" -AUTH_LDAP_BIND_PASSWORD = "<%= @ldap_password %>" +AUTH_LDAP_BIND_DN = "cn=transifex-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>" +AUTH_LDAP_BIND_PASSWORD = "<%= ldap_password %>" -AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= @dc_suffix %> ", +AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= dc_suffix %> ", ldap.SCOPE_SUBTREE, "(|(uid=%(user)s)(mail=%(user)s))") # Set up the basic group parameters. -AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= @dc_suffix %>", +AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= dc_suffix %>", ldap.SCOPE_SUBTREE, "(objectClass=groupOfNames)" ) AUTH_LDAP_GROUP_TYPE = GroupOfNamesType(name_attr="cn") @@ -42,7 +42,7 @@ AUTH_LDAP_USER_ATTR_MAP = { } AUTH_LDAP_USER_FLAGS_BY_GROUP = { - "is_active": "cn=mga-i18n,ou=Group,<%= @dc_suffix %>", - "is_staff": "cn=mga-i18n-committers,ou=Group,<%= @dc_suffix %>", - "is_superuser": "cn=mga-sysadmin,ou=Group,<%= @dc_suffix %>" + "is_active": "cn=mga-i18n,ou=Group,<%= dc_suffix %>", + "is_staff": "cn=mga-i18n-committers,ou=Group,<%= dc_suffix %>", + "is_superuser": "cn=mga-sysadmin,ou=Group,<%= dc_suffix %>" } diff --git a/modules/transifex/templates/50-project.conf b/modules/transifex/templates/50-project.conf index 013741b2..17281d9a 100644 --- a/modules/transifex/templates/50-project.conf +++ b/modules/transifex/templates/50-project.conf @@ -40,7 +40,7 @@ MIDDLEWARE_CLASSES = [ ROOT_URLCONF = 'urls' TEMPLATE_DIRS = [ - '<%= @templates_dir %>', + '<%= templates_dir %>', os.path.join(TX_ROOT, 'templates'), ] -- cgit v1.2.1