diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml index 605d83d..c04024c 100644 --- a/gitlab/docker-compose.yml +++ b/gitlab/docker-compose.yml @@ -21,21 +21,22 @@ services: gitlab_rails['smtp_domain'] = 'mg.devops-lyon.eu' gitlab_rails['smtp_enable_starttls_auto'] = true gitlab_rails['initial_root_password'] = 'M0ukreneIsGood!' - # gitlab_rails['ldap_enabled'] = true - # gitlab_rails['ldap_servers'] = { - # 'main' => { - # 'label' => 'Pidom AD', - # 'host' => '192.168.111.252', - # 'port' => 389, - # 'uid' => 'sAMAccountName', - # 'verify_certificates' => false, - # 'bind_dn' => 'CN=ldapuser,OU=Users,OU=Dardilly,DC=pidom,DC=chezclement,DC=maison', - # 'encryption' => 'plain' - # 'password' => 'E2ggSY3v33y5B6uwyjNXYGT2y_', - # 'active_directory' => true, - # 'base' => 'OU=Users,OU=Dardilly,DC=pidom,DC=chezclement,DC=maison' - # } - # } + gitlab_rails['ldap_enabled'] = true + gitlab_rails['ldap_servers'] = { + 'main' => { + 'label' => 'Pidom AD', + 'host' => '192.168.111.252', + 'port' => 389, + 'uid' => 'sAMAccountName', + 'verify_certificates' => false, + 'bind_dn' => 'CN=ldapuser,OU=Users,OU=Dardilly,DC=pidom,DC=chezclement,DC=maison', + 'encryption' => 'plain', + 'password' => 'E2ggSY3v33y5B6uwyjNXYGT2y_', + 'active_directory' => true, + 'base' => 'OU=Users,OU=Dardilly,DC=pidom,DC=chezclement,DC=maison', + 'user_filter' => '(memberof=CN=gitusers,OU=Groups,OU=Dardilly,DC=pidom,DC=chezclement,DC=maison)' + } + } nginx['enable'] = true nginx['redirect_http_to_https'] = false nginx['proxy_set_headers'] = {"X-Forwarded-Proto" => "http", "CUSTOM_HEADER" => "VALUE"} diff --git a/piwigo/docker-compose.yaml b/piwigo/docker-compose.yaml index a5d373c..48e8f7a 100644 --- a/piwigo/docker-compose.yaml +++ b/piwigo/docker-compose.yaml @@ -1,7 +1,27 @@ version: 2 services: + piwismtp: + image: namshi/smtp + container_name: piwismtp + hostname: piwismtp + environment: + - RELAY_NETWORKS=:192.168.0.0/16 +# - SMARTHOST_ADDRESS=smtp.mailgun.org +# - SMARTHOST_PORT=587 +# - SMARTHOST_USER=mailrelay@mg.familleclement.space +# - SMARTHOST_PASSWORD=ZvR8aWGibF6HuJmSkCqdL9AXrTCb + - SMARTHOST_ADDRESS=smtp.free.fr + - SMARTHOST_PORT=587 + - SMARTHOST_USER=ivan.clement@free.fr + - SMARTHOST_PASSWORD=3RokCHDHgLisX3bG + - DISABLE_IPV6=True + - KEY_PATH=/certificates/smtptlskey.key + - CERTIFICATE_PATH=/certificates/smtptlscert.crt + restart: unless-stopped + volumes: + - 'piwismtpcert:/certificates' piwidb: - image: mariadb:10 + image: mariadb:10.5.2 container_name: piwigo_mariadb restart: unless-stopped environment: @@ -12,7 +32,7 @@ services: volumes: - piwigo_db:/var/lib/mysql piwigo: - image: linuxserver/piwigo + image: linuxserver/piwigo:2.10.2-ls61 container_name: piwigo environment: - PUID=1000 @@ -23,6 +43,6 @@ services: ports: - 8087:80 restart: unless-stopped - links: - - piwidb \ No newline at end of file + - piwidb + - piwismtp \ No newline at end of file