Commit Graph

4 Commits

Author SHA1 Message Date
Jacob Hoffman-Andrews feaf6bd230 Merge branch 'master' into secrets 2015-11-30 14:14:47 -08:00
Jacob Hoffman-Andrews b8a91739e3 Allow AMQP URLs to be loaded from files.
This allows secret values to be separated from the main config.

Part of #1157
2015-11-30 11:50:14 -08:00
Jacob Hoffman-Andrews 608a0c9073 Move file reading to DBConfig and out of SA.
Also remove AMQP secret changes: one thing at a time.
2015-11-23 22:09:54 -08:00
Jacob Hoffman-Andrews 5dd212dd47 Add ConfigSecret.
This allows secret values to be stored externally to the config file, so that
config files can be easily shared without revealing secret data.
2015-11-19 22:41:27 -08:00