From 8ea805e4e3a70a3da9ef840f3991c7a56006f052 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 6 Jun 2017 08:22:46 -0700
Subject: [PATCH] Update sample configuration

// FREEBIE
---
 config/sample.yml | 95 ++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 50 deletions(-)

diff --git a/config/sample.yml b/config/sample.yml
index d5e697bbe..8960b7eb5 100644
--- a/config/sample.yml
+++ b/config/sample.yml
@@ -1,62 +1,57 @@
-twilio: # Twilio SMS gateway configuration
-  accountId:
-  accountToken:
-  numbers:
-  localDomain: # The domain Twilio can call back to.
+twilio: # Twilio gateway configuration
+  accountId: 
+  accountToken: 
+  numbers: # Numbers allocated in Twilio
+    - # First number
+    - # Second number
+    - # Third number
+    - # ...
+    - # Nth number
+  messagingServicesId: 
+  localDomain: # Domain Twilio can connect back to for calls. Should be domain of your service.
 
-push: # GCM/APN push server configuration
-  host:
-  port:
-  username:
+push:
+  queueSize: # Size of push pending queue
+
+redphone:
+  authKey: # Deprecated
+
+turn: # TURN server configuration
+  secret: # TURN server secret
+  uris:
+    - stun:yourdomain:80
+    - stun:yourdomain.com:443
+    - turn:yourdomain:443?transport=udp
+    - turn:etc.com:80?transport=udp
+
+cache: # Redis server configuration for cache cluster
+  url:
+
+directory: # Redis server configuration for directory cluster
+  url:
+
+messageStore: # Postgresql database configuration for message store
+  driverClass: org.postgresql.Driver
+  user:
   password:
+  url:
 
 s3: # AWS S3 configuration
-  accessKey: 
-  accessSecret: 
-
-  # Name of the S3 bucket (needs to have been created)
-  # for attachments to go.  Should be configured with
-  # correct permissions.
+  accessKey:
+  accessSecret:
   attachmentsBucket:
 
-directory: # Redis server configuration for TS directory
-  url:
-
-cache: # Redis server configuration for general purpose caching
-  url:
-
-websocket:
-  enabled: true
-
-messageStore: # Postgres database configuration for message store
+database: # Postgresql database configuration
   driverClass: org.postgresql.Driver
   user:
   password:
   url:
 
-database: # Postgres database configuration for account store
-  # the name of your JDBC driver
-  driverClass: org.postgresql.Driver
-
-  # the username
-  user:
-
-  # the password
-  password:
-
-  # the JDBC URL
-  url: jdbc:postgresql://somehost:somport/somedb
-
-  # any properties specific to your JDBC driver:
-  properties:
-    charSet: UTF-8
-
-federation:
-  name:
-  peers: 
-    -
-      name: somepeer
-      url: https://foo.com
-      authenticationToken: foo
-      certificate: in pem format 
+apn: # Apple Push Notifications configuration
+  bundleId:
+  pushCertificate:
+  pushKey:
 
+gcm: # GCM Configuration
+  senderId:
+  apiKey: