Skip to content

Commit c318bd8

Browse files
tollsimytollsimy
committed
fix default crowmail values
1 parent 0b5f667 commit c318bd8

File tree

2 files changed

+114
-11
lines changed

2 files changed

+114
-11
lines changed

‎deploy/crownlabs/values.yaml‎

Lines changed: 112 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,119 @@ crownmail:
8181
templates:
8282
name: crownmail-templates
8383
sourceFolder: mail-templates
84+
overrides:
85+
defaults_crownlabs_mail.eml: |
86+
From: { from }
87+
To: { to }
88+
Subject: { subject }
89+
Date: { date }
90+
Message-ID: { message-id }
91+
MIME-Version: 1.0
92+
Content-Type: multipart/alternative; boundary=CrownLabsEmailBoundary
93+
94+
--CrownLabsEmailBoundary
95+
Content-Type: text/plain; charset=UTF-8
96+
97+
{ plaintext_header }
98+
{ plaintext_content }
99+
{ plaintext_footer }
100+
101+
--CrownLabsEmailBoundary
102+
Content-Type: text/html; charset=UTF-8
103+
104+
{ html_header }
105+
{ html_content }
106+
{ html_footer }
107+
108+
--CrownLabsEmailBoundary--
109+
defaults_crownlabs_headers.yaml: |
110+
from: noreply@crownlabs.polito.it
111+
html_header: |-
112+
<!DOCTYPE html>
113+
<html>
114+
<body>
115+
<div style="font-family: Arial, sans-serif; max-width: 600px; margin: 0 auto;">
116+
<div style="background-color: #f8f9fa; padding: 20px; text-align: center;">
117+
<h2>CrownLabs Notification</h2>
118+
</div>
119+
<div style="padding: 20px;">
120+
<p>Dear user,</p>
121+
html_footer: |-
122+
<p>Best regards,<br>
123+
CrownLabs Team</p>
124+
</div>
125+
<div style="background-color: #f8f9fa; padding: 15px; font-size: 12px; text-align: center;">
126+
<p>This is an automated message from CrownLabs.</p>
127+
<p>If you need assistance, please contact support.</p>
128+
</div>
129+
</div>
130+
</body>
131+
</html>
132+
plaintext_header: |
133+
=== CROWNLABS NOTIFICATION ===
134+
135+
Dear user,
136+
137+
plaintext_footer: |
138+
139+
Best regards,
140+
CrownLabs Team
141+
142+
---
143+
This is an automated message from CrownLabs.
144+
If you need assistance, please contact support.
145+
instautoctrl_inactivity_notification.yaml: |
146+
to: |-
147+
{ tenantEmail }
148+
subject: |-
149+
CrownLabs: Inactivity Detected for instance { prettyName }
150+
plaintext_content: |-
151+
Your instance { prettyName } has been detected as inactive for an extended period.
152+
If no activity is detected (either via the web GUI, via SSH, or via the browser-based SSH client) in the next { remainingTime } , the instance will be automatically paused/deleted to save resources.
153+
html_content: |-
154+
<p>Your instance <strong>{ prettyName }</strong> has been detected as inactive for an extended period.</p>
155+
<p>If no activity is detected (either via the web GUI, via SSH, or via the browser-based SSH client) in the next <strong>{ remainingTime }</strong>, the instance will be automatically paused/deleted to save resources.</p>
156+
instautoctrl_inactivity_stopped_notification.yaml: |
157+
to: |-
158+
{ tenantEmail }
159+
subject: |-
160+
CrownLabs: Instance { prettyName } terminated due to inactivity
161+
plaintext_content: |-
162+
Your instance { prettyName } has been terminated due to prolonged inactivity.
163+
No activity was detected (via the web GUI or SSH) for an extended period, so the instance has been paused/deleted to save resources.
164+
html_content: |-
165+
<p>Your instance <strong>{ prettyName }</strong> has been terminated due to prolonged inactivity.</p>
166+
<p>No activity was detected (via the web GUI or SSH) for an extended period, so the instance has been paused/deleted to save resources.</p>
167+
instautoctrl_expiration_notification.yaml: |
168+
to: |-
169+
{ tenantEmail }
170+
subject: |-
171+
CrownLabs: Instance { prettyName } Expired
172+
plaintext_content: |-
173+
Your instance { prettyName } has expired and has now been terminated.
174+
html_content: |-
175+
<p>Your instance <strong>{ prettyName }</strong> has expired and has now been terminated.</p>
176+
instautoctrl_expiration_warning_notification.yaml: |
177+
to: |-
178+
{ tenantEmail }
179+
subject: |-
180+
CrownLabs: Instance { prettyName } is expiring soon
181+
plaintext_content: |-
182+
Your instance { prettyName } will expire in { remainingTime } and will be permanently deleted. Please take any necessary actions to save your data.
183+
html_content: |-
184+
<p>Your instance <strong>{ prettyName }</strong> will expire in <strong>{ remainingTime }</strong> and will be permanently deleted. </p>
185+
<p>Please take any necessary actions to save your data.</p>
84186
configs:
85187
name: crownmail-configs
86188
sourceFolder: mail-configs
87-
smtp:
88-
server: override.smtp.example.com
89-
port: "123"
90-
identity: override-debug
91-
username: override-debug@example.com
92-
password: override-debugpassword
93-
from: override-crownlabs@example.com
189+
overrides:
190+
smtp:
191+
smtpServer: override.smtp.example.com
192+
smtpPort: "123"
193+
smtpIdentity: override-debug
194+
smtpUsername: override-debug@example.com
195+
smtpPassword: override-debugpassword
196+
smtpFrom: override-crownlabs@example.com
94197

95198
instance-operator:
96199
replicaCount: 1
@@ -142,8 +245,8 @@ instance-operator:
142245
terminationStatusCheckInterval: "2m"
143246
inactiveTerminationStatusCheckTimeout: "3s"
144247
inactiveTerminationMaxNumberOfAlerts: 3
145-
enableInactivityNotifications: true
146-
enableExpirationNotifications: true
248+
enableInactivityNotifications: false
249+
enableExpirationNotifications: false
147250
inactiveTerminationNotificationInterval: "24h"
148251
expirationNotificationInterval: "24h"
149252

‎operators/deploy/instance-operator/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ configurations:
5252
terminationStatusCheckInterval: "2m"
5353
inactiveTerminationStatusCheckTimeout: "3s"
5454
inactiveTerminationMaxNumberOfAlerts: 3
55-
enableInactivityNotifications: true
56-
enableExpirationNotifications: true
55+
enableInactivityNotifications: false
56+
enableExpirationNotifications: false
5757
inactiveTerminationNotificationInterval: "24h"
5858
expirationNotificationInterval: "24h"
5959

0 commit comments

Comments
 (0)