Merge branch 'master' of github.com:gchq/stroom into planb

CHANGELOG.md

@@ -13,6 +13,11 @@ DO NOT ADD CHANGES HERE - ADD THEM USING log_change.sh
 ~~~
 
 
+## [v7.8-beta.7] - 2025-01-09
+
+* Change default `identityProviderType` to `INTERNAL_IDP` in stroom prod config.
+
+
 ## [v7.8-beta.6] - 2025-01-08
 
 * Fix config.
@@ -1136,7 +1141,8 @@ DO NOT ADD CHANGES HERE - ADD THEM USING log_change.sh
 * Issue **#3830** : Add S3 data storage option.
 
 
-[Unreleased]: https://github.com/gchq/stroom/compare/v7.8-beta.6...HEAD
+[Unreleased]: https://github.com/gchq/stroom/compare/v7.8-beta.7...HEAD
+[v7.8-beta.7]: https://github.com/gchq/stroom/compare/v7.8-beta.6...v7.8-beta.7
 [v7.8-beta.6]: https://github.com/gchq/stroom/compare/v7.8-beta.5...v7.8-beta.6
 [v7.8-beta.5]: https://github.com/gchq/stroom/compare/v7.8-beta.4...v7.8-beta.5
 [v7.8-beta.4]: https://github.com/gchq/stroom/compare/v7.8-beta.3...v7.8-beta.4

stroom-app/prod.yml.jinja2

@@ -205,11 +205,11 @@ appConfig:
   security:
     authentication:
       openId:
-        # (EXTERNAL_IDP|NO_IDP|TEST_CREDENTIALS), Only use TEST_CREDENTIALS for test/demo installs
-        # NO_IDP      - Use when stroom is using its internal IDP. Use apiKey for feedStatus checks.
-        #               Use certificates for forwarding.
+        # (EXTERNAL_IDP|INTERNAL_IDP|TEST_CREDENTIALS), Only use TEST_CREDENTIALS for test/demo installs
+        # INTERNAL_IDP - Use API Keys generated in Stroom for feed status check. No support for token
+        #            authentication on data receipt.
         # EXTERNAL_IDP - Usa an external IDP for receipt token auth and for outbound HTTP connections
-        identityProviderType: "{{ 'NO_IDP' | envVar('IDENTITY_PROVIDER_TYPE') }}"
+        identityProviderType: "{{ 'INTERNAL_IDP' | envVar('IDENTITY_PROVIDER_TYPE') }}"
   {% endif %}
   serviceDiscovery:
     enabled: "{{ 'false' | envVar('STROOM_SERVICE_DISCOVERY_ENABLED') }}"