Emaileinstellungen

roles/docker_gitlab/files/generate.sh

@@ -7,5 +7,12 @@ docker exec gitlab sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h /var/opt
 sed -i "s/mattermost\['gitlab_secret'\] = \".*\"/mattermost\['gitlab_secret'\] = \"$secret\"/" /srv/gitlab/conf/gitlab.rb
 sed -i "s/mattermost\['gitlab_id'\] = \".*\"/mattermost\['gitlab_id'\] = \"$uid\"/" /srv/gitlab/conf/gitlab.rb
 
-docker restart gitlab > /dev/null
+mattermost_email_pass=`cat /srv/gitlab/secret/mattermost_email_pass`
+gitlab_email_pass=`cat /srv/gitlab/secret/gitlab_email_pass`
+sed -i "s/gitlab_rails\['incoming_email_password'\] = \".*\"/gitlab_rails\['incoming_email_password'\] = \"$gitlab_email_pass\"/" /srv/gitlab/conf/gitlab.rb
+sed -i "s/gitlab_rails\['smtp_password'\] = \".*\"/gitlab_rails\['smtp_password'\] = \"$gitlab_email_pass\"/" /srv/gitlab/conf/gitlab.rb
+
+sed -i "s/mattermost\['email_smtp_password'\] = \".*\"/mattermost\['email_smtp_password'\] = \"$mattermost_email_pass\"/" /srv/gitlab/conf/gitlab.rb
 
+
+docker restart gitlab > /dev/null

roles/docker_gitlab/files/generate_mattermost_secret.sh

-sleep 10
-secret=`openssl rand -hex 600 | sha256sum | head -c 64`
-
-uid=`docker exec gitlab sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h /var/opt/gitlab/postgresql -d gitlabhq_production -c "SELECT uid FROM oauth_applications WHERE name = 'Mattermost'" | sed -nr 's/ ([a-f0-9]{64})/\1/p'`
-docker exec gitlab sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h /var/opt/gitlab/postgresql -d gitlabhq_production -c "UPDATE oauth_applications SET secret='$secret' WHERE name = 'Mattermost'"
-
-sed -i "s/mattermost\['gitlab_secret'\] = \".*\"/mattermost\['gitlab_secret'\] = \"$secret\"/" /srv/gitlab/conf/gitlab.rb
-sed -i "s/mattermost\['gitlab_id'\] = \".*\"/mattermost\['gitlab_id'\] = \"$uid\"/" /srv/gitlab/conf/gitlab.rb
-
-docker restart gitlab > /dev/null

roles/docker_gitlab/files/gitlab.rb

@@ -17,7 +17,7 @@ gitlab_rails['time_zone'] = 'Europe/Berlin'
 gitlab_rails['gitlab_email_enabled'] = true
 gitlab_rails['gitlab_email_from'] = 'gitlab@warpzone.ms'
 gitlab_rails['gitlab_email_display_name'] = 'Gitlab Warpzone'
-gitlab_rails['gitlab_email_reply_to'] = 'noreply@warpzone.ms'
+gitlab_rails['gitlab_email_reply_to'] = 'gitlab@warpzone.ms'
 gitlab_rails['gitlab_default_can_create_group'] = false
 gitlab_rails['gitlab_username_changing_enabled'] = false
 # gitlab_rails['gitlab_default_theme'] = 2
@@ -51,10 +51,10 @@ gitlab_rails['gitlab_username_changing_enabled'] = false
 # # With self-hosted email servers, this is usually the user part of the email address.
 # gitlab_rails['incoming_email_email'] = "gitlab-incoming@gmail.com"
 # # Email account password
-# gitlab_rails['incoming_email_password'] = "[REDACTED]"
+# gitlab_rails['incoming_email_password'] = ""
 #
 # # IMAP server host
-# gitlab_rails['incoming_email_host'] = "imap.gmail.com"
+# gitlab_rails['incoming_email_host'] = "mail.warpzone.ms"
 # # IMAP server port
 # gitlab_rails['incoming_email_port'] = 993
 # # Whether the IMAP server uses SSL
@@ -286,16 +286,16 @@ gitlab_rails['gitlab_shell_ssh_port'] = 444
 # see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/629def0a7a26e7c2326566f0758d4a27857b52a3/doc/settings/smtp.md#smtp-settings
 # Use smtp instead of sendmail/postfix.
 
-# gitlab_rails['smtp_enable'] = true
-# gitlab_rails['smtp_address'] = "smtp.server"
-# gitlab_rails['smtp_port'] = 456
-# gitlab_rails['smtp_user_name'] = "smtp user"
-# gitlab_rails['smtp_password'] = "smtp password"
-# gitlab_rails['smtp_domain'] = "example.com"
-# gitlab_rails['smtp_authentication'] = "login"
-# gitlab_rails['smtp_enable_starttls_auto'] = true
+gitlab_rails['smtp_enable'] = true
+gitlab_rails['smtp_address'] = "mail.warpzone.ms"
+gitlab_rails['smtp_port'] = 25
+gitlab_rails['smtp_user_name'] = "gitlab@warpzone.ms"
+gitlab_rails['smtp_password'] = ""
+gitlab_rails['smtp_domain'] = "warpzone.ms"
+gitlab_rails['smtp_authentication'] = "plain"
+gitlab_rails['smtp_enable_starttls_auto'] = true
 # gitlab_rails['smtp_tls'] = false
-# gitlab_rails['smtp_openssl_verify_mode'] = 'none' # Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert', see http://api.rubyonrails.org/classes/ActionMailer/Base.html
+gitlab_rails['smtp_openssl_verify_mode'] = 'none' # Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert', see http://api.rubyonrails.org/classes/ActionMailer/Base.html
 # gitlab_rails['smtp_ca_path'] = "/etc/ssl/certs"
 # gitlab_rails['smtp_ca_file'] = "/etc/ssl/certs/ca-certificates.crt"
 
@@ -618,8 +618,8 @@ mattermost['team_site_name'] = "Warpzone Mattermost"
 # mattermost['log_file_format'] = nil
 
 mattermost['gitlab_enable'] = true
-mattermost['gitlab_secret'] = ""
-mattermost['gitlab_id'] = ""
+mattermost['gitlab_secret'] = "82afe43d500ca848422bb5510bb725e4ccba10a8774b69c3ddb6f0e07c0a086e"
+mattermost['gitlab_id'] = "a8c82feb8472afe3ab4276f61c3c8ab1e07d7934801cd99645ada8422f3f37bf"
 mattermost['gitlab_scope'] = ""
 mattermost['gitlab_auth_endpoint'] = "https://gitlab.warpzone.ms/oauth/authorize"
 mattermost['gitlab_token_endpoint'] = "https://gitlab.warpzone.ms/oauth/token"
@@ -630,15 +630,15 @@ mattermost['gitlab_user_api_endpoint'] = "https://gitlab.warpzone.ms/api/v3/user
 mattermost['email_enable_sign_up_with_email'] = false
 mattermost['email_enable_sign_in_with_email'] = false
 # mattermost['email_enable_sign_in_with_username'] = false
-# mattermost['email_send_email_notifications'] = false
+mattermost['email_send_email_notifications'] = true
 # mattermost['email_require_email_verification'] = false
-# mattermost['email_smtp_username'] = nil
-# mattermost['email_smtp_password'] = nil
-# mattermost['email_smtp_server'] = nil
-# mattermost['email_smtp_port'] = nil
-# mattermost['email_connection_security'] = nil
-# mattermost['email_feedback_name'] = nil
-# mattermost['email_feedback_email'] = nil
+mattermost['email_smtp_username'] = "mattermost@warpzone.ms"
+mattermost['email_smtp_password'] = ""
+mattermost['email_smtp_server'] = "mail.warpzone.ms"
+mattermost['email_smtp_port'] = 25
+mattermost['email_connection_security'] = "STARTTLS"
+mattermost['email_feedback_name'] = "Warpzone Mattermost"
+mattermost['email_feedback_email'] = "mattermost@warpzone.ms"
 # mattermost['email_send_push_notifications'] = true
 # mattermost['email_push_notification_server'] = ""