github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

add env to notifications

Browse Source
This commit is contained in:
Simon Larsen
2023-09-25 11:12:22 +00:00
parent ada26e3cce
commit f568473588
6 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
HelmChart/public/oneuptime/templates/_helpers.tpl
View File

@@ -165,8 +165,17 @@ spec:
imagePullPolicy: {{ $.Values.image.pullPolicy }}
env:
{{- include "oneuptime.env.common" . | nindent 22 }}
{{- if $.IsUI }}
{{- include "oneuptime.env.commonUi" . | nindent 22 }}
{{- end }}
{{- if $.IsServer }}
{{- include "oneuptime.env.commonServer" . | nindent 22 }}
{{- end }}
{{- if $.Env }}
{{- range $key, $val := $.Env }}
- name: {{ $key }}
value: {{ $val }}
{{- end }}
{{- end }}
ports:
- containerPort: {{ $.Port }}

3
HelmChart/public/oneuptime/templates/notification.yaml
View File

@@ -4,7 +4,8 @@
---
# OneUptime notification Service
{{- $notificationServiceArgs := dict "ServiceName" "notification" "Port" $.Values.port.notification "Release" $.Release "Values" $.Values -}}
{{- $notificationEnv := dict "PORT" $.Values.port.notification "SMS_DEFAULT_COST_IN_CENTS" $.Values.billing.smsDefaultValueInCents "CALL_DEFAULT_COST_IN_CENTS_PER_MINUTE" $.Values.billing.callDefaultValueInCentsPerMinute "INTERNAL_SMTP_EMAIL" $.Values.internalSmtp.email "INTERNAL_SMTP_PASSWORD" $.Values.internalSmtp.password -}}
{{- $notificationServiceArgs := dict "ServiceName" "notification" "Port" $.Values.port.notification "Release" $.Release "Values" $.Values "Env" $notificationEnv -}}
{{- include "oneuptime.service" $notificationServiceArgs }}
---

4
HelmChart/public/oneuptime/values.yaml
View File

@@ -74,6 +74,8 @@ internalSmtp:
sendingDomain:
dkimPrivateKey:
dkimPublicKey:
email:
name:
incidents:
disableAutomaticCreation: false
@@ -105,3 +107,5 @@ port:
statusPage: 3105
dashboard: 3009
adminDashboard: 3158
nginx: 80
haraka: 2525

10
Notification/Config.ts
View File

@@ -8,22 +8,20 @@ import GlobalConfigService from 'CommonServer/Services/GlobalConfigService';
import Phone from 'Common/Types/Phone';
import EmailServer from 'Common/Types/Email/EmailServer';
export const InternalSmtpUsername: string =
process.env['INTERNAL_SMTP_USERNAME'] || '';
export const InternalSmtpUsername: string = 'oneuptime';
export const InternalSmtpPassword: string =
process.env['INTERNAL_SMTP_PASSWORD'] || '';
export const InternalSmtpHost: Hostname = new Hostname(
process.env['INTERNAL_SMTP_HOST'] || ''
'haraka'
);
export const InternalSmtpPort: Port = new Port(
parseInt(process.env['INTERNAL_SMTP_PORT'] || '25')
2525
);
export const InternalSmtpSecure: boolean =
process.env['INTERNAL_SMTP_IS_SECURE'] === 'true';
export const InternalSmtpSecure: boolean = false;
export const InternalSmtpEmail: Email = new Email(
process.env['INTERNAL_SMTP_EMAIL'] || 'noreply@oneuptime.com'

11
config.example.env
View File

@@ -98,21 +98,12 @@ ADMIN_DASHBOARD_PORT=3158
# If USE_INTERNAL_SMTP is true then you need to fill these values.
INTERNAL_SMTP_FROM_NAME=OneUptime
INTERNAL_SMTP_DKIM_PRIVATE_KEY_AS_BASE64=
INTERNAL_SMTP_DKIM_PUBLIC_KEY_AS_BASE64=
INTERNAL_SMTP_EMAIL=test@yourcompany.com
INTERNAL_SMTP_SENDING_DOMAIN=yourcompany.com
# Safely ignore these.
INTERNAL_SMTP_USERNAME=oneuptime
INTERNAL_SMTP_PORT=2525
INTERNAL_SMTP_FROM_NAME=OneUptime
INTERNAL_SMTP_IS_SECURE=false
INTERNAL_SMTP_HOST=haraka
INTERNAL_SMTP_DKIM_SELECTOR=oneuptime
# Licensing Database
AIRTABLE_API_KEY=
AIRTABLE_BASE_ID=

8
docker-compose.base.yml
View File

@@ -77,9 +77,9 @@ services:
image: oneuptime/haraka:${APP_TAG}
restart: always
environment:
SMTP_USERNAME: ${INTERNAL_SMTP_USERNAME}
SMTP_USERNAME: oneuptime
SMTP_PASSWORD: ${INTERNAL_SMTP_PASSWORD}
DKIM_SELECTOR: ${INTERNAL_SMTP_DKIM_SELECTOR}
DKIM_SELECTOR: oneuptime
DOMAIN: ${INTERNAL_SMTP_SENDING_DOMAIN}
DKIM_PRIVATE_KEY: ${INTERNAL_SMTP_DKIM_PRIVATE_KEY_AS_BASE64}
DKIM_PUBLIC_KEY: ${INTERNAL_SMTP_DKIM_PUBLIC_KEY_AS_BASE64}
@@ -129,11 +129,7 @@ services:
SMS_DEFAULT_COST_IN_CENTS: ${SMS_DEFAULT_COST_IN_CENTS}
CALL_DEFAULT_COST_IN_CENTS_PER_MINUTE: ${CALL_DEFAULT_COST_IN_CENTS_PER_MINUTE}
INTERNAL_SMTP_EMAIL: ${INTERNAL_SMTP_EMAIL}
INTERNAL_SMTP_USERNAME: ${INTERNAL_SMTP_USERNAME}
INTERNAL_SMTP_PASSWORD: ${INTERNAL_SMTP_PASSWORD}
INTERNAL_SMTP_HOST: ${INTERNAL_SMTP_HOST}
INTERNAL_SMTP_PORT: ${INTERNAL_SMTP_PORT}
INTERNAL_SMTP_IS_SECURE: ${INTERNAL_SMTP_IS_SECURE}
depends_on:
- haraka