Commit 74b47f13 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch... 

Merge branch '44-the-template-tries-to-send-an-email-to-the-dist-smtp-server-by-default' into 'main'

Resolve "The template tries to send an email to the `dist` smtp server by default."

Closes #44

See merge request to-be-continuous/defectdojo!68
parents 3a3f76d0 3bb32839

README.md

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ Depending on the security tools you launch, and their configuration, you may hav 
| `sonarqube-nosecurityhotspot` / `DEFECTDOJO_SONARQUBE_NOSECURITYHOTSPOT` | if true, disable hotspots processing                                                                                                   | true                         |

| `DEFECTDOJO_SONARQUBE_ALLBUGS `          | true if all bugs are returned, false if only vulnerabilities are returned                                                              | false                         |

| `base-image` / `DEFECTDOJO_BASE_IMAGE` | Alpine base image                                                                                                                      | `registry.hub.docker.com/library/node:alpine3.11`                         |

| `smtp-server` / `DEFECTDOJO_SMTP_SERVER` | name:port of SMTP server used for notifications                                                                                        | dist                         |

| `smtp-server` / `DEFECTDOJO_SMTP_SERVER` | name:port of SMTP server used for notifications                                                                                        | _none_ (email notifications disabled)                         |

| `notification-severities` / `DEFECTDOJO_NOTIFICATION_SEVERITIES` | list of (comma separated) severities to be notified on                                                                                 | Critical,High                         |

| `timezone` / `DEFECTDOJO_TIMEZONE` | timezone used for naming engagements and setting engagements start and end                                                             | `Europe/Paris`                  |

| `noprod-enabled` / `DEFECTDOJO_NOPROD_ENABLED` | determines if defectdojo job is launched on non production branches                                                                    | false                         |

kicker.json

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
    {

      "name": "DEFECTDOJO_SMTP_SERVER",

      "description": "name:port of SMTP server used for notifications - if this value is set, DefectDojo will send an e-mail notification in case of new vulnerabilities",

      "default": "dist",

      "advanced": true

    },

    {

templates/gitlab-ci-defectdojo.yml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ spec: 
      default: Europe/Paris

    smtp-server:

      description: name:port of SMTP server used for notifications - if this value is set, DefectDojo will send an e-mail notification in case of new vulnerabilities

      default: dist

      default: ''

    notification-severities:

      description: List of severities for which you want to be notified - DEFECTDOJO_SMTP_SERVER must be defined if you want to be notified

      default: Critical,High