diff --git a/group_vars/gitlab.yml b/group_vars/gitlab.yml index 4006a677..2dbb8190 100644 --- a/group_vars/gitlab.yml +++ b/group_vars/gitlab.yml @@ -13,9 +13,6 @@ glob_gitlab: bind_password: "{{ vault.gitlab.ldap.bind_password }}" base: 'cn=Utilisateurs,dc=crans,dc=org' user_filter: '(&(!(shadowExpire=0))(uid=*))' - cas_name: 'cas3' - cas_label: 'CAS Cr@ns' - cas_url: 'https://cas.crans.org' smtp: address: "{{ query('ldap', 'ip', 'redisdead', 'adm') | first }}" port: 25 diff --git a/roles/gitlab/templates/gitlab.rb.j2 b/roles/gitlab/templates/gitlab.rb.j2 index 8f8f41c5..ea3348de 100644 --- a/roles/gitlab/templates/gitlab.rb.j2 +++ b/roles/gitlab/templates/gitlab.rb.j2 @@ -505,36 +505,36 @@ EOS ### OmniAuth Settings ###! Docs: https://docs.gitlab.com/ee/integration/omniauth.html -gitlab_rails['omniauth_enabled'] = true -gitlab_rails['omniauth_allow_single_sign_on'] = ['saml'] +#gitlab_rails['omniauth_enabled'] = true +#gitlab_rails['omniauth_allow_single_sign_on'] = ['saml'] # gitlab_rails['omniauth_sync_email_from_provider'] = 'saml' # gitlab_rails['omniauth_sync_profile_from_provider'] = ['saml'] # gitlab_rails['omniauth_sync_profile_attributes'] = ['email'] # gitlab_rails['omniauth_auto_sign_in_with_provider'] = 'saml' # gitlab_rails['omniauth_block_auto_created_users'] = true -gitlab_rails['omniauth_auto_link_ldap_user'] = true +#gitlab_rails['omniauth_auto_link_ldap_user'] = true # gitlab_rails['omniauth_auto_link_saml_user'] = false # gitlab_rails['omniauth_auto_link_user'] = ['saml'] # gitlab_rails['omniauth_external_providers'] = ['twitter', 'google_oauth2'] # gitlab_rails['omniauth_allow_bypass_two_factor'] = ['google_oauth2'] -gitlab_rails['omniauth_providers'] = [ +#gitlab_rails['omniauth_providers'] = [ # { # "name" => "google_oauth2", # "app_id" => "YOUR APP ID", # "app_secret" => "YOUR APP SECRET", # "args" => { "access_type" => "offline", "approval_prompt" => "" } # }, - { - "name" => "{{ gitlab.cas_name }}", - "label" => "{{ gitlab.cas_label }}", - "args" => { - "url" => "{{ gitlab.cas_url }}", - "login_url" => "/login", - "service_validate_url" => "/p3/serviceValidate", - "logout_url" => "/logout" - } - } -] +# { +# "name" => "{{ gitlab.cas_name }}", +# "label" => "{{ gitlab.cas_label }}", +# "args" => { +# "url" => "{{ gitlab.cas_url }}", +# "login_url" => "/login", +# "service_validate_url" => "/p3/serviceValidate", +# "logout_url" => "/logout" +# } +# } +#] ### FortiAuthenticator authentication settings # gitlab_rails['forti_authenticator_enabled'] = false