Created
December 7, 2014 19:30
-
-
Save mjtorn/e57db1dfa0fed9e7c790 to your computer and use it in GitHub Desktop.
To run TextSecure-Server easily
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
twilio: | |
accountId: | |
accountToken: | |
number: | |
localDomain: # The domain Twilio can call back to. | |
international: # Boolean specifying Twilio for international delivery | |
# Optional. If specified, Nexmo will be used for non-US SMS and | |
# voice verification if twilio.international is false. Otherwise, | |
# Nexmo, if specified, Nexmo will only be used as a fallback | |
# for failed Twilio deliveries. | |
nexmo: | |
apiKey: | |
apiSecret: | |
number: | |
gcm: | |
senderId: | |
apiKey: | |
# Optional. Only if iOS clients are supported. | |
apn: | |
# In PEM format. | |
certificate: | |
# In PEM format. | |
key: | |
s3: | |
accessKey: | |
accessSecret: | |
# Name of the S3 bucket (needs to have been created) | |
# for attachments to go. Should be configured with | |
# correct permissions. | |
attachmentsBucket: | |
memcache: | |
servers: localhost:11211 | |
user: | |
password: | |
redis: | |
url: redis://localhost:6379 | |
# federation: | |
# name: | |
# peers: | |
# - | |
# name: somepeer | |
# url: https://foo.com | |
# authenticationToken: foo | |
# certificate: in pem format | |
# Optional address of graphite server to report metrics | |
graphite: | |
host: | |
port: | |
database: | |
# the name of your JDBC driver | |
driverClass: org.postgresql.Driver | |
# the username | |
user: textsecure | |
# the password | |
password: textsecure | |
# the JDBC URL | |
url: jdbc:postgresql://localhost/textsecure | |
# any properties specific to your JDBC driver: | |
properties: | |
charSet: UTF-8 | |
websocket: | |
enabled: true | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java | |
index 968ab38..d9426c2 100644 | |
--- a/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java | |
+++ b/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java | |
@@ -150,8 +150,8 @@ public class WhisperServerService extends Application<WhisperServerConfiguration | |
WebsocketSender websocketSender = new WebsocketSender(storedMessages, pubSubManager); | |
- environment.lifecycle().manage(apnSender); | |
- environment.lifecycle().manage(gcmSender); | |
+ // environment.lifecycle().manage(apnSender); | |
+ // environment.lifecycle().manage(gcmSender); | |
AccountAuthenticator deviceAuthenticator = new AccountAuthenticator(accountsManager); | |
RateLimiters rateLimiters = new RateLimiters(config.getLimitsConfiguration(), memcachedClient); | |
diff --git a/src/main/java/org/whispersystems/textsecuregcm/configuration/GcmConfiguration.java b/src/main/java/org/whispersystems/textsecuregcm/configuration/GcmConfiguration.java | |
index e974e1d..e21bc1f 100644 | |
--- a/src/main/java/org/whispersystems/textsecuregcm/configuration/GcmConfiguration.java | |
+++ b/src/main/java/org/whispersystems/textsecuregcm/configuration/GcmConfiguration.java | |
@@ -23,11 +23,11 @@ import javax.validation.constraints.NotNull; | |
public class GcmConfiguration { | |
- @NotNull | |
+ // @NotNull | |
@JsonProperty | |
private long senderId; | |
- @NotEmpty | |
+ // @NotEmpty | |
@JsonProperty | |
private String apiKey; | |
diff --git a/src/main/java/org/whispersystems/textsecuregcm/configuration/S3Configuration.java b/src/main/java/org/whispersystems/textsecuregcm/configuration/S3Configuration.java | |
index 83d7267..fec68ad 100644 | |
--- a/src/main/java/org/whispersystems/textsecuregcm/configuration/S3Configuration.java | |
+++ b/src/main/java/org/whispersystems/textsecuregcm/configuration/S3Configuration.java | |
@@ -21,15 +21,15 @@ import org.hibernate.validator.constraints.NotEmpty; | |
public class S3Configuration { | |
- @NotEmpty | |
+ // @NotEmpty | |
@JsonProperty | |
private String accessKey; | |
- @NotEmpty | |
+ // @NotEmpty | |
@JsonProperty | |
private String accessSecret; | |
- @NotEmpty | |
+ // @NotEmpty | |
@JsonProperty | |
private String attachmentsBucket; | |
diff --git a/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioConfiguration.java b/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioConfiguration.java | |
index bba847b..601613b 100644 | |
--- a/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioConfiguration.java | |
+++ b/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioConfiguration.java | |
@@ -21,19 +21,19 @@ import org.hibernate.validator.constraints.NotEmpty; | |
public class TwilioConfiguration { | |
- @NotEmpty | |
+ // @NotEmpty | |
@JsonProperty | |
private String accountId; | |
- @NotEmpty | |
+ // @NotEmpty | |
@JsonProperty | |
private String accountToken; | |
- @NotEmpty | |
+ // @NotEmpty | |
@JsonProperty | |
private String number; | |
- @NotEmpty | |
+ // @NotEmpty | |
@JsonProperty | |
private String localDomain; | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment