Merge pull request #20 from diffgram/smtp-settings

email env variables

Author: PJEstrada

templates/diffgram_settings.tpl

@@ -52,4 +52,9 @@
   KEY_CLOAK_MASTER_USER: {{.Values.diffgramSettings.KEY_CLOAK_MASTER_USER}}
   KEY_CLOAK_DIFFGRAM_USER: {{.Values.diffgramSettings.KEY_CLOAK_DIFFGRAM_USER}}
   KEYCLOAK_REALM: {{.Values.diffgramSettings.KEYCLOAK_REALM}}
+  KEYCLOAK_REALM: {{.Values.diffgramSettings.KEYCLOAK_REALM}}
+  SMTP_HOST: {{.Values.diffgramSettings.SMTP_HOST}}
+  SMTP_PORT: {{.Values.diffgramSettings.SMTP_PORT}}
+  SMTP_USERNAME: {{.Values.diffgramSettings.SMTP_USERNAME}}
+  SMTP_FROM_EMAIL: {{.Values.diffgramSettings.SMTP_FROM_EMAIL}}
 {{- end }}

templates/diffgrams_secrets.tpl

@@ -4,6 +4,7 @@
   DIFFGRAM_AWS_ACCESS_KEY_ID: {{ .Values.diffgramSecrets.DIFFGRAM_AWS_ACCESS_KEY_ID }}
   _ANALYTICS_WRITE_KEY: {{ .Values.diffgramSecrets._ANALYTICS_WRITE_KEY }}
   MAILGUN_KEY: {{ .Values.diffgramSecrets.MAILGUN_KEY }}
+  SMTP_PASSWORD: {{ .Values.diffgramSecrets.SMTP_PASSWORD }}
   HUB_SPOT_KEY: {{ .Values.diffgramSecrets.HUB_SPOT_KEY }}
   SECRET_KEY: {{ .Values.diffgramSecrets.SECRET_KEY }}
   INTER_SERVICE_SECRET: {{ .Values.diffgramSecrets.INTER_SERVICE_SECRET }}

values.yaml

@@ -45,7 +45,6 @@ diffgramSecrets:
   DIFFGRAM_AWS_ACCESS_KEY_ID: none
   DIFFGRAM_AWS_ACCESS_KEY_SECRET: none
   _ANALYTICS_WRITE_KEY: provided_by_diffgram_team
-  MAILGUN_KEY: provided_by_diffgram_team
   HUB_SPOT_KEY: provided_by_diffgram_team
   SECRET_KEY: provided_by_diffgram_team
   FERNET_KEY: NeL_RED6zZ1XF3XT7Yd1hzFPYyebrg6UdkECTOLHEdI= # Please change this for production usage
@@ -63,6 +62,10 @@ diffgramSecrets:
   KEY_CLOAK_MASTER_PASSWORD: '"admin"'
   KEY_CLOAK_DIFFGRAM_PASSWORD: '"admin"'
 
+  # Email Secrets
+  MAILGUN_KEY: none
+  SMTP_PASSWORD: none
+
 diffgramSettings:
   USERDOMAIN: kubernetes
   DIFFGRAM_SYSTEM_MODE: production
@@ -79,7 +82,7 @@ diffgramSettings:
   PROCESS_MEDIA_NUM_FRAME_THREADS: '"4"'
   DATABASE_CONNECTION_POOL_SIZE: '"10"'
   GOOGLE_APPLICATION_CREDENTIALS: /etc/gcp/sa_credentials.json # Check the volume in deployment.yaml and service_account_secret.yaml
-  EMAIL_DOMAIN_NAME: example.com
+
   IS_DIFFGRAM_S3_V4_SIGNATURE: '"False"'
 
   # Set this value if you want to use GCP as your storage. Put your json service account encoded in base 64
@@ -92,7 +95,7 @@ diffgramSettings:
   DIFFGRAM_HOST_OS: helm_os_default
   NEW_RELIC_LICENSE_KEY: none
   ALLOW_EVENTHUB: '"False"'
-  EMAIL_VALIDATION: '"False"'
+
   ALLOW_STRIPE_BILLING: '"False"'
   IS_OPEN_SOURCE: '"True"'
   Iwe can add S_OPEN_SOURCE: '"True"'
@@ -106,6 +109,15 @@ diffgramSettings:
   SIGNED_URL_CACHE_MINIMUM_DAYS_VALID: "'5'"
   SIGNED_URL_CACHE_NEW_OFFSET_DAYS_VALID: "'6'"
 
+  # Email Settings
+  EMAIL_VALIDATION: '"False"' # Turns on email verification for new accounts.
+  EMAIL_DOMAIN_NAME: none
+  SMTP_HOST: none
+  SMTP_PORT: none
+  SMTP_USERNAME: none
+  SMTP_FROM_EMAIL: none
+
+
   # OAUTH2 Settings
   USE_OAUTH2: "'False'"
   OAUTH2_PROVIDER_NAME: "cognito"