From dc4cd96fc0404b40f04b05fa78757b8ca64281b5 Mon Sep 17 00:00:00 2001 From: Stephan Oeste Date: Wed, 24 Aug 2022 16:08:17 +0200 Subject: [PATCH] Fix path for newsyslog configs in prod installer --- production/install | 31 ++++++++++++++++++++++--------- production/linux/rsyslog.conf | 2 ++ 2 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 production/linux/rsyslog.conf diff --git a/production/install b/production/install index 729ff33e0a..db16484e7e 100755 --- a/production/install +++ b/production/install @@ -911,15 +911,28 @@ osSudo "${MEMPOOL_USER}" ln -s mempool/production/mempool-kill-all stop osSudo "${MEMPOOL_USER}" ln -s mempool/production/mempool-start-all start osSudo "${MEMPOOL_USER}" ln -s mempool/production/mempool-restart-all restart -echo "[*] Installing syslog configuration" -osSudo "${ROOT_USER}" mkdir -p /usr/local/etc/syslog.d -osSudo "${ROOT_USER}" install -c -m 755 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/mempool-logger" /usr/local/bin/mempool-logger -osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/syslog.conf" /usr/local/etc/syslog.d/mempool.conf - -echo "[*] Installing newsyslog configuration" -osSudo "${ROOT_USER}" mkdir -p /usr/local/etc/newsyslog.conf.d -osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/newsyslog-mempool-backend.conf" /usr/local/etc/syslog.d/newsyslog-mempool-backend.conf -osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/newsyslog-mempool-nginx.conf" /usr/local/etc/syslog.d/newsyslog-mempool-nginx.conf + +case $OS in + FreeBSD) + echo "[*] Installing syslog configuration" + osSudo "${ROOT_USER}" mkdir -p /usr/local/etc/syslog.d + osSudo "${ROOT_USER}" install -c -m 755 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/mempool-logger" /usr/local/bin/mempool-logger + osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/syslog.conf" /usr/local/etc/syslog.d/mempool.conf + + echo "[*] Installing newsyslog configuration" + osSudo "${ROOT_USER}" mkdir -p /usr/local/etc/newsyslog.conf.d + osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/newsyslog-mempool-backend.conf" /usr/local/etc/newsyslog.conf.d/newsyslog-mempool-backend.conf + osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/newsyslog-mempool-nginx.conf" /usr/local/etc/newsyslog.conf.d/newsyslog-mempool-nginx.conf + + echo "[*] Creating log files" + osSudo "${ROOT_USER}" newsyslog -C + ;; + Debian) + echo "[*] Installing syslog configuration" + osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/linux/rsyslog.conf" /etc/rsyslog.d/10-mempool.conf + osSudo "${ROOT_USER}" sed -i.orig -e 's/^\*\.\*;auth,authpriv\.none/*\.*;auth,authpriv\.none,local7\.none/' /etc/rsyslog.d/50-default.conf + ;; +esac echo "[*] Installing Mempool crontab" osSudo "${ROOT_USER}" crontab -u "${MEMPOOL_USER}" "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/mempool.crontab" diff --git a/production/linux/rsyslog.conf b/production/linux/rsyslog.conf new file mode 100644 index 0000000000..92ce6e591f --- /dev/null +++ b/production/linux/rsyslog.conf @@ -0,0 +1,2 @@ +local7.info /var/log/mempool +local7.* /var/log/mempool.debug