Add Mysilio SMTP configuration

mysilio-co · Oct 2, 2022 · 540ad9f · 540ad9f
1 parent 10d6916
commit 540ad9f
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 1 deletion.
diff --git a/.deploy/values/production.yaml.gotmpl b/.deploy/values/production.yaml.gotmpl
@@ -12,6 +12,11 @@ image:
   tag: {{ requiredEnv "CIRCLE_SHA1" }}
   pullSecrets:
   - itme-image-pull-secrets
+customParameters:
+- flag: smtpUser
+  value: {{ requiredEnv "SMTP_USER }}
+- flag: smtpPassword
+  value: {{ requiredEnv "SMTP_PASSWORD" }}
 ingress:
   enabled: true
   className: nginx

diff --git a/.deploy/values/staging.yaml.gotmpl b/.deploy/values/staging.yaml.gotmpl
@@ -12,6 +12,11 @@ image:
   tag: {{ requiredEnv "CIRCLE_SHA1" }}
   pullSecrets:
   - itme-image-pull-secrets
+customParameters:
+- flag: smtpUser
+  value: {{ requiredEnv "SMTP_USER }}
+- flag: smtpPassword
+  value: {{ requiredEnv "SMTP_PASSWORD" }}
 ingress:
   enabled: true
   annotations:

diff --git a/config/app/variables/resolver/resolver.json b/config/app/variables/resolver/resolver.json
@@ -73,6 +73,20 @@
             "key": "workers",
             "defaultValue": 1
           }
+        },
+        {
+          "CombinedShorthandResolver:_resolvers_key": "urn:solid-server:default:variable:smtpUser",
+          "CombinedShorthandResolver:_resolvers_value": {
+            "@type": "KeyExtractor",
+            "key": "smtpUser"
+          }
+        },
+        {
+          "CombinedShorthandResolver:_resolvers_key": "urn:solid-server:default:variable:smtpPassword",
+          "CombinedShorthandResolver:_resolvers_value": {
+            "@type": "KeyExtractor",
+            "key": "smtpPassword"
+          }
         }
       ]
     }

diff --git a/config/identity/email/mysilio.json b/config/identity/email/mysilio.json
@@ -0,0 +1,15 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^5.0.0/components/context.jsonld",
+  "@graph": [
+    {
+      "comment": "A Mysilio specific SMTP config that uses values passed in via the cli",
+      "@id": "urn:solid-server:default:EmailSender",
+      "@type": "BaseEmailSender",
+      "args_senderName":  "Mysilio Support <support@mysilio.com>",
+      "args_emailConfig_host":  "email-smtp.us-west-2.amazonaws.com",
+      "args_emailConfig_port": 587,
+      "args_emailConfig_auth_user": { "@id": "urn:solid-server:default:variable:smtpUser" },
+      "args_emailConfig_auth_pass": { "@id": "urn:solid-server:default:variable:smtpPassword" }
+    }
+  ]
+}
diff --git a/config/mysilio.json b/config/mysilio.json
@@ -10,7 +10,7 @@
     "css:config/http/server-factory/websockets.json",
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
-    "css:config/identity/email/default.json",
+    "css:config/identity/email/mysilio.json",
     "css:config/identity/handler/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",

diff --git a/config/util/variables/default.json b/config/util/variables/default.json
@@ -46,6 +46,16 @@
       "comment": "Run the server in multithreaded mode with the set amount of workers.",
       "@id": "urn:solid-server:default:variable:workers",
       "@type": "Variable"
+    },
+    {
+      "comment": "Supply an SMTP User",
+      "@id": "urn:solid-server:default:variable:smtpUser",
+      "@type": "Variable"
+    },
+    {
+      "comment": "Supply an SMTP Password",
+      "@id": "urn:solid-server:default:variable:smtpPassword",
+      "@type": "Variable"
     }
   ]
 }