Skip to content

Commit

Permalink
Merge commit '0fcb5fffc193850dbffbbbfacfc846967c5e085e' into feature/…
Browse files Browse the repository at this point in the history
…import-2024-03-26

# Conflicts:
#	config/env.example
  • Loading branch information
maatinito committed May 23, 2024
2 parents 6ac5638 + 0fcb5ff commit 64ffc95
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
5 changes: 0 additions & 5 deletions config/env.example
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ DS_PROXY_URL=""
# SAML
SAML_IDP_ENABLED="disabled"

# External service: authentication through France Connect
FC_PARTICULIER_ID=""
FC_PARTICULIER_SECRET=""
FC_PARTICULIER_BASE_URL=""

# External services : oauth authentication (googlen microsoft)
FACEBOOK_CLIENT_ID=""
FACEBOOK_CLIENT_SECRET=""
Expand Down
3 changes: 3 additions & 0 deletions config/env.example.optional
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ DS_ENV="staging"

# France Connect usage
# FRANCE_CONNECT_ENABLED="disabled" # "enabled" by default
# FC_PARTICULIER_ID=""
# FC_PARTICULIER_SECRET=""
# FC_PARTICULIER_BASE_URL=""

# External service: authentication through Agent Connect
# AGENT_CONNECT_ID=""
Expand Down

0 comments on commit 64ffc95

Please sign in to comment.