upt playbook

This commit is contained in:
jaydee
2023-10-31 19:26:18 +01:00
parent 373ab6511f
commit b57d0ab615
2 changed files with 53 additions and 23 deletions

View File

@ -11,28 +11,6 @@ services:
external_url 'https://gitlab.sectorq.eu'
nginx['listen_port'] = 80
nginx['listen_https'] = false
gitlab_rails['ldap_enabled'] = true
gitlab_rails['ldap_servers'] = {
'main' => {
'label' => 'LDAP',
'host' => '192.168.77.106',
'port' => 1389,
'uid' => 'sAMAccountName',
'base' => 'dc=sectorq,dc=eu'
'bind_dn' => 'CN=admin,DC=sectorq,DC=eu',
'password' => '$LDAP_ADMIN_PASSWORD',
'encryption' => 'plain',
'verify_certificates' => false,
'timeout' => 10,
'active_directory' => false,
'user_filter' => '(memberOf=cn=gitlab,ou=group,dc=sectorq,dc=eu)',
'base' => 'ou=people,dc=sectorq,dc=eu',
'lowercase_usernames' => 'false',
'retry_empty_result_with_codes' => [80],
'allow_username_or_email_login' => false,
'block_auto_created_users' => false
}
},
gitlab_rails['omniauth_enabled'] = true
gitlab_rails['omniauth_allow_single_sign_on'] = ['saml']
gitlab_rails['omniauth_sync_email_from_provider'] = 'saml'
@ -48,7 +26,7 @@ services:
assertion_consumer_service_url: 'https://gitlab.sectorq.eu/users/auth/saml/callback',
# Shown when navigating to certificates in authentik
idp_cert_fingerprint: '1b:af:1e:f8:3f:b1:57:e6:b0:62:f6:59:25:48:1e:9c:c3:9b:36:9e',
idp_sso_target_url: 'https://auth.sectorq.eu/application/saml/<authentik application slug>/sso/binding/redirect/',
idp_sso_target_url: 'https://auth.sectorq.eu/application/saml/gitlab/sso/binding/redirect/',
issuer: 'https://gitlab.sectorq.eu',
name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
attribute_statements: {
@ -60,6 +38,29 @@ services:
label: 'authentik'
}
]
# gitlab_rails['ldap_enabled'] = true
# gitlab_rails['ldap_servers'] = {
# 'main' => {
# 'label' => 'LDAP',
# 'host' => '192.168.77.106',
# 'port' => 1389,
# 'uid' => 'sAMAccountName',
# 'base' => 'dc=sectorq,dc=eu'
# 'bind_dn' => 'CN=admin,DC=sectorq,DC=eu',
# 'password' => '$LDAP_ADMIN_PASSWORD',
# 'encryption' => 'plain',
# 'verify_certificates' => false,
# 'timeout' => 10,
# 'active_directory' => false,
# 'user_filter' => '(memberOf=cn=gitlab,ou=group,dc=sectorq,dc=eu)',
# 'base' => 'ou=people,dc=sectorq,dc=eu',
# 'lowercase_usernames' => 'false',
# 'retry_empty_result_with_codes' => [80],
# 'allow_username_or_email_login' => false,
# 'block_auto_created_users' => false
# }
# }
hostname: 'gitlab.sectorq.eu'
ports:
- '8780:80'