From 51b4a1117a68f1e6eb6b1d6d6b4770204643f56c Mon Sep 17 00:00:00 2001
From: Denys Holius <d.holius@victoriametrics.com>
Date: Thu, 19 Dec 2024 18:53:16 +0200
Subject: [PATCH] apply suggestions from comments

---
 ct/victoriametrics.sh              |  4 ++--
 install/victoriametrics-install.sh | 20 ++++++++------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ct/victoriametrics.sh b/ct/victoriametrics.sh
index 09e634c1..4119994c 100644
--- a/ct/victoriametrics.sh
+++ b/ct/victoriametrics.sh
@@ -38,9 +38,9 @@ function update_script() {
     systemctl stop victoriametrics
     msg_ok "Stopped ${APP}"
     msg_info "Updating ${APP} to ${RELEASE}"
+    mkdir -p /opt/victoriametrics
     wget -q https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${RELEASE}/victoria-metrics-linux-amd64-${RELEASE}.tar.gz
-    tar -xf victoria-metrics-linux-amd64-${RELEASE}.tar.gz
-    cp -rf victoria-metrics-prod /usr/local/bin/
+    tar -xf --delete victoria-metrics-linux-amd64-${RELEASE}.tar.gz -C /opt/victoriametrics
     rm -rf victoria-metrics-linux-amd64-${RELEASE}.tar.gz
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to ${RELEASE}"
diff --git a/install/victoriametrics-install.sh b/install/victoriametrics-install.sh
index fbaf6d0e..b03a0bac 100644
--- a/install/victoriametrics-install.sh
+++ b/install/victoriametrics-install.sh
@@ -23,17 +23,14 @@ msg_ok "Installed Dependencies"
 
 msg_info "Installing VictoriaMetrics"
 RELEASE=$(curl -s https://api.github.com/repos/VictoriaMetrics/VictoriaMetrics/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-mkdir -p /etc/victoriametrics
-mkdir -p /var/lib/victoriametrics
-groupadd -r victoriametrics
-useradd -g victoriametrics -d /var/lib/victoriametrics -s /sbin/nologin --system victoriametrics
-chown -R victoriametrics:victoriametrics /var/lib/victoria-metrics
-wget -q https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${RELEASE}/victoria-metrics-linux-amd64-${RELEASE}.tar.gz
-tar -xf victoria-metrics-linux-amd64-${RELEASE}.tar.gz
-chmod +x /usr/bin/victoria-metrics-prod
-chown root:root /usr/bin/victoria-metrics-prod
+mkdir -p {/etc/victoriametrics,/var/lib/victoriametrics,/opt/victoriametrics}
 
-cat <<END >/etc/victoriametrics/scrape.yml
+wget -q https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${RELEASE}/victoria-metrics-linux-amd64-${RELEASE}.tar.gz
+tar -xf --delete victoria-metrics-linux-amd64-${RELEASE}.tar.gz -C /opt/victoriametrics
+chmod +x /opt/victoriametrics/victoria-metrics-prod
+chown root:root /opt/victoriametrics/victoria-metrics-prod
+
+cat <<EOF >/etc/victoriametrics/scrape.yml
 # Scrape config example
 #
 scrape_configs:
@@ -43,7 +40,6 @@ scrape_configs:
       - targets: ['127.0.0.1:8428'] 
 END
 
-mv victoria-metrics-prod /usr/local/bin/
 echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
 msg_ok "Installed VictoriaMetrics"
 
@@ -63,7 +59,7 @@ ExecReload=/bin/kill -HUP \$MAINPID
 User=root
 Restart=always
 Type=simple
-ExecStart=/usr/local/bin/victoria-metrics-prod \
+ExecStart=/opt/victoriametrics/victoria-metrics-prod \
     -promscrape.config=/etc/victoriametrics/scrape.yml \
     -storageDataPath=/var/lib/victoriametrics \
     -retentionPeriod=12 \