From 26678170e7a981461f1676855358e52bf1d6bf72 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 30 Jul 2014 16:03:19 -0400 Subject: [PATCH] 3349: More example/default config cleanup. --- services/api/config/application.default.yml | 11 +++++++++ services/api/config/application.yml.example | 26 ++++----------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml index 0d26804241..5436f0227d 100644 --- a/services/api/config/application.default.yml +++ b/services/api/config/application.default.yml @@ -40,6 +40,8 @@ test: active_support.deprecation: :stderr active_record.mass_assignment_sanitizer: :strict uuid_prefix: zzzzz + secret_token: <%= rand(2**512).to_s(36) %> + blob_signing_key: <%= rand(2**512).to_s(36) %> common: uuid_prefix: <%= Digest::MD5.hexdigest(`hostname`).to_i(16).to_s(36)[0..4] %> @@ -92,6 +94,15 @@ common: - 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 <%= + # compute_node_nameservers: <%# + # require 'net/http' + # ['local', 'public'].collect do |iface| + # Net::HTTP.get(URI("http://169.254.169.254/latest/meta-data/#{iface}-ipv4")).match(/^[\d\.]+$/)[0] + # end << '172.16.0.23' + # %> + accept_api_token: {} new_users_are_active: false diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example index 09dd78c06d..d6de1ff9b5 100644 --- a/services/api/config/application.yml.example +++ b/services/api/config/application.yml.example @@ -19,29 +19,13 @@ production: # Mandatory site secrets. See application.default.yml for more info. secret_token: ~ blob_signing_key: ~ - uuid_prefix: bogus - # compute_node_domain: example.org - # compute_node_nameservers: - # - 127.0.0.1 - # - 192.168.1.1 - # - # The version below is suitable for AWS. - # Uncomment and change <%# to <%= to use it. - # compute_node_nameservers: <%# - # require 'net/http' - # ['local', 'public'].collect do |iface| - # Net::HTTP.get(URI("http://169.254.169.254/latest/meta-data/#{iface}-ipv4")).match(/^[\d\.]+$/)[0] - # end << '172.16.0.23' - # %> - test: - uuid_prefix: zzzzz - secret_token: <%= rand(2**512).to_s(36) %> - blob_signing_key: <%= rand(2**512).to_s(36) %> + # Tests should be able to run without further configuration, but if you do + # want to change your local test configuration, this is where to do it. common: - #git_repositories_dir: /var/cache/git - #git_internal_dir: /var/cache/arvados/internal.git - + # Settings in this section will be used in all environments + # (development, production, test) except when overridden in the + # environment-specific sections above. -- 2.39.5