Update tools.func

This commit is contained in:
CanbiZ 2025-07-14 12:04:19 +02:00
parent 1587eea30d
commit a6fe7b48ba

View File

@ -1899,6 +1899,7 @@ function setup_clickhouse() {
echo "💡 Check AdGuard/Pi-hole or firewall rules" echo "💡 Check AdGuard/Pi-hole or firewall rules"
return 1 return 1
fi fi
if ! curl -fsSL --retry 3 --connect-timeout 10 "$GPG_URL" | if ! curl -fsSL --retry 3 --connect-timeout 10 "$GPG_URL" |
gpg --dearmor -o "$GPG_KEY_PATH"; then gpg --dearmor -o "$GPG_KEY_PATH"; then
msg_error "Failed to fetch ClickHouse GPG key" msg_error "Failed to fetch ClickHouse GPG key"
@ -1909,18 +1910,31 @@ function setup_clickhouse() {
>/etc/apt/sources.list.d/clickhouse.list >/etc/apt/sources.list.d/clickhouse.list
env -u CLICKHOUSE_USER $STD apt-get update env -u CLICKHOUSE_USER $STD apt-get update
env -u CLICKHOUSE_USER $STD apt-get install -y \ env -u CLICKHOUSE_USER DEBIAN_FRONTEND=noninteractive $STD apt-get install -y clickhouse-server clickhouse-client
clickhouse-server clickhouse-client
$STD systemctl enable --now clickhouse-server $STD systemctl enable --now clickhouse-server
sleep 3
msg_info "Waiting for ClickHouse to be ready"
for i in {1..10}; do
if clickhouse client --query "SELECT 1" &>/dev/null; then break; fi
sleep 1
done
# User anlegen
clickhouse client --query "CREATE DATABASE IF NOT EXISTS $CLICKHOUSE_DB" clickhouse client --query "CREATE DATABASE IF NOT EXISTS $CLICKHOUSE_DB"
clickhouse client --query \ clickhouse client --query "CREATE USER IF NOT EXISTS $CLICKHOUSE_USER IDENTIFIED WITH plaintext_password BY '$CLICKHOUSE_PASS'"
"CREATE USER IF NOT EXISTS $CLICKHOUSE_USER IDENTIFIED WITH plaintext_password BY '$CLICKHOUSE_PASS'" clickhouse client --query "GRANT ALL ON $CLICKHOUSE_DB.* TO $CLICKHOUSE_USER"
clickhouse client --query \
"GRANT ALL ON $CLICKHOUSE_DB.* TO $CLICKHOUSE_USER" # Default-User ggf. deaktivieren
0 cat <<EOF >/etc/clickhouse-server/users.d/disable-default.xml
<yandex>
<users>
<default remove="1"/>
</users>
</yandex>
EOF
systemctl restart clickhouse-server
msg_ok "Setup ClickHouse (DB: $CLICKHOUSE_DB, User: $CLICKHOUSE_USER)" msg_ok "Setup ClickHouse (DB: $CLICKHOUSE_DB, User: $CLICKHOUSE_USER)"
{ {
@ -1931,8 +1945,7 @@ function setup_clickhouse() {
else else
msg_info "Updating ClickHouse packages" msg_info "Updating ClickHouse packages"
env -u CLICKHOUSE_USER $STD apt-get update env -u CLICKHOUSE_USER $STD apt-get update
env -u CLICKHOUSE_USER $STD apt-get install -y --only-upgrade \ env -u CLICKHOUSE_USER $STD apt-get install -y --only-upgrade clickhouse-server clickhouse-client
clickhouse-server clickhouse-client
msg_ok "ClickHouse updated" msg_ok "ClickHouse updated"
fi fi
} }