timvideos / streaming-system

Tim Video's - Live Streaming for user groups and other events.
https://code.timvideos.us/
Apache License 2.0
131 stars 52 forks source link

Random commits from lukejohnsmahi's master branch. #84

Closed mithro closed 9 years ago

ApsOps commented 9 years ago

First 5 commits redundant in #85

@mithro Any reason/case when keys in config.private.json shouldn't match config.json? Commits https://github.com/lukejohnosmahi/streaming-system/commit/39fc0d4eb581c3d9e271c45e77738ede97a8fa8f and https://github.com/lukejohnosmahi/streaming-system/commit/332089faa55edc019ae8a16b01fd73eeb096756f are trying to fix this.

mithro commented 9 years ago

config.private.json and config.json should never be the same. The private file should only have your local configuration that nobody else should see (such as the passwords and salts).

ApsOps commented 9 years ago

These are already merged. Closing.