ES: subscriptions: update default config

duniter4j-es-assembly/src/main/assembly/config/elasticsearch.yml

@@ -127,6 +127,7 @@ duniter.blockchain.sync.enable: true
 #
 duniter.host: gtest.duniter.org
 duniter.port: 10900
+#duniter.useSsl: true
 #
 # ---------------------------------- Duniter4j security -------------------------
 #
@@ -146,6 +147,7 @@ duniter.security.enable: true
 # Token validity duration, in seconds (default: 600)
 #
 # duniter.auth.tokenValidityDuration: 3600  # = 1hour
+
 # ---------------------------------- Duniter4j P2P sync -------------------------
 #
 # Should synchronize data using P2P
@@ -154,15 +156,28 @@ duniter.data.sync.enable: true
 duniter.data.sync.host: data.gtest.duniter.fr
 duniter.data.sync.port: 80
 
-# ---------------------------------- Duniter4j SMTP server -------------------------
+# ---------------------------------- Duniter4j Mail module -----------------------
 #
-# SMTP server configuration (host and port)
+# Enable mail module ?
 #
 duniter.mail.enable: false
+#
+# Mail: SMTP server configuration (host and port)
+#
 #duniter.mail.smtp.host: localhost
 #duniter.mail.smtp.port: 25
 #
-# Mail 'from' address
+# Mail: SMTP server SSL security
+#
+#duniter.mail.smtp.ssl: true
+#duniter.mail.smtp.starttls: true
+#
+# Mail: SMTP server authentication
+#
+#duniter.mail.smtp.username:
+#duniter.mail.smtp.password:
+#
+# Mail: 'from' address
 #
 #duniter.mail.from: no-reply@domain.com
 #
@@ -170,13 +185,31 @@ duniter.mail.enable: false
 #
 #duniter.mail.admin: user@domain.com
 #
-# Mail subject prefix
+# Mail: subject prefix
 #
-#duniter.mail.subject.prefix: '[Duniter4j ES]'
+#duniter.mail.subject.prefix: '[Cesium+]'
 
+# ---------------------------------- Duniter4j Changes module ------------------------
+#
+# Index to listen, for the changes module (Allow to listen changes throw websocket)
+#
 duniter.changes.listenSource: '*/block'
 duniter.ws.port: 9400
 
+# ---------------------------------- Duniter4j Subscription module -------------------
+#
+# Enable subscription module (Need to enable mail features)
+#
 duniter.subscription.enable: true
-
-duniter.subscription.email.cesium.url: 'https://g1.duniter.fr'
+#
+# Email subscription: Day of the week to trigger weekly (default: 2 = monday)
\ No newline at end of file
+#
+#duniter.subscription.email.dayOfWeek: 2
+#
+# Email subscription: Hour in day to trigger daily email subscription (default: 3 AM)
+#
+#duniter.subscription.email.hourOfDay: 3
+#
+# Email subscription: URL to a Cesium site (for link in the email content)
+#
+#duniter.subscription.email.cesium.url: 'https://g1.duniter.fr'
\ No newline at end of file

duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml

@@ -131,7 +131,9 @@ duniter.port: 443
 duniter.useSsl: true
 
 #
-# ---------------------------------- Duniter4j security -------------------------
+# ---------------------------------- Duniter4j security module -------------------
+#
+# Allow admin actions
 #
 duniter.keyring.salt: abc
 duniter.keyring.password: def
@@ -148,7 +150,7 @@ duniter.security.enable: false
 # Token validity duration, in seconds (default: 600)
 #
 # duniter.auth.tokenValidityDuration: 3600  # = 1hour
-#
+
 # ---------------------------------- Duniter4j P2P sync -------------------------
 #
 # Should synchronize data using P2P
@@ -158,37 +160,63 @@ duniter.data.sync.enable: false
 duniter.data.sync.host: g1.data.duniter.fr
 duniter.data.sync.port: 443
 
-# ---------------------------------- Duniter4j SMTP server -------------------------
+# ---------------------------------- Duniter4j Mail module -----------------------
 #
-# SMTP server configuration (host and port)
+# Enable mail module ?
 #
 duniter.mail.enable: true
-duniter.mail.smtp.host: smtp.gmail.com
-duniter.mail.smtp.port: 465
-duniter.mail.smtp.ssl: true
-duniter.mail.smtp.starttls: true
-duniter.mail.smtp.username: benoit.lavenier@e-is.pro
-duniter.mail.smtp.password: .2hainepourDieu
-
 #
-# Mail 'from' address
+# Mail: SMTP server configuration (host and port)
+#
+duniter.mail.smtp.host: localhost
+duniter.mail.smtp.port: 25
+#
+# Mail: SMTP server SSL security
+#
+#duniter.mail.smtp.ssl: true
+#duniter.mail.smtp.starttls: true
+#
+# Mail: SMTP server authentication
+#
+#duniter.mail.smtp.username:
+#duniter.mail.smtp.password:
+#
+# Mail: 'from' address
 #
 #duniter.mail.from: no-reply@domain.com
-duniter.mail.from: benoit.lavenier@e-is.pro
+duniter.mail.from: no-reply@duniter.fr
 
 #
 # Mail: admin address
 #
 #duniter.mail.admin: user@domain.com
-#duniter.mail.admin: blavenie@EIS-DEV
+duniter.mail.admin: blavenie@EIS-DEV
 #
-# Mail subject prefix
+# Mail: subject prefix
 #
-#duniter.mail.subject.prefix: [Duniter4j ES]
+#duniter.mail.subject.prefix: '[Cesium+]'
 
+# ---------------------------------- Duniter4j Changes module ----------------------
+#
+# Index to listen, for the changes module (Allow to listen changes throw websocket)
+#
 duniter.changes.listenSource: '*/block'
 duniter.ws.port: 9400
 
-# = 10s
+# ---------------------------------- Duniter4j Subscription module -----------------
+#
+# Enable subscription module (Need to enable mail features)
+#
 duniter.subscription.enable: true
-duniter.subscription.email.interval: 10000
+#
\ No newline at end of file
+# Email subscription: Day of the week to trigger weekly (default: 2 = monday)
+#
+#duniter.subscription.email.dayOfWeek: 2
+#
+# Email subscription: Hour in day to trigger daily email subscription (default: 3 AM)
+#
+#duniter.subscription.email.hourOfDay: 3
+#
+# Email subscription: URL to a Cesium site, for links in the email content (default: https://g1.duniter.fr)
+#
+#duniter.subscription.email.cesium.url: 'https://domain.com/cesium'
\ No newline at end of file