Merge pull request #9 from containerum/develop

Develop
containerum · Oct 15, 2018 · c16ffee · c16ffee
2 parents bf18cc4 + e094d91
commit c16ffee
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 65 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,21 +15,20 @@ COPY templates.json /
 
 # timezone data
 ENV GIN_MODE=debug \
-    CH_MAIL_LOG_LEVEL=4 \
-    CH_MAIL_TEMPLATE_DB="/storage/templates.db" \
-    CH_MAIL_MESSAGES_DB="/storage/messages.db" \
-    CH_MAIL_DEFAULT_TEMPLATES="templates.json" \
-    CH_MAIL_UPSTREAM=smtp \
-    CH_MAIL_UPSTREAM_SIMPLE=smtp \
-    CH_MAIL_SENDER_NAME_SIMPLE=containerum \
-    CH_MAIL_SENDER_MAIL_SIMPLE=noreply-test@containerum.io \
-    CH_MAIL_SENDER_NAME=containerum \
-    CH_MAIL_SENDER_MAIL=noreply-test@containerum.io \
-    CH_MAIL_USER_MANAGER_URL=http://user-manager:8111 \
-    CH_MAIL_LISTEN_ADDR=:7070 \
-    CH_MAIL_SMTP_ADDR=mail:465 \
-    CH_MAIL_SMTP_LOGIN=noreply-test@containerum.io \
-    CH_MAIL_SMTP_PASSWORD=verystrongpassword
+    TEMPLATE_DB="/storage/templates.db" \
+    MESSAGES_DB="/storage/messages.db" \
+    DEFAULT_TEMPLATES="templates.json" \
+    UPSTREAM=smtp \
+    UPSTREAM_SIMPLE=smtp \
+    SENDER_NAME_SIMPLE=containerum \
+    SENDER_MAIL_SIMPLE=noreply-test@containerum.io \
+    SENDER_NAME=containerum \
+    SENDER_MAIL=noreply-test@containerum.io \
+    USER_MANAGER_URL=http://user-manager:8111 \
+    LISTEN_ADDR=:7070 \
+    SMTP_ADDR=mail:465 \
+    SMTP_LOGIN=noreply-test@containerum.io \
+    SMTP_PASSWORD=verystrongpassword
 
 EXPOSE 7070
 

diff --git a/charts/mail/templates/deployment.yaml b/charts/mail/templates/deployment.yaml
@@ -28,15 +28,15 @@ spec:
             - name: {{ $key  }}
               value: {{ $val | quote }}
             {{- end }}
-            {{- if .Values.env.local.CH_MAIL_USER_MANAGER_URL }}
-            - name: CH_MAIL_USER_MANAGER_URL
-              value: "{{ .Values.env.local.CH_MAIL_USER_MANAGER_URL }}"
+            {{- if .Values.env.local.USER_MANAGER_URL }}
+            - name: USER_MANAGER_URL
+              value: "{{ .Values.env.local.USER_MANAGER_URL }}"
             {{- else }}
-            - name: CH_MAIL_USER_MANAGER_URL
+            - name: USER_MANAGER_URL
               value: "http://{{ .Release.Name }}-user-manager:8111"
             {{- end }}
-            {{- if .Values.env.local.CH_MAIL_SMTP_PASSWORD }}
-            - name: CH_MAIL_SMTP_PASSWORD
+            {{- if .Values.env.local.SMTP_PASSWORD }}
+            - name: SMTP_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ template "fullname" . }}

diff --git a/charts/mail/templates/secret.yaml b/charts/mail/templates/secret.yaml
@@ -9,9 +9,9 @@ metadata:
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
-  {{- if .Values.env.local.CH_MAIL_SMTP_PASSWORD }}
-  smtp-password: {{ .Values.env.local.CH_MAIL_SMTP_PASSWORD | b64enc }}
+  {{- if .Values.env.local.SMTP_PASSWORD }}
+  smtp-password: {{ .Values.env.local.SMTP_PASSWORD | b64enc }}
   {{- end }}
-  {{- if .Values.env.local.CH_MAIL_MG_PASSWORD }}
-  mailgun-password: {{ .Values.env.local.CH_MAIL_MG_PASSWORD | b64enc }}
+  {{- if .Values.env.local.MG_PASSWORD }}
+  mailgun-password: {{ .Values.env.local.MG_PASSWORD | b64enc }}
   {{- end }}
diff --git a/charts/mail/values.yaml b/charts/mail/values.yaml
@@ -34,19 +34,18 @@ persistence:
 env:
   global:
     GIN_MODE: debug
-    CH_MAIL_LOG_LEVEL: 4
-    CH_MAIL_TEMPLATE_DB: "/storage/template.db"
-    CH_MAIL_MESSAGES_DB: "/storage/messages.db"
-    CH_MAIL_UPSTREAM: "smtp"
-    CH_MAIL_UPSTREAM_SIMPLE: "smtp"
-    CH_MAIL_SENDER_NAME_SIMPLE: "containerum"
-    CH_MAIL_SENDER_MAIL_SIMPLE: "noreply-test@containerum.io"
-    CH_MAIL_SENDER_NAME: "containerum"
-    CH_MAIL_SENDER_MAIL: "noreply-test@containerum.io"
-    CH_MAIL_LISTEN_ADDR: ":7070"
-    CH_MAIL_SMTP_ADDR: "mail:465"
-    CH_MAIL_SMTP_LOGIN: "noreply-test@containerum.io"
+    TEMPLATE_DB: "/storage/template.db"
+    MESSAGES_DB: "/storage/messages.db"
+    UPSTREAM: "smtp"
+    UPSTREAM_SIMPLE: "smtp"
+    SENDER_NAME_SIMPLE: "containerum"
+    SENDER_MAIL_SIMPLE: "noreply-test@containerum.io"
+    SENDER_NAME: "containerum"
+    SENDER_MAIL: "noreply-test@containerum.io"
+    LISTEN_ADDR: ":7070"
+    SMTP_ADDR: "mail:465"
+    SMTP_LOGIN: "noreply-test@containerum.io"
   local:
-    CH_MAIL_USER_MANAGER_URL: http://user-manager:8111
-    CH_MAIL_SMTP_PASSWORD: verystrongpassword
-    CH_MAIL_MG_PASSWORD:
+    USER_MANAGER_URL: http://user-manager:8111
+    SMTP_PASSWORD: verystrongpassword
+    MG_PASSWORD:
diff --git a/cmd/mail-templater/config.go b/cmd/mail-templater/config.go
@@ -46,111 +46,111 @@ const (
 
 var flags = []cli.Flag{
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_PORT",
+		EnvVar: "PORT",
 		Name:   portFlag,
 		Value:  "7070",
 		Usage:  "port for solutions server",
 	},
 	cli.BoolFlag{
-		EnvVar: "CH_MAIL_DEBUG",
+		EnvVar: "DEBUG",
 		Name:   debugFlag,
 		Usage:  "start the server in debug mode",
 	},
 	cli.BoolFlag{
-		EnvVar: "CH_MAIL_TEXTLOG",
+		EnvVar: "TEXTLOG",
 		Name:   textlogFlag,
 		Usage:  "output log in text format",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_TEMPLATE_STORAGE",
+		EnvVar: "TEMPLATE_STORAGE",
 		Name:   templatesStorageFlag,
 		Value:  "bolt",
 		Usage:  "Templates storage",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_TEMPLATE_DB",
+		EnvVar: "TEMPLATE_DB",
 		Name:   templatesDBFlag,
 		Value:  "templates.db",
 		Usage:  "Templates db",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_MESSAGES_STORAGE",
+		EnvVar: "MESSAGES_STORAGE",
 		Name:   messagesStorageFlag,
 		Value:  "bolt",
 		Usage:  "Messages storage",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_MESSAGES_DB",
+		EnvVar: "MESSAGES_DB",
 		Name:   messagesDBFlag,
 		Value:  "messages.db",
 		Usage:  "Messages db",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_USER_MANAGER",
+		EnvVar: "USER_MANAGER",
 		Name:   userManagerFlag,
 		Value:  "http",
 		Usage:  "User manager kind",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_USER_MANAGER_URL",
+		EnvVar: "USER_MANAGER_URL",
 		Name:   userManagerURLFlag,
 		Value:  "http://user-manager:8111",
 		Usage:  "User manager",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_UPSTREAM",
+		EnvVar: "UPSTREAM",
 		Name:   upstreamFlag,
 		Value:  "mailgun",
 		Usage:  "Upstream (SMTP, Mailgun)",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_SENDER_NAME",
+		EnvVar: "SENDER_NAME",
 		Name:   senderNameFlag,
 		Usage:  "Sender name",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_SENDER_MAIL",
+		EnvVar: "SENDER_MAIL",
 		Name:   senderMailFlag,
 		Usage:  "Sender email",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_UPSTREAM_SIMPLE",
+		EnvVar: "UPSTREAM_SIMPLE",
 		Name:   upstreamSimpleFlag,
 		Value:  "mailgun",
 		Usage:  "Upstream for simple send method (SMTP, Mailgun)",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_SENDER_NAME_SIMPLE",
+		EnvVar: "SENDER_NAME_SIMPLE",
 		Name:   senderNameSimpleFlag,
 		Usage:  "Sender name for simple send method",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_SENDER_MAIL_SIMPLE",
+		EnvVar: "SENDER_MAIL_SIMPLE",
 		Name:   senderMailSimpleFlag,
 		Usage:  "Sender email for simple send method",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_SMTP_ADDR",
+		EnvVar: "SMTP_ADDR",
 		Name:   smtpAddrFlag,
 		Usage:  "Sender email for simple send method",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_SMTP_LOGIN",
+		EnvVar: "SMTP_LOGIN",
 		Name:   smtpLoginFlag,
 		Usage:  "SMTP login",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_SMTP_PASSWORD",
+		EnvVar: "SMTP_PASSWORD",
 		Name:   smtpPasswordFlag,
 		Usage:  "SMTP password",
 	},
 	cli.BoolFlag{
-		EnvVar: "CH_MAIL_CORS",
+		EnvVar: "CORS",
 		Name:   corsFlag,
 		Usage:  "enable CORS",
 	},
 	cli.StringFlag{
-		EnvVar: "CH_MAIL_DEFAULT_TEMPLATES",
+		EnvVar: "DEFAULT_TEMPLATES",
 		Name:   defaultTemplatesFlag,
 		Value:  "templates.json",
 		Usage:  "json file with default templates",

diff --git a/templates.json b/templates.json