Skip to content

Commit

Permalink
Merge pull request #30 from 18F/jgs/fix-cert-logging
Browse files Browse the repository at this point in the history
Add AWS region to configuration
  • Loading branch information
jgsmith-usds authored Oct 10, 2018
2 parents b3297a0 + f9c0c73 commit c523c85
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
4 changes: 4 additions & 0 deletions config/application.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
# back to one of these roots. The first one is the ultimate public root.
# The others are DoD certs 2-4 from the archive available at
# http://iasecontent.disa.mil/pki-pke/Certificates_PKCS7_v5.0u1_DoD.zip
aws_http_timeout: '5'
trusted_ca_root_identifiers: "\
AD:0C:7A:75:5C:E5:F3:98:C4:79:98:0E:AC:28:FD:97:F4:E7:02:FC,\
49:74:BB:0C:5E:BA:7A:FE:02:54:EF:7B:A0:C6:95:C6:09:80:70:96,\
6C:8A:94:A2:77:B1:80:72:1D:81:7A:16:AA:F2:DC:CE:66:EE:45:C0,\
BD:C1:B9:6B:4D:F4:1D:EC:30:90:BF:62:73:C0:84:33:F2:71:24:85"

development:
aws_region: 'us-east-1'
client_cert_escaped: 'true'
database_name: 'identity_pki_dev'
identity_idp_host: 'localhost'
Expand All @@ -27,6 +29,7 @@ development:
secret_key_base: ''

test:
aws_region: 'us-east-1'
client_cert_escaped: 'true'
database_name: 'identity_pki_test'
identity_idp_host: 'localhost'
Expand All @@ -40,5 +43,6 @@ test:
secret_key_base: ''

production:
aws_region:
client_cert_escaped: 'true'
nonce_bloom_filter_enabled: 'false'
5 changes: 5 additions & 0 deletions config/initializers/aws.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Aws.config.update(
region: Figaro.env.aws_region,
http_open_timeout: Figaro.env.aws_http_timeout.to_i,
http_read_timeout: Figaro.env.aws_http_timeout.to_i
)

0 comments on commit c523c85

Please sign in to comment.