fix(config): RailsSessionSecretToken is deprecated

[arvados-formula.git] / arvados / files / default / config.tmpl.jinja

diff --git a/arvados/files/default/config.tmpl.jinja b/arvados/files/default/config.tmpl.jinja
index 46923cd50f2b2e38cd5f3f8fa5fdf1ba48cb1b87..c52186ee567bd8d4104ae2c352d99b1351426579 100644 (file)
--- a/arvados/files/default/config.tmpl.jinja
+++ b/arvados/files/default/config.tmpl.jinja
@@ -22,7 +22,6 @@ Clusters:
     ForceLegacyAPI14: {{ arvados.cluster.force_legacy_api14 }}
 
     API:
-      RailsSessionSecretToken: {{ arvados.cluster.tokens.rails_secret | yaml_encode }}
     {%- if 'API' in arvados.cluster %}
       {{ arvados.cluster.API | default('') | yaml(False) | indent(6) }}
     {%- endif %}
@@ -66,7 +65,6 @@ Clusters:
 
     ### DATABASE CONFIGURATION
     PostgreSQL:
-      # FIXME!!!!!! ALL as database or using Arvados' PostgreSQL ??
       ConnectionPool: {{ arvados.cluster.database.connection_pool_max }}
       Connection:
         # All parameters here are passed to the PG client library in a connection string;
@@ -76,9 +74,9 @@ Clusters:
         password: {{ arvados.cluster.database.password | yaml_encode }}
         user: {{ arvados.cluster.database.user }}
         client_encoding: {{ arvados.cluster.database.client_encoding }}
-    {%- if 'PostgreSQL' in arvados.cluster %}
-      {{ arvados.cluster.PostgreSQL | yaml(False) | indent(6) }}
-    {%- endif %}
+        {%- if arvados.cluster.database.extra_conn_params is defined %}
+        {{ arvados.cluster.database.extra_conn_params | yaml(False) | indent(8) }}
+        {%- endif %}
 
     ### SERVICES URLs
     Services: