Fix matrix_postgres_additional_databases syntax problems

group_vars/matrix_servers

@@ -955,84 +955,84 @@ matrix_postgres_additional_databases: |
       'password': matrix_appservice_discord_postgres_password,
     }] if (matrix_appservice_discord_enabled and matrix_appservice_discord_database_engine == 'postgres' and matrix_appservice_discord_postgres_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_appservice_slack_database_db_name
+      'name': matrix_appservice_slack_database_db_name,
-      'username': matrix_appservice_slack_database_username
+      'username': matrix_appservice_slack_database_username,
-      'password': matrix_appservice_slack_database_password
+      'password': matrix_appservice_slack_database_password,
-    }] if (matrix_appservice_slack_enabled and matrix_appservice_slack_database_engine == 'postgres' and matrix_appservice_slack_database_hostname == 'matrix-postgres' else [])
+    }] if (matrix_appservice_slack_enabled and matrix_appservice_slack_database_engine == 'postgres' and matrix_appservice_slack_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_appservice_irc_database_db_name
+      'name': matrix_appservice_irc_database_db_name,
-      'username': matrix_appservice_irc_database_username
+      'username': matrix_appservice_irc_database_username,
-      'password': matrix_appservice_irc_database_password
+      'password': matrix_appservice_irc_database_password,
-    }] if (matrix_appservice_irc_enabled and matrix_appservice_irc_database_engine == 'postgres' and matrix_appservice_irc_database_hostname == 'matrix-postgres' else [])
+    }] if (matrix_appservice_irc_enabled and matrix_appservice_irc_database_engine == 'postgres' and matrix_appservice_irc_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_facebook_database_db_name
+      'name': matrix_mautrix_facebook_postgres_db_name,
-      'username': matrix_mautrix_facebook_database_username
+      'username': matrix_mautrix_facebook_postgres_username,
-      'password': matrix_mautrix_facebook_database_password
+      'password': matrix_mautrix_facebook_postgres_password,
-    }] if (matrix_mautrix_facebook_enabled and matrix_mautrix_facebook_database_engine == 'postgres' and matrix_mautrix_facebook_database_hostname == 'matrix-postgres' else [])
+    }] if (matrix_mautrix_facebook_enabled and matrix_mautrix_facebook_database_engine == 'postgres' and matrix_mautrix_facebook_postgres_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_hangouts_database_db_name
+      'name': matrix_mautrix_hangouts_database_db_name,
-      'username': matrix_mautrix_hangouts_database_username
+      'username': matrix_mautrix_hangouts_database_username,
-      'password': matrix_mautrix_hangouts_database_password
+      'password': matrix_mautrix_hangouts_database_password,
-    }] if (matrix_mautrix_hangouts_enabled and matrix_mautrix_hangouts_database_engine == 'postgres' and matrix_mautrix_hangouts_database_hostname == 'matrix-postgres' else [])
+    }] if (matrix_mautrix_hangouts_enabled and matrix_mautrix_hangouts_database_engine == 'postgres' and matrix_mautrix_hangouts_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_telegram_database_db_name
+      'name': matrix_mautrix_telegram_database_db_name,
-      'username': matrix_mautrix_telegram_database_username
+      'username': matrix_mautrix_telegram_database_username,
-      'password': matrix_mautrix_telegram_database_password
+      'password': matrix_mautrix_telegram_database_password,
-    }] if (matrix_mautrix_telegram_enabled and matrix_mautrix_telegram_database_engine == 'postgres' and matrix_telegram_facebook_database_hostname == 'matrix-postgres' else [])
+    }] if (matrix_mautrix_telegram_enabled and matrix_mautrix_telegram_database_engine == 'postgres' and matrix_telegram_facebook_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_whatsapp_database_db_name
+      'name': matrix_mautrix_whatsapp_database_db_name,
-      'username': matrix_mautrix_whatsapp_database_username
+      'username': matrix_mautrix_whatsapp_database_username,
-      'password': matrix_mautrix_whatsapp_database_password
+      'password': matrix_mautrix_whatsapp_database_password,
-    }] if (matrix_mautrix_whatsapp_enabled and matrix_mautrix_whatsapp_database_engine == 'postgres' and matrix_mautrix_whatsapp_database_hostname == 'matrix-postgres' else [])
+    }] if (matrix_mautrix_whatsapp_enabled and matrix_mautrix_whatsapp_database_engine == 'postgres' and matrix_mautrix_whatsapp_database_hostname == 'matrix-postgres') else [])
     + ([{
       'name': 'matrix_bridge_sms',
       'username': 'matrix_bridge_sms',
       'password': matrix_synapse_macaroon_secret_key | password_hash('sha512', 'bridge_sms.db.secret') | to_uuid,
     }] if matrix_sms_bridge_enabled else [])
     + ([{
-      'name': matrix_mx_puppet_skype_database_db_name
+      'name': matrix_mx_puppet_skype_database_db_name,
-      'username': matrix_mx_puppet_skype_database_username
+      'username': matrix_mx_puppet_skype_database_username,
-      'password': matrix_mx_puppet_skype_database_password
+      'password': matrix_mx_puppet_skype_database_password,
-    }] if (matrix_mx_puppet_skype_enabled and matrix_mx_puppet_skype_database_engine == 'postgres' and matrix_mx_puppet_skype_database_hostname == 'matrix-postgres' else [])
+    }] if (matrix_mx_puppet_skype_enabled and matrix_mx_puppet_skype_database_engine == 'postgres' and matrix_mx_puppet_skype_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mx_puppet_slack_database_db_name
+      'name': matrix_mx_puppet_slack_database_db_name,
-      'username': matrix_mx_puppet_slack_database_username
+      'username': matrix_mx_puppet_slack_database_username,
-      'password': matrix_mx_puppet_slack_database_password
+      'password': matrix_mx_puppet_slack_database_password,
-    }] if (matrix_mx_puppet_slack_enabled and matrix_mx_puppet_slack_database_engine == 'postgres' and matrix_mx_puppet_slack_database_hostname == 'matrix-postgres' else [])
+    }] if (matrix_mx_puppet_slack_enabled and matrix_mx_puppet_slack_database_engine == 'postgres' and matrix_mx_puppet_slack_database_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_twitter_database_db_name
+      'name': matrix_mx_puppet_twitter_database_db_name,
-      'username': matrix_mx_puppet_twitter_database_username
+      'username': matrix_mx_puppet_twitter_database_username,
-      'password': matrix_mx_puppet_twitter_database_password
+      'password': matrix_mx_puppet_twitter_database_password,
-    }] if (matrix_mx_puppet_twitter_enabled and matrix_mx_puppet_twitter_database_engine == 'postgres' and matrix_mx_puppet_twitter_database_hostname == 'matrix-postgres' else [])
+    }] if (matrix_mx_puppet_twitter_enabled and matrix_mx_puppet_twitter_database_engine == 'postgres' and matrix_mx_puppet_twitter_database_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_instagram_database_db_name
+      'name': matrix_mx_puppet_instagram_database_db_name,
-      'username': matrix_mx_puppet_instagram_database_username
+      'username': matrix_mx_puppet_instagram_database_username,
-      'password': matrix_mx_puppet_instagram_database_password
+      'password': matrix_mx_puppet_instagram_database_password,
     }] if (matrix_mx_puppet_instagram_enabled
            and matrix_mx_puppet_instagram_database_engine == 'postgres'
-           and matrix_mx_puppet_instagram_database_hostname == 'matrix-postgres' else [])
+           and matrix_mx_puppet_instagram_database_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_discord_database_db_name
+      'name': matrix_mx_puppet_discord_database_db_name,
-      'username': matrix_mx_puppet_discord_database_username
+      'username': matrix_mx_puppet_discord_database_username,
-      'password': matrix_mx_puppet_discord_database_password
+      'password': matrix_mx_puppet_discord_database_password,
     }] if (matrix_mx_puppet_discord_enabled
            and matrix_mx_puppet_discord_database_engine == 'postgres'
-           and matrix_mx_puppet_discord_database_hostname == 'matrix-postgres' else [])
+           and matrix_mx_puppet_discord_database_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_steam_database_db_name
+      'name': matrix_mx_puppet_steam_database_db_name,
-      'username': matrix_mx_puppet_steam_database_username
+      'username': matrix_mx_puppet_steam_database_username,
-      'password': matrix_mx_puppet_steam_database_password
+      'password': matrix_mx_puppet_steam_database_password,
     }] if (matrix_mx_puppet_steam_enabled
            and matrix_mx_puppet_steam_database_engine == 'postgres'
-           and matrix_mx_puppet_steam_database_hostname == 'matrix-postgres' else [])
+           and matrix_mx_puppet_steam_database_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_dimension_database_db_name
+      'name': matrix_dimension_database_db_name,
-      'username': matrix_dimension_database_username
+      'username': matrix_dimension_database_username,
-      'password': matrix_dimension_database_password
+      'password': matrix_dimension_database_password,
     }] if (matrix_dimension_enabled
            and matrix_dimension_database_engine == 'postgres'
-           and matrix_dimension_database_hostname == 'matrix-postgres' else [])
+           and matrix_dimension_database_hostname == 'matrix-postgres') else [])
-  }}
+   }}
 
 ######################################################################
 #