Merge branch 'main' into 15397-remove-obsolete-apis

[arvados.git] / lib / config / config.default.yml

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index f84869d7fbee46c41646b787728423e8c827abf1..6ec53642165db7b4cc3ae4884f6486b8b6669024 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -366,6 +366,17 @@ Clusters:
       # other admin users exist will automatically become an admin user.
       AutoAdminFirstUser: false
 
+      # Support email address to display in Workbench.
+      SupportEmailAddress: "arvados@example.com"
+
+      # Outgoing email configuration:
+      #
+      # In order to send mail, Arvados expects a default SMTP server
+      # on localhost:25.  It cannot require authentication on
+      # connections from localhost.  That server should be configured
+      # to relay mail to a "real" SMTP server that is able to send
+      # email on behalf of your domain.
+
       # Recipient for notification email sent out when a user sets a
       # profile on their account.
       UserProfileNotificationAddress: ""
@@ -409,6 +420,10 @@ Clusters:
       # Currently implemented for OpenID Connect only.
       PreferDomainForUsername: ""
 
+      # Send an email to each user when their account has been set up
+      # (meaning they are able to log in).
+      SendUserSetupNotificationEmail: true
+
       # Ruby ERB template used for the email sent out to users when
       # they have been set up.
       UserSetupMailText: |
@@ -1326,18 +1341,6 @@ Clusters:
         # MaxRunTimeDefault: 2h
         MaxRunTimeDefault: 0
 
-      JobsAPI:
-        # Enable the legacy 'jobs' API (crunch v1).  This value must be a string.
-        #
-        # Note: this only enables read-only access, creating new
-        # legacy jobs and pipelines is not supported.
-        #
-        # 'auto' -- (default) enable the Jobs API only if it has been used before
-        #         (i.e., there are job records in the database)
-        # 'true' -- enable the Jobs API despite lack of existing records.
-        # 'false' -- disable the Jobs API despite presence of existing records.
-        Enable: 'auto'
-
       CloudVMs:
         # Enable the cloud scheduler.
         Enable: false
@@ -1741,32 +1744,6 @@ Clusters:
           # should leave this alone.
           Serialize: false
 
-    Mail:
-      # In order to send mail, Arvados expects a default SMTP server
-      # on localhost:25.  It cannot require authentication on
-      # connections from localhost.  That server should be configured
-      # to relay mail to a "real" SMTP server that is able to send
-      # email on behalf of your domain.
-
-      # See also the "Users" configuration section for additional
-      # email-related options.
-
-      # When a user has been set up (meaning they are able to log in)
-      # they will receive an email using the template specified
-      # earlier in Users.UserSetupMailText
-      SendUserSetupNotificationEmail: true
-
-      # Bug/issue report notification to and from addresses
-      IssueReporterEmailFrom: "arvados@example.com"
-      IssueReporterEmailTo: "arvados@example.com"
-      SupportEmailAddress: "arvados@example.com"
-
-      # Generic issue email from
-      EmailFrom: "arvados@example.com"
-
-      # No longer supported, to be removed.
-      MailchimpAPIKey: ""
-      MailchimpListID: ""
     RemoteClusters:
       "*":
         Host: ""