Merge branch 'main' of https://github.com/community-scripts/ProxmoxVED

install/bar-assistant-install.sh

@@ -113,8 +113,8 @@ mv /opt/vue-salt-rim-${RELEASE_SALTRIM}/ /opt/vue-salt-rim
 cd /opt/vue-salt-rim
 cat <<EOF >/opt/vue-salt-rim/public/config.js
 window.srConfig = {}
-window.srConfig.API_URL = "http://${LOCAL_IP}/bar/"
-window.srConfig.MEILISEARCH_URL = "http://${LOCAL_IP}/search/"
+window.srConfig.API_URL = "http://${LOCAL_IP}/bar"
+window.srConfig.MEILISEARCH_URL = "http://${LOCAL_IP}/search"
 EOF
 $STD npm install
 $STD npm run build

install/meilisearch-install.sh

@@ -1,125 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2025 community-scripts ORG
-# Author: MickLesk (CanbiZ)
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://www.meilisearch.com/
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y \
-    curl \
-    sudo \
-    gnupg \
-    mc
-msg_ok "Installed Dependencies"
-
-msg_info "Setup ${APPLICATION}"
-tmp_file=$(mktemp)
-RELEASE=$(curl -s https://api.github.com/repos/meilisearch/meilisearch/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-curl -fsSL https://github.com/meilisearch/meilisearch/releases/latest/download/meilisearch.deb -o $tmp_file
-$STD dpkg -i $tmp_file
-curl -fsSL https://raw.githubusercontent.com/meilisearch/meilisearch/latest/config.toml -o /etc/meilisearch.toml
-MASTER_KEY=$(openssl rand -base64 12)
-LOCAL_IP="$(hostname -I | awk '{print $1}')"
-sed -i \
-    -e 's|^env =.*|env = "production"|' \
-    -e "s|^# master_key =.*|master_key = \"$MASTER_KEY\"|" \
-    -e 's|^db_path =.*|db_path = "/var/lib/meilisearch/data"|' \
-    -e 's|^dump_dir =.*|dump_dir = "/var/lib/meilisearch/dumps"|' \
-    -e 's|^snapshot_dir =.*|snapshot_dir = "/var/lib/meilisearch/snapshots"|' \
-    -e 's|^# no_analytics = true|no_analytics = true|' \
-    -e 's|^http_addr =.*|http_addr = "0.0.0.0:7700"|' \
-    /etc/meilisearch.toml
-echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
-msg_ok "Setup ${APPLICATION}"
-
-read -r -p "Do you want add meilisearch-ui? [y/n]: " prompt
-if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
-    msg_info "Setting up Node.js Repository"
-    mkdir -p /etc/apt/keyrings
-    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
-    msg_ok "Set up Node.js Repository"
-
-    msg_info "Installing Node.js"
-    $STD apt-get update
-    $STD apt-get install -y nodejs
-    $STD npm install -g pnpm
-    msg_ok "Installed Node.js"
-
-    msg_info "Setup ${APPLICATION}-ui"
-    tmp_file=$(mktemp)
-    tmp_dir=$(mktemp -d)
-    mkdir -p /opt/meilisearch-ui
-    RELEASE_UI=$(curl -s https://api.github.com/repos/riccox/meilisearch-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-    curl -fsSL "https://github.com/riccox/meilisearch-ui/archive/refs/tags/${RELEASE_UI}.zip" -o $tmp_file
-    unzip -q "$tmp_file" -d "$tmp_dir"
-    mv "$tmp_dir"/*/* /opt/meilisearch-ui/
-    cd /opt/meilisearch-ui
-    sed -i 's|const hash = execSync("git rev-parse HEAD").toString().trim();|const hash = "unknown";|' /opt/meilisearch-ui/vite.config.ts
-    $STD pnpm install
-    cat <<EOF > /opt/meilisearch-ui/.env.local
-VITE_SINGLETON_MODE=true
-VITE_SINGLETON_HOST=http://${LOCAL_IP}:7700
-VITE_SINGLETON_API_KEY=${MASTER_KEY}
-EOF
-    echo "${RELEASE_UI}" >/opt/${APPLICATION}-ui_version.txt
-    msg_ok "Setup ${APPLICATION}-ui"
-fi
-
-msg_info "Setting up Services"
-cat <<EOF >/etc/systemd/system/meilisearch.service
-[Unit]
-Description=Meilisearch
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/meilisearch --config-file-path /etc/meilisearch.toml
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now meilisearch
-
-if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
-cat <<EOF > /etc/systemd/system/meilisearch-ui.service
-[Unit]
-Description=Meilisearch UI Service
-After=network.target meilisearch.service
-Requires=meilisearch.service
-
-[Service]
-User=root
-WorkingDirectory=/opt/meilisearch-ui
-ExecStart=/usr/bin/pnpm start
-Restart=always
-RestartSec=5
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=meilisearch-ui
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now meilisearch-ui
-fi
-
-msg_ok "Set up Services"
-
-
-motd_ssh
-customize
-
-msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
-msg_ok "Cleaned"

install/reactive-resume-install.sh

@@ -15,13 +15,10 @@ update_os
 
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
-  curl \
-  sudo \
-  mc \
   gnupg \
   unzip \
-  postgresql-common \
-  msg_ok "Installed Dependencies"
+  postgresql-common
+msg_ok "Installed Dependencies"
 
 msg_info "Installing Additional Dependencies"
 mkdir -p /etc/apt/keyrings
@@ -186,6 +183,7 @@ customize
 
 msg_info "Cleaning up"
 rm -f /tmp/v${RELEASE}.zip
+rm -f /tmp/v${TAG}.zip
 rm -f /tmp/minio.deb
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean