Merge branch 'master' into 4383-easy-install

[arvados.git] / services / api / config / application.default.yml

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 648d1ade34929539883bb233283bff2cd72f9382..92b3ca1fa688a75043f36a67540fb748ef3cc5ad 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -77,43 +77,34 @@ common:
   # crunch-job must be able to stat() it.
   crunch_refresh_trigger: /tmp/crunch_refresh_trigger
 
-  # Maximum number of log events that may be generated by a single job.
-  crunch_limit_log_events_per_job: 65536
-
-  # These two settings control how frequently log events are flushed
-  # to the database.  If a job generates two or more events within
-  # crunch_log_seconds_between_events, the log data is not flushed
-  # until crunch_log_bytes_per_event has been reached.
+  # These two settings control how frequently log events are flushed to the
+  # database.  Log lines are buffered until either crunch_log_bytes_per_event
+  # has been reached or crunch_log_seconds_between_events has elapsed since
+  # the last flush.
   crunch_log_bytes_per_event: 4096
   crunch_log_seconds_between_events: 1
 
-  # Maximum number of total bytes that may be logged by a single job.  Logs
-  # that are throttled (see below) are not counted against this total.
-  crunch_limit_log_bytes_per_job: 67108864
+  # The sample period for throttling logs, in seconds.
+  crunch_log_throttle_period: 60
 
-  # The sample period for throttling logs, in seconds (see below)
-  crunch_log_throttle_period: 30
+  # Maximum number of bytes that job can log over crunch_log_throttle_period
+  # before being silenced until the end of the period.
+  crunch_log_throttle_bytes: 65536
 
-  # Maximum number of bytes that job can log over
-  # crunch_limit_log_event_throttle_period before being silenced
-  crunch_log_throttle_bytes: 60000
+  # Maximum number of lines that job can log over crunch_log_throttle_period
+  # before being silenced until the end of the period.
+  crunch_log_throttle_lines: 1024
 
-  # Maximum number of lines that job can log over
-  # crunch_limit_log_event_throttle_period before being silenced
-  crunch_log_throttle_lines: 1000
+  # Maximum bytes that may be logged by a single job.  Log bytes that are
+  # silenced by throttling are not counted against this total.
+  crunch_limit_log_bytes_per_job: 67108864
 
   # Path to /etc/dnsmasq.d, or false = do not update dnsmasq data.
   dnsmasq_conf_dir: false
 
-  # Set to AMI id (ami-123456) to auto-start nodes. See app/models/node.rb
-  compute_node_ami: false
-  compute_node_ec2run_args: -g arvados-compute
-  compute_node_spot_bid: 0.11
-
   compute_node_domain: false
   compute_node_nameservers:
     - 192.168.1.1
-  compute_node_ec2_tag_enable: false
 
   # The version below is suitable for AWS.
   # To use it, copy it to your application.yml, uncomment, and change <%# to <%=
@@ -142,6 +133,10 @@ common:
   # should be an address associated with a Google account.
   auto_admin_user: false
 
+  # If auto_admin_first_user is set to true, the first user to log in when no
+  # other admin users exist will automatically become an admin user.
+  auto_admin_first_user: false
+
   ## Set Time.zone default to the specified zone and make Active
   ## Record auto-convert to this zone.  Run "rake -D time" for a list
   ## of tasks for finding time zone names. Default is UTC.