Merge branch '1007-configure-wordpress-admin-email-address' into 'main'

Resolve "Configure Wordpress admin email address"

Closes #1007

See merge request stackspin/stackspin!715

flux2/apps/wordpress/wordpress-values-configmap.yaml

@@ -13,6 +13,7 @@ data:
         adm:
           usid: admin
           pssw: "${wordpress_admin_password}"
+          email: "${admin_email}"
       site:
         # NOTE: Make sure you use underscore and that the localisation is in full caps
         locale: en_US
@@ -31,6 +32,10 @@ data:
       endpoint_userinfo: https://sso.${domain}/userinfo
       endpoint_token: https://sso.${domain}/oauth2/token
       endpoint_end_session: ""
+      # If a WordPress account already exists with the same identity as a
+      # newly-authenticated user over OpenID Connect, login as that user
+      # instead of generating an error.
+      link_existing_users: "1"
       # After our SSO supports it, we should set this as the logout URL
       # https://open.greenhost.net/stackspin/single-sign-on/issues/28
       # endpoint_end_session: https://sso.${domain}/oauth2/sessions/logout