Skip to content

Commit 1711e68

Browse files
DanielleMaywoodDanielleMaywood
committed
revert: more changes
1 parent a8b5a61 commit 1711e68

File tree

3 files changed

+202
-202
lines changed

3 files changed

+202
-202
lines changed

‎cli/testdata/server-config.yaml.golden

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,51 @@ userQuietHoursSchedule:
518518
# compatibility reasons, this will be removed in a future release.
519519
# (default: false, type: bool)
520520
allowWorkspaceRenames: false
521+
# Configure how emails are sent.
522+
email:
523+
# The sender's address to use.
524+
# (default: <unset>, type: string)
525+
from: ""
526+
# The intermediary SMTP host through which emails are sent.
527+
# (default: localhost:587, type: host:port)
528+
smarthost: localhost:587
529+
# The hostname identifying the SMTP server.
530+
# (default: localhost, type: string)
531+
hello: localhost
532+
# Force a TLS connection to the configured SMTP smarthost.
533+
# (default: false, type: bool)
534+
forceTLS: false
535+
# Configure SMTP authentication options.
536+
emailAuth:
537+
# Identity to use with PLAIN authentication.
538+
# (default: <unset>, type: string)
539+
identity: ""
540+
# Username to use with PLAIN/LOGIN authentication.
541+
# (default: <unset>, type: string)
542+
username: ""
543+
# File from which to load password for use with PLAIN/LOGIN authentication.
544+
# (default: <unset>, type: string)
545+
passwordFile: ""
546+
# Configure TLS for your SMTP server target.
547+
emailTLS:
548+
# Enable STARTTLS to upgrade insecure SMTP connections using TLS.
549+
# (default: <unset>, type: bool)
550+
startTLS: false
551+
# Server name to verify against the target certificate.
552+
# (default: <unset>, type: string)
553+
serverName: ""
554+
# Skip verification of the target server's certificate (insecure).
555+
# (default: <unset>, type: bool)
556+
insecureSkipVerify: false
557+
# CA certificate file to use.
558+
# (default: <unset>, type: string)
559+
caCertFile: ""
560+
# Certificate file to use.
561+
# (default: <unset>, type: string)
562+
certFile: ""
563+
# Certificate key file to use.
564+
# (default: <unset>, type: string)
565+
certKeyFile: ""
521566
# Configure how notifications are processed and delivered.
522567
notifications:
523568
# Controls if notifications are enabled.
@@ -612,48 +657,3 @@ notifications:
612657
# How often to query the database for queued notifications.
613658
# (default: 15s, type: duration)
614659
fetchInterval: 15s
615-
# Configure how emails are sent.
616-
email:
617-
# The sender's address to use.
618-
# (default: <unset>, type: string)
619-
from: ""
620-
# The intermediary SMTP host through which emails are sent.
621-
# (default: localhost:587, type: host:port)
622-
smarthost: localhost:587
623-
# The hostname identifying the SMTP server.
624-
# (default: localhost, type: string)
625-
hello: localhost
626-
# Force a TLS connection to the configured SMTP smarthost.
627-
# (default: false, type: bool)
628-
forceTLS: false
629-
# Configure SMTP authentication options.
630-
emailAuth:
631-
# Identity to use with PLAIN authentication.
632-
# (default: <unset>, type: string)
633-
identity: ""
634-
# Username to use with PLAIN/LOGIN authentication.
635-
# (default: <unset>, type: string)
636-
username: ""
637-
# File from which to load password for use with PLAIN/LOGIN authentication.
638-
# (default: <unset>, type: string)
639-
passwordFile: ""
640-
# Configure TLS for your SMTP server target.
641-
emailTLS:
642-
# Enable STARTTLS to upgrade insecure SMTP connections using TLS.
643-
# (default: <unset>, type: bool)
644-
startTLS: false
645-
# Server name to verify against the target certificate.
646-
# (default: <unset>, type: string)
647-
serverName: ""
648-
# Skip verification of the target server's certificate (insecure).
649-
# (default: <unset>, type: bool)
650-
insecureSkipVerify: false
651-
# CA certificate file to use.
652-
# (default: <unset>, type: string)
653-
caCertFile: ""
654-
# Certificate file to use.
655-
# (default: <unset>, type: string)
656-
certFile: ""
657-
# Certificate key file to use.
658-
# (default: <unset>, type: string)
659-
certKeyFile: ""

‎codersdk/deployment.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2597,6 +2597,21 @@ Write out the current server config as YAML to stdout.`,
25972597
YAML: "thresholdDatabase",
25982598
Annotations: serpent.Annotations{}.Mark(annotationFormatDuration, "true"),
25992599
},
2600+
// Email options
2601+
emailFrom,
2602+
emailSmarthost,
2603+
emailHello,
2604+
emailForceTLS,
2605+
emailAuthIdentity,
2606+
emailAuthUsername,
2607+
emailAuthPassword,
2608+
emailAuthPasswordFile,
2609+
emailTLSStartTLS,
2610+
emailTLSServerName,
2611+
emailTLSSkipCertVerify,
2612+
emailTLSCertAuthorityFile,
2613+
emailTLSCertFile,
2614+
emailTLSCertKeyFile,
26002615
// Notifications Options
26012616
{
26022617
Name: "Notifications: Enabled",
@@ -2868,21 +2883,6 @@ Write out the current server config as YAML to stdout.`,
28682883
Annotations: serpent.Annotations{}.Mark(annotationFormatDuration, "true"),
28692884
Hidden: true, // Hidden because most operators should not need to modify this.
28702885
},
2871-
// Email options
2872-
emailFrom,
2873-
emailSmarthost,
2874-
emailHello,
2875-
emailForceTLS,
2876-
emailAuthIdentity,
2877-
emailAuthUsername,
2878-
emailAuthPassword,
2879-
emailAuthPasswordFile,
2880-
emailTLSStartTLS,
2881-
emailTLSServerName,
2882-
emailTLSSkipCertVerify,
2883-
emailTLSCertAuthorityFile,
2884-
emailTLSCertFile,
2885-
emailTLSCertKeyFile,
28862886
}
28872887

28882888
return opts

0 commit comments

Comments
 (0)