From 1ed54732482e7413151328e9e2f1fd42dc8ba41f Mon Sep 17 00:00:00 2001 From: akihiro_k2k Date: Wed, 7 Nov 2018 11:32:19 +0900 Subject: [PATCH 1/2] BugFix: Replacement mistake with checker.conf & metrics.conf --- install.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index ff4333d7..18773ead 100644 --- a/install.sh +++ b/install.sh @@ -175,10 +175,11 @@ TimeoutStopSec=1s WantedBy=multi-user.target EOF -cat << EOF > /etc/rsyslog.d/checker.conf -if $programname startswith 'checker' then /var/www/$HOME_HAPROXY_WI/log/checker-error.log +cat << 'EOF' > /etc/rsyslog.d/checker.conf +if $programname startswith 'checker' then /var/www/__HOME_HAPROXY_WI__/log/checker-error.log & stop EOF +sed -i -e "s/__HOME_HAPROXY_WI__/$HOME_HAPROXY_WI/g" /etc/rsyslog.d/checker.conf cat << EOF > /etc/logrotate.d/checker /var/www/$HOME_HAPROXY_WI/log/checker-error.log { @@ -214,10 +215,11 @@ TimeoutStopSec=1s WantedBy=multi-user.target EOF -cat << EOF > /etc/rsyslog.d/metrics.conf -if $programname startswith 'metrics' then /var/www/$HOME_HAPROXY_WI/log/metrics-error.log +cat << 'EOF' > /etc/rsyslog.d/metrics.conf +if $programname startswith 'metrics' then /var/www/__HOME_HAPROXY_WI__/log/metrics-error.log & stop EOF +sed -i -e "s/__HOME_HAPROXY_WI__/$HOME_HAPROXY_WI/g" /etc/rsyslog.d/metrics.conf cat << EOF > /etc/logrotate.d/metrics /var/www/$HOME_HAPROXY_WI/log/metrics-error.log { From 6e0c2022eea1d43bc00c3e47e04240be2a772c7c Mon Sep 17 00:00:00 2001 From: akihiro_k2k Date: Wed, 7 Nov 2018 11:34:25 +0900 Subject: [PATCH 2/2] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75946f9d..47401486 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ The installer will ask you a few questions $ git clone https://github.com/Aidaho12/haproxy-wi.git /var/www/haproxy-wi $ cd /var/www/haproxy-wi $ chmod +x install.sh -$ sudo ./install +$ sudo ./install.sh ``` ## Manual install For install just clone: