Merge pull request ANXS#460 from sportsru/fix_password_encryption

Correct manage setting 'password_encryption' for PostgreSQL 10 and above
robustq · Feb 10, 2021 · 6ca1f5b · 6ca1f5b
2 parents 8f97b1b + 3a194f0
commit 6ca1f5b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/templates/postgresql.conf-11.j2 b/templates/postgresql.conf-11.j2
@@ -87,7 +87,7 @@ tcp_keepalives_count = {{ postgresql_tcp_keepalives_count }}		# TCP_KEEPCNT;
 # - Authentication -
 
 authentication_timeout = {{ postgresql_authentication_timeout }}		# 1s-600s
-password_encryption = {{ 'on' if postgresql_password_encryption else 'off' }}		# md5 or scram-sha-256
+password_encryption = {{ postgresql_password_encryption }}
 db_user_namespace = {{ 'on' if postgresql_db_user_namespace else 'off' }}
 
 # GSSAPI using Kerberos

diff --git a/templates/postgresql.conf-12.j2 b/templates/postgresql.conf-12.j2
@@ -89,7 +89,7 @@ tcp_user_timeout = {{ postgresql_tcp_user_timeout }}                   # TCP_USE
 # - Authentication -
 
 authentication_timeout = {{ postgresql_authentication_timeout }}		# 1s-600s
-password_encryption = {{ 'on' if postgresql_password_encryption else 'off' }}		# md5 or scram-sha-256
+password_encryption = {{ postgresql_password_encryption }}
 db_user_namespace = {{ 'on' if postgresql_db_user_namespace else 'off' }}
 
 # GSSAPI using Kerberos

diff --git a/templates/postgresql.conf-9.1.j2 b/templates/postgresql.conf-9.1.j2
@@ -82,7 +82,7 @@ ssl = {{'on' if postgresql_ssl else 'off'}}				# (change requires restart)
 ssl_ciphers = '{{postgresql_ssl_ciphers|join(':')}}'	# allowed SSL ciphers
 					# (change requires restart)
 ssl_renegotiation_limit = {{postgresql_ssl_renegotiation_limit}}	# amount of data between renegotiations
-password_encryption = {{'on' if postgresql_password_encryption else 'off'}}
+password_encryption = {{postgresql_password_encryption}}
 db_user_namespace = {{'on' if postgresql_db_user_namespace else 'off'}}
 
 # Kerberos and GSSAPI

diff --git a/templates/postgresql.conf-9.2.j2 b/templates/postgresql.conf-9.2.j2
@@ -86,7 +86,7 @@ ssl_cert_file = '{{postgresql_ssl_cert_file}}'		# (change requires restart)
 ssl_key_file = '{{postgresql_ssl_key_file}}'		# (change requires restart)
 ssl_ca_file = '{{postgresql_ssl_ca_file}}'			# (change requires restart)
 ssl_crl_file = '{{postgresql_ssl_crl_file}}'			# (change requires restart)
-password_encryption = {{'on' if postgresql_password_encryption else 'off'}}
+password_encryption = {{postgresql_password_encryption}}
 db_user_namespace = {{'on' if postgresql_db_user_namespace else 'off'}}
 
 # Kerberos and GSSAPI

diff --git a/templates/postgresql.conf-9.3.j2 b/templates/postgresql.conf-9.3.j2
@@ -87,7 +87,7 @@ ssl_cert_file = '{{postgresql_ssl_cert_file}}'		# (change requires restart)
 ssl_key_file = '{{postgresql_ssl_key_file}}'		# (change requires restart)
 ssl_ca_file = '{{postgresql_ssl_ca_file}}'			# (change requires restart)
 ssl_crl_file = '{{postgresql_ssl_crl_file}}'			# (change requires restart)
-password_encryption = {{'on' if postgresql_password_encryption else 'off'}}
+password_encryption = {{postgresql_password_encryption}}
 db_user_namespace = {{'on' if postgresql_db_user_namespace else 'off'}}
 
 # Kerberos and GSSAPI

diff --git a/templates/postgresql.conf-9.4.j2 b/templates/postgresql.conf-9.4.j2
@@ -89,7 +89,7 @@ ssl_cert_file = '{{postgresql_ssl_cert_file}}'		# (change requires restart)
 ssl_key_file = '{{postgresql_ssl_key_file}}'		# (change requires restart)
 ssl_ca_file = '{{postgresql_ssl_ca_file}}'			# (change requires restart)
 ssl_crl_file = '{{postgresql_ssl_crl_file}}'			# (change requires restart)
-password_encryption = {{'on' if postgresql_password_encryption else 'off'}}
+password_encryption = {{postgresql_password_encryption}}
 db_user_namespace = {{'on' if postgresql_db_user_namespace else 'off'}}
 
 # GSSAPI using Kerberos

diff --git a/templates/postgresql.conf-9.5.j2 b/templates/postgresql.conf-9.5.j2
@@ -88,7 +88,7 @@ ssl_cert_file = '{{postgresql_ssl_cert_file}}'		# (change requires restart)
 ssl_key_file = '{{postgresql_ssl_key_file}}'		# (change requires restart)
 ssl_ca_file = '{{postgresql_ssl_ca_file}}'			# (change requires restart)
 ssl_crl_file = '{{postgresql_ssl_crl_file}}'			# (change requires restart)
-password_encryption = {{'on' if postgresql_password_encryption else 'off'}}
+password_encryption = {{postgresql_password_encryption}}
 db_user_namespace = {{'on' if postgresql_db_user_namespace else 'off'}}
 row_security = {{'on' if postgresql_row_security else 'off'}}
 

diff --git a/templates/postgresql.conf-9.6.j2 b/templates/postgresql.conf-9.6.j2
@@ -86,7 +86,7 @@ ssl_cert_file = '{{postgresql_ssl_cert_file}}'		# (change requires restart)
 ssl_key_file = '{{postgresql_ssl_key_file}}'		# (change requires restart)
 ssl_ca_file = '{{postgresql_ssl_ca_file}}'			# (change requires restart)
 ssl_crl_file = '{{postgresql_ssl_crl_file}}'			# (change requires restart)
-password_encryption = {{'on' if postgresql_password_encryption else 'off'}}
+password_encryption = {{postgresql_password_encryption}}
 db_user_namespace = {{'on' if postgresql_db_user_namespace else 'off'}}
 row_security = {{'on' if postgresql_row_security else 'off'}}