From c505ed5f0b00a5ce56b691c0aaca21733e841808 Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Tue, 17 May 2022 17:11:20 +0900
Subject: [PATCH 1/5] [installer] Configure nvm to install Node.js v16.15.0 /
 npm v8.5.5

---
 production/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/production/install b/production/install
index 0fc9becb6..b40d868bf 100755
--- a/production/install
+++ b/production/install
@@ -854,7 +854,7 @@ echo "[*] Installing nvm.sh from GitHub"
 osSudo "${MEMPOOL_USER}" sh -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | zsh'
 
 echo "[*] Building NodeJS via nvm.sh"
-osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm install v16.10.0'
+osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm install v16.15.0'
 
 ####################
 # Tor installation #

From d2e041ec6515c039b84125a7a460ad7843b21f10 Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Tue, 17 May 2022 17:12:13 +0900
Subject: [PATCH 2/5] [installer] Fix electrs patch sed pattern typo introduced
 in #1628

---
 production/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/production/install b/production/install
index b40d868bf..8c46f568e 100755
--- a/production/install
+++ b/production/install
@@ -1016,7 +1016,7 @@ osSudo "${BITCOIN_USER}" sh -c "cd ${BITCOIN_ELECTRS_HOME} && cargo run --releas
 echo "[*] Patching Bitcoin Electrs code for FreeBSD"
 osSudo "${BITCOIN_USER}" sh -c "cd \"${BITCOIN_HOME}/.cargo/registry/src/github.com-1ecc6299db9ec823/sysconf-0.3.4\" && patch -p1 < \"${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/freebsd/sysconf.patch\""
 osSudo "${BITCOIN_USER}" sh -c "cd \"${BITCOIN_ELECTRS_HOME}/src/new_index/\" && sed -i .bak -e s/Snappy/None/ db.rs && rm db.rs.bak"
-osSudo "${BITCOIN_USER}" sh -c "cd \"${BITCOIN_ELECTRS_HOME}/src/bin/\" && sed -i .bak -e s/from_secs(5)/from_secs(1)/ electrs.rs && rm electrs.rs.bak"
+osSudo "${BITCOIN_USER}" sh -c "cd \"${BITCOIN_ELECTRS_HOME}/src/bin/\" && sed -i .bak -e 's/from_secs(5)/from_secs(1)/' electrs.rs && rm electrs.rs.bak"
 
 echo "[*] Building Bitcoin Electrs release binary"
 osSudo "${BITCOIN_USER}" sh -c "cd ${BITCOIN_ELECTRS_HOME} && cargo run --release --bin electrs -- --version"

From 5698468fbf1c9613cffc7f7c23e03b09e2bfd86d Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Tue, 17 May 2022 17:25:10 +0900
Subject: [PATCH 3/5] [installer] Checkout top-level mempool using master
 branch

---
 production/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/production/install b/production/install
index 8c46f568e..68978399e 100755
--- a/production/install
+++ b/production/install
@@ -276,7 +276,7 @@ MINFEE_HOME=/minfee
 MEMPOOL_REPO_URL=https://github.com/mempool/mempool
 MEMPOOL_REPO_NAME=mempool
 MEMPOOL_REPO_BRANCH=master
-MEMPOOL_LATEST_RELEASE=v2.3.1
+MEMPOOL_LATEST_RELEASE=master
 
 BITCOIN_REPO_URL=https://github.com/bitcoin/bitcoin
 BITCOIN_REPO_NAME=bitcoin

From 30337095cf18ec736e5d1cfb49288e5feed09b43 Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Tue, 17 May 2022 17:26:05 +0900
Subject: [PATCH 4/5] [prod] Clarify syslog.conf syntax for priorities to
 keybase

---
 production/syslog.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/production/syslog.conf b/production/syslog.conf
index 9a2a382fe..1a36100dd 100644
--- a/production/syslog.conf
+++ b/production/syslog.conf
@@ -1,4 +1,4 @@
 local7.>=notice |/usr/local/bin/sudo -u mempool /usr/local/bin/mempool-logger mempool.ops alerts
-local7.info |/usr/local/bin/sudo -u mempool /usr/local/bin/mempool-logger mempool.ops node100
-local7.info /var/log/mempool
+local7.>=info |/usr/local/bin/sudo -u mempool /usr/local/bin/mempool-logger mempool.ops node100
+local7.>=info /var/log/mempool
 local7.* /var/log/mempool.debug

From ece1cbbaa9c50f57d3b01a0eb5ca46030abaa28a Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Tue, 17 May 2022 17:43:35 +0900
Subject: [PATCH 5/5] [installer] Fix mempool checkout for bisq instance

---
 production/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/production/install b/production/install
index 68978399e..f2cb17025 100755
--- a/production/install
+++ b/production/install
@@ -1299,7 +1299,7 @@ if [ "${ELEMENTS_LIQUIDTESTNET_ENABLE}" = ON ];then
     osSudo "${MEMPOOL_USER}" sh -c "cd ${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME} && git checkout ${MEMPOOL_LATEST_RELEASE}"
 fi
 
-if [ "${BISQ_ENABLE}" = ON ];then
+if [ "${BISQ_INSTALL}" = ON ];then
     echo "[*] Creating Mempool instance for Bisq"
     osSudo "${MEMPOOL_USER}" git config --global advice.detachedHead false
     osSudo "${MEMPOOL_USER}" git clone --branch "${MEMPOOL_REPO_BRANCH}" "${MEMPOOL_REPO_URL}" "${MEMPOOL_HOME}/bisq"