Merge pull request #39 from opus-codium/fix-string-interpolation

Fix string interpolation in configuration file

Author: neomilium

templates/back/local.py-ldap.epp

@@ -5,13 +5,13 @@ LDAP_PORT = <%= $taiga::back::ldap_port %>
 
 # Full DN of the service account use to connect to LDAP server and search for login user's account entry
 # If LDAP_BIND_DN is not specified, or is blank, then an anonymous bind is attempated
-LDAP_BIND_DN = <%= if $taiga::back::ldap_bind_dn { "'#{$taiga::back::ldap_bind_dn}'" } else { 'None' } %>
-LDAP_BIND_PASSWORD = <%= if $taiga::back::ldap_bind_password { "'#{$taiga::back::ldap_bind_password}'" } else { 'None' } %>
+LDAP_BIND_DN = <%= if $taiga::back::ldap_bind_dn { String($taiga::back::ldap_bind_dn, '%p') } else { 'None' } %>
+LDAP_BIND_PASSWORD = <%= if $taiga::back::ldap_bind_password { String($taiga::back::ldap_bind_password, '%p') } else { 'None' } %>
 # Starting point within LDAP structure to search for login user
 LDAP_SEARCH_BASE = '<%= $taiga::back::ldap_search_base %>'
 # LDAP property used for searching, ie. login username needs to match value in sAMAccountName property in LDAP
 LDAP_SEARCH_PROPERTY = '<%= $taiga::back::ldap_search_property %>'
-LDAP_SEARCH_SUFFIX = <%= if $taiga::back::ldap_search_suffix { "'#{$taiga::back::ldap_search_suffix}'" } else { 'None' } %> # '@example.com'
+LDAP_SEARCH_SUFFIX = <%= if $taiga::back::ldap_search_suffix { String($taiga::back::ldap_search_suffix, '%p') } else { 'None' } %> # '@example.com'
 
 # Names of LDAP properties on user account to get email and full name
 LDAP_EMAIL_PROPERTY = '<%= $taiga::back::ldap_email_property %>'

templates/back/local.py.epp

@@ -30,9 +30,9 @@ SERVER_EMAIL = DEFAULT_FROM_EMAIL
 # for enable email sending. EMAIL_HOST_USER should end by @domain.tld
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 EMAIL_USE_TLS = <%= String($taiga::back::email_use_tls, '%T') %>
-EMAIL_HOST = <%= if $taiga::back::email_host { "'#{$taiga::back::email_host}'" } else { 'None' } %>
-EMAIL_HOST_USER = <%= if $taiga::back::email_user { "'#{$taiga::back::email_user}'" } else { 'None' } %>
-EMAIL_HOST_PASSWORD = <%= if $taiga::back::email_password { "'#{$taiga::back::email_password}'" } else { 'None' } %>
+EMAIL_HOST = <%= if $taiga::back::email_host { String($taiga::back::email_host, '%p') } else { 'None' } %>
+EMAIL_HOST_USER = <%= if $taiga::back::email_user { String($taiga::back::email_user, '%p') } else { 'None' } %>
+EMAIL_HOST_PASSWORD = <%= if $taiga::back::email_password { String($taiga::back::email_password, '%p') } else { 'None' } %>
 EMAIL_PORT = <%= $taiga::back::email_port %>
 
 <% if $taiga::back::change_notification_min_interval { -%>