commit d7b6ecf

Merge: 13b2b16 e96ab9f Author: David Christofas <[email protected]> Date: Thu Sep 22 14:02:36 2022 +0200 Merge pull request #4564 from dragonchaser/email-template Add email templating
owncloud · Sep 22, 2022 · 7345c9c · 7345c9c
1 parent f68881b
commit 7345c9c
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 9 deletions.
diff --git a/grpc_apis/ocis/messages/search/v0/grpc.md b/grpc_apis/ocis/messages/search/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.search.v0"
 url: /grpc_apis/ocis_messages_search_v0
-date: 2022-09-22T09:14:57Z
+date: 2022-09-22T12:04:00Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/settings/v0/grpc.md b/grpc_apis/ocis/messages/settings/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.settings.v0"
 url: /grpc_apis/ocis_messages_settings_v0
-date: 2022-09-22T09:14:57Z
+date: 2022-09-22T12:04:00Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/store/v0/grpc.md b/grpc_apis/ocis/messages/store/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.store.v0"
 url: /grpc_apis/ocis_messages_store_v0
-date: 2022-09-22T09:14:57Z
+date: 2022-09-22T12:04:00Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/thumbnails/v0/grpc.md b/grpc_apis/ocis/messages/thumbnails/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.thumbnails.v0"
 url: /grpc_apis/ocis_messages_thumbnails_v0
-date: 2022-09-22T09:14:57Z
+date: 2022-09-22T12:04:00Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/search/v0/grpc.md b/grpc_apis/ocis/services/search/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.search.v0"
 url: /grpc_apis/ocis_services_search_v0
-date: 2022-09-22T09:14:57Z
+date: 2022-09-22T12:04:00Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/settings/v0/grpc.md b/grpc_apis/ocis/services/settings/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.settings.v0"
 url: /grpc_apis/ocis_services_settings_v0
-date: 2022-09-22T09:14:57Z
+date: 2022-09-22T12:04:00Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/store/v0/grpc.md b/grpc_apis/ocis/services/store/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.store.v0"
 url: /grpc_apis/ocis_services_store_v0
-date: 2022-09-22T09:14:57Z
+date: 2022-09-22T12:04:00Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/thumbnails/v0/grpc.md b/grpc_apis/ocis/services/thumbnails/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.thumbnails.v0"
 url: /grpc_apis/ocis_services_thumbnails_v0
-date: 2022-09-22T09:14:57Z
+date: 2022-09-22T12:04:00Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/services/_includes/adoc/notifications_configvars.adoc b/services/_includes/adoc/notifications_configvars.adoc
@@ -159,6 +159,14 @@ a| [subs=-attributes]
 ++++
 a| [subs=-attributes]
 Machine auth API key used to validate internal requests necessary to access resources from other services.
+|`OCIS_EMAIL_TEMPLATE_PATH` +
+`NOTIFICATIONS_EMAIL_TEMPLATE_PATH`
+a| [subs=-attributes]
+++string++
+a| [subs=-attributes]
+++++
+a| [subs=-attributes]
+Path to the E-Mail templates for the notifications to override the embedded ones.
 |===
 
 Since Version: `+` added, `-` deprecated
diff --git a/services/_includes/notifications-config-example.yaml b/services/_includes/notifications-config-example.yaml
@@ -27,3 +27,4 @@ notifications:
     group: notifications
   reva_gateway: 127.0.0.1:9142
   machine_auth_api_key: ""
+  email_template_path: ""
diff --git a/services/_includes/notifications_configvars.md b/services/_includes/notifications_configvars.md
@@ -22,4 +22,5 @@
 | NOTIFICATIONS_EVENTS_CLUSTER | string | ocis-cluster | The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system.|
 | NOTIFICATIONS_EVENTS_GROUP | string | notifications | Name of the event group / queue on the event system.|
 | REVA_GATEWAY<br/>NOTIFICATIONS_REVA_GATEWAY | string | 127.0.0.1:9142 | CS3 gateway used to look up user metadata|
-| OCIS_MACHINE_AUTH_API_KEY<br/>NOTIFICATIONS_MACHINE_AUTH_API_KEY | string |  | Machine auth API key used to validate internal requests necessary to access resources from other services.|
+| OCIS_MACHINE_AUTH_API_KEY<br/>NOTIFICATIONS_MACHINE_AUTH_API_KEY | string |  | Machine auth API key used to validate internal requests necessary to access resources from other services.|
+| OCIS_EMAIL_TEMPLATE_PATH<br/>NOTIFICATIONS_EMAIL_TEMPLATE_PATH | string |  | Path to the E-Mail templates for the notifications to override the embedded ones.|