Merge branch 'master' into fry

ADVANCED.md

@@ -14,6 +14,7 @@ There are multiple environment variables you can configure to modify behaviour o
 * `RLN_RELAY_CRED_PATH` - path for peristing rln-relay credential
 * `RLN_RELAY_CRED_PASSWORD` - password for encrypting RLN credentials
 * `EXTRA_ARGS` - this variable allows you to specify additional or overriding CLI option for the Waku node which will be appended to the `wakunode2` command. (e.g. `EXTRA_ARGS="--store=false --max-connections=3000`)
+* `CERTS_DIR` - allows you to define a path where SSL certificates are/will be stored. It needs to follow the directory structure produced by Certbot in `/etc/letsencrypt`
 
 ## Log monitoring and troubleshooting
 

docker-compose.yml

@@ -47,7 +47,7 @@ services:
     environment:
       DOMAIN: ${DOMAIN}
       NODEKEY: ${NODEKEY}
-      KEYSTORE_PASSWORD: "${KEYSTORE_PASSWORD}"
+      RLN_RELAY_CRED_PASSWORD: "${RLN_RELAY_CRED_PASSWORD}"
       ETH_CLIENT_ADDRESS: *eth_client_address
       EXTRA_ARGS: ${EXTRA_ARGS}
       <<:
@@ -55,9 +55,9 @@ services:
         - *rln_env
     volumes:
       - ./run_node.sh:/opt/run_node.sh:Z
-      - ./certs:/etc/letsencrypt/:Z
+      - ${CERTS_DIR:-./certs}:/etc/letsencrypt/:Z
       - ./rln_tree:/etc/rln_tree/:Z
-      - ./keystore/keystore.json:/keystore/keystore.json/:Z
+      - ./keystore/keystore.json:/keystore/keystore.json:Z
     entrypoint: sh
     command:
       - /opt/run_node.sh

register_rln.sh

@@ -24,5 +24,5 @@ docker run -v $(pwd)/keystore:/keystore/:Z wakuorg/nwaku:v0.21.3 generateRlnKeys
 --rln-relay-eth-private-key=${ETH_TESTNET_KEY} \
 --rln-relay-eth-contract-address=0xF471d71E9b1455bBF4b85d475afb9BB0954A29c4 \
 --rln-relay-cred-path=/keystore/keystore.json \
---rln-relay-cred-password="'"${RLN_RELAY_CRED_PASSWORD}"'" \
+--rln-relay-cred-password="${RLN_RELAY_CRED_PASSWORD}" \
 --execute

run_node.sh

@@ -51,7 +51,7 @@ RLN_RELAY_CRED_PATH=--rln-relay-cred-path=${RLN_RELAY_CRED_PATH:-/keystore/keyst
 
 
 if [ -n "${RLN_RELAY_CRED_PASSWORD}" ]; then
-    RLN_RELAY_CRED_PASSWORD=--rln-relay-cred-password="'"${RLN_RELAY_CRED_PASSWORD}"'"
+    RLN_RELAY_CRED_PASSWORD=--rln-relay-cred-password="${RLN_RELAY_CRED_PASSWORD}"
 fi
 
 exec /usr/bin/wakunode\
@@ -84,6 +84,7 @@ exec /usr/bin/wakunode\
   --metrics-server-port=8003\
   --metrics-server-address=0.0.0.0\
   --rest=true\
+  --rest-admin=true\
   --rest-address=0.0.0.0\
   --rest-port=8645\
   --nat=extip:"${MY_EXT_IP}"\