Skip to content

Improves email configurations descriptions #6806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 4 commits into from
Oct 8, 2022
Merged

Improves email configurations descriptions #6806

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b80fec
Fixing email global configurations descriptions
Oct 3, 2022
55d7fb8
Merge branch 'apache:main' into fix-email-configs-description
stephankruggg Oct 4, 2022
d456ae6
Merge branch 'main' into fix-email-configs-description
stephankruggg Oct 6, 2022
b6e449b
Fixing email typos
Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/components-api/src/main/java/com/cloud/alert/AlertManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public interface AlertManager extends Manager, AlertService {
ConfigKey.Scope.Cluster, null);

public static final ConfigKey<Boolean> AlertSmtpUseStartTLS = new ConfigKey<Boolean>("Advanced", Boolean.class, "alert.smtp.useStartTLS", "false",
"If set to true and if we enable security via alert.smtp.useAuth, this will enable StartTLS to secure the conection.", true);
"If set to true and if we enable security via alert.smtp.useAuth, this will enable StartTLS to secure the connection.", true);

public static final ConfigKey<String> AlertSmtpEnabledSecurityProtocols = new ConfigKey<String>("Advanced", String.class, "alert.smtp.enabledSecurityProtocols", "",
"White-space separated security protocols; ex: \"TLSv1 TLSv1.1\". Supported protocols: SSLv2Hello, SSLv3, TLSv1, TLSv1.1 and TLSv1.2", true);
Expand Down
5 changes: 5 additions & 0 deletions engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,3 +251,8 @@ DELETE role_perm
FROM role_permissions role_perm
INNER JOIN roles ON role_perm.role_id = roles.id
WHERE roles.role_type != 'Admin' AND roles.is_default = 1 AND role_perm.rule = 'migrateVolume';

-- Improve alert.email.addresses description.
UPDATE cloud.configuration
SET description = 'Comma separated list of email addresses which are going to receive alert emails.'
WHERE name = 'alert.email.addresses';
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/configuration/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public enum Config {
String.class,
"alert.email.addresses",
null,
"Comma separated list of email addresses used for sending alerts.",
"Comma separated list of email addresses which are going to receive alert emails.",
null),
AlertEmailSender("Alert", ManagementServer.class, String.class, "alert.email.sender", null, "Sender of alert email (will be in the From header of the email).", null),
AlertSMTPHost("Alert", ManagementServer.class, String.class, "alert.smtp.host", null, "SMTP hostname used for sending out email alerts.", null),
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/projects/ProjectManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

public interface ProjectManager extends ProjectService {
public static final ConfigKey<Boolean> ProjectSmtpUseStartTLS = new ConfigKey<Boolean>("Advanced", Boolean.class, "project.smtp.useStartTLS", "false",
"If set to true and if we enable security via project.smtp.useAuth, this will enable StartTLS to secure the conection.", true);
"If set to true and if we enable security via project.smtp.useAuth, this will enable StartTLS to secure the connection.", true);

public static final ConfigKey<String> ProjectSmtpEnabledSecurityProtocols = new ConfigKey<String>("Advanced", String.class, "project.smtp.enabledSecurityProtocols", "",
"White-space separated security protocols; ex: \"TLSv1 TLSv1.1\". Supported protocols: SSLv2Hello, SSLv3, TLSv1, TLSv1.1 and TLSv1.2", true);
Expand Down