diff options
| author | zeripath <art27@cantab.net> | 2019-02-03 02:06:52 +0000 |
|---|---|---|
| committer | techknowlogick <matti@mdranta.net> | 2019-02-02 21:06:52 -0500 |
| commit | 3d91bb2f2dc8584b76a49a1a40c3f688c21380f5 (patch) | |
| tree | 5f5641012972139a1fb179a5415cab38c222a68a /integrations | |
| parent | 67567eff0e5614553cbd396ae7e1adfde6fa33c0 (diff) | |
| download | gitea-3d91bb2f2dc8584b76a49a1a40c3f688c21380f5.tar.gz gitea-3d91bb2f2dc8584b76a49a1a40c3f688c21380f5.zip | |
Make log mailer for testing (#5893)
* Create log mailer for testing email settings
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Switch on the log mailer for the integration tests
This ensures that the sending mail process works
Signed-off-by: Andrew Thornton <art27@cantab.net>
* rename the from user for mysql/mssql
* rename log sender to dummy sender
* update the integration tests
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/mssql.ini.tmpl | 5 | ||||
| -rw-r--r-- | integrations/mysql.ini.tmpl | 5 | ||||
| -rw-r--r-- | integrations/pgsql.ini.tmpl | 5 | ||||
| -rw-r--r-- | integrations/sqlite.ini | 6 |
4 files changed, 18 insertions, 3 deletions
diff --git a/integrations/mssql.ini.tmpl b/integrations/mssql.ini.tmpl index 08f7e9ca37..86d100845d 100644 --- a/integrations/mssql.ini.tmpl +++ b/integrations/mssql.ini.tmpl @@ -36,7 +36,9 @@ LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w APP_DATA_PATH = integrations/gitea-integration-mssql/data [mailer] -ENABLED = false +ENABLED = true +MAILER_TYPE = dummy +FROM = mssql-integration-test@gitea.io [service] REGISTER_EMAIL_CONFIRM = false @@ -47,6 +49,7 @@ REQUIRE_SIGNIN_VIEW = false DEFAULT_KEEP_EMAIL_PRIVATE = false DEFAULT_ALLOW_CREATE_ORGANIZATION = true NO_REPLY_ADDRESS = noreply.example.org +ENABLE_NOTIFY_MAIL = true [picture] DISABLE_GRAVATAR = false diff --git a/integrations/mysql.ini.tmpl b/integrations/mysql.ini.tmpl index e75df81bd6..0ba34f2d86 100644 --- a/integrations/mysql.ini.tmpl +++ b/integrations/mysql.ini.tmpl @@ -36,7 +36,9 @@ LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w APP_DATA_PATH = integrations/gitea-integration-mysql/data [mailer] -ENABLED = false +ENABLED = true +MAILER_TYPE = dummy +FROM = mysql-integration-test@gitea.io [service] REGISTER_EMAIL_CONFIRM = false @@ -47,6 +49,7 @@ REQUIRE_SIGNIN_VIEW = false DEFAULT_KEEP_EMAIL_PRIVATE = false DEFAULT_ALLOW_CREATE_ORGANIZATION = true NO_REPLY_ADDRESS = noreply.example.org +ENABLE_NOTIFY_MAIL = true [picture] DISABLE_GRAVATAR = false diff --git a/integrations/pgsql.ini.tmpl b/integrations/pgsql.ini.tmpl index 923608235e..e617b1899c 100644 --- a/integrations/pgsql.ini.tmpl +++ b/integrations/pgsql.ini.tmpl @@ -36,7 +36,9 @@ LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w APP_DATA_PATH = integrations/gitea-integration-pgsql/data [mailer] -ENABLED = false +ENABLED = true +MAILER_TYPE = dummy +FROM = pgsql-integration-test@gitea.io [service] REGISTER_EMAIL_CONFIRM = false @@ -47,6 +49,7 @@ REQUIRE_SIGNIN_VIEW = false DEFAULT_KEEP_EMAIL_PRIVATE = false DEFAULT_ALLOW_CREATE_ORGANIZATION = true NO_REPLY_ADDRESS = noreply.example.org +ENABLE_NOTIFY_MAIL = true [picture] DISABLE_GRAVATAR = false diff --git a/integrations/sqlite.ini b/integrations/sqlite.ini index 33c1015eca..f1e48617ac 100644 --- a/integrations/sqlite.ini +++ b/integrations/sqlite.ini @@ -44,6 +44,7 @@ REQUIRE_SIGNIN_VIEW = false DEFAULT_KEEP_EMAIL_PRIVATE = false DEFAULT_ALLOW_CREATE_ORGANIZATION = true NO_REPLY_ADDRESS = noreply.example.org +ENABLE_NOTIFY_MAIL = true [picture] DISABLE_GRAVATAR = false @@ -66,3 +67,8 @@ LEVEL = Debug INSTALL_LOCK = true SECRET_KEY = 9pCviYTWSb INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE0OTI3OTU5ODN9.OQkH5UmzID2XBdwQ9TAI6Jj2t1X-wElVTjbE7aoN4I8 + +[mailer] +ENABLED = true +MAILER_TYPE = dummy +FROM = sqlite-integration-test@gitea.io |