From fc09585b367410ae33bcc51680bd8868a4e1d2e1 Mon Sep 17 00:00:00 2001 From: Bram Suurd <78373894+BramSuurdje@users.noreply.github.com> Date: Fri, 10 May 2024 14:49:10 +0200 Subject: [PATCH 1/5] Update umami.sh Update umami-install.sh Update build.func Adjust resources and dependencies for Umami installation and build process --- ct/umami.sh | 2 +- install/umami-install.sh | 7 +++---- misc/build.func | 10 +++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ct/umami.sh b/ct/umami.sh index 3ea2d323..fd5f31d0 100644 --- a/ct/umami.sh +++ b/ct/umami.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/BramSuurdje/Proxmox/main/misc/build.func) # Copyright (c) 2021-2024 tteck # Author: tteck (tteckster) # License: MIT diff --git a/install/umami-install.sh b/install/umami-install.sh index 1ac1c1ca..302b9c30 100644 --- a/install/umami-install.sh +++ b/install/umami-install.sh @@ -31,7 +31,6 @@ 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 yarn msg_ok "Installed Node.js" msg_info "Setting up postgresql" @@ -53,9 +52,9 @@ msg_ok "Set up postgresql" msg_info "Installing Umami (Patience)" git clone -q https://github.com/umami-software/umami.git /opt/umami cd /opt/umami -$STD yarn install +$STD npm install echo -e "DATABASE_URL=postgresql://$DB_USER:$DB_PASS@localhost:5432/$DB_NAME" >>/opt/umami/.env -$STD yarn run build +$STD npm run build msg_ok "Installed Umami" msg_info "Creating Service" @@ -68,7 +67,7 @@ Type=simple Restart=always User=root WorkingDirectory=/opt/umami -ExecStart=/usr/bin/yarn run start +ExecStart=/usr/bin/npm run start [Install] WantedBy=multi-user.target diff --git a/misc/build.func b/misc/build.func index ff2410c5..42b4ad16 100644 --- a/misc/build.func +++ b/misc/build.func @@ -531,9 +531,9 @@ build_container() { TEMP_DIR=$(mktemp -d) pushd $TEMP_DIR >/dev/null if [ "$var_os" == "alpine" ]; then - export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/alpine-install.func)" + export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/BramSuurdje/Proxmox/main/misc/alpine-install.func)" else - export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/install.func)" + export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/BramSuurdje/Proxmox/main/misc/install.func)" fi export CACHER="$APT_CACHER" export CACHER_IP="$APT_CACHER_IP" @@ -563,7 +563,7 @@ build_container() { $PW " # This executes create_lxc.sh and creates the container and .conf file - bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit + bash -c "$(wget -qLO - https://raw.githubusercontent.com/BramSuurdje/Proxmox/main/ct/create_lxc.sh)" || exit LXC_CONFIG=/etc/pve/lxc/${CTID}.conf if [ "$CT_TYPE" == "0" ]; then @@ -625,14 +625,14 @@ http://dl-cdn.alpinelinux.org/alpine/latest-stable/community EOF' pct exec "$CTID" -- ash -c "apk add bash >/dev/null" fi - lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit + lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/BramSuurdje/Proxmox/main/install/$var_install.sh)" || exit } # This function sets the description of the container. description() { IP=$(pct exec "$CTID" ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1) - pct set "$CTID" -description "
+ pct set "$CTID" -description "
# ${APP} LXC From 428ece12379f01d77591a539e074faad3f1eeb40 Mon Sep 17 00:00:00 2001 From: Bram Suurd <78373894+BramSuurdje@users.noreply.github.com> Date: Fri, 10 May 2024 16:04:52 +0200 Subject: [PATCH 2/5] Update umami-install.sh Adjust installation script to use 'bun' instead of 'npm' for installing Umami and building the project --- install/umami-install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/install/umami-install.sh b/install/umami-install.sh index 302b9c30..ba20fcba 100644 --- a/install/umami-install.sh +++ b/install/umami-install.sh @@ -26,6 +26,7 @@ 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_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list +curl -fsSL https://bun.sh/install | bash msg_ok "Set up Node.js Repository" msg_info "Installing Node.js" @@ -52,9 +53,9 @@ msg_ok "Set up postgresql" msg_info "Installing Umami (Patience)" git clone -q https://github.com/umami-software/umami.git /opt/umami cd /opt/umami -$STD npm install +$STD bun install echo -e "DATABASE_URL=postgresql://$DB_USER:$DB_PASS@localhost:5432/$DB_NAME" >>/opt/umami/.env -$STD npm run build +$STD bun run build msg_ok "Installed Umami" msg_info "Creating Service" @@ -67,7 +68,7 @@ Type=simple Restart=always User=root WorkingDirectory=/opt/umami -ExecStart=/usr/bin/npm run start +ExecStart=/usr/bin/bun run start [Install] WantedBy=multi-user.target From 5f33a02064291c3f990e16705ac18b55b09337c5 Mon Sep 17 00:00:00 2001 From: Bram Suurd <78373894+BramSuurdje@users.noreply.github.com> Date: Fri, 10 May 2024 16:14:23 +0200 Subject: [PATCH 3/5] Adjust installation script to use 'bun' instead of 'npm' for installing Umami and building the project --- install/umami-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/umami-install.sh b/install/umami-install.sh index ba20fcba..62b66065 100644 --- a/install/umami-install.sh +++ b/install/umami-install.sh @@ -27,6 +27,7 @@ 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_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list curl -fsSL https://bun.sh/install | bash +source /root/.bashrc msg_ok "Set up Node.js Repository" msg_info "Installing Node.js" From 43bc6dd144d1086d3208671bab04fa2e6cf733c5 Mon Sep 17 00:00:00 2001 From: Bram Suurd <78373894+BramSuurdje@users.noreply.github.com> Date: Fri, 10 May 2024 16:40:43 +0200 Subject: [PATCH 4/5] Adjust installation script to use 'bun' instead of 'npm' for installing Umami and building the project --- install/umami-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/umami-install.sh b/install/umami-install.sh index 62b66065..7318301e 100644 --- a/install/umami-install.sh +++ b/install/umami-install.sh @@ -60,7 +60,7 @@ $STD bun run build msg_ok "Installed Umami" msg_info "Creating Service" -cat </etc/systemd/system/umami.service +cat </root/.bun/bin/bun echo "[Unit] Description=umami From b549f55cc4b828e1d052032878ae24b46d3c2084 Mon Sep 17 00:00:00 2001 From: Bram Suurd <78373894+BramSuurdje@users.noreply.github.com> Date: Fri, 10 May 2024 16:41:03 +0200 Subject: [PATCH 5/5] Adjust installation script to use 'bun' instead of 'npm' for creating the umami service --- install/umami-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/umami-install.sh b/install/umami-install.sh index 7318301e..082d3cfc 100644 --- a/install/umami-install.sh +++ b/install/umami-install.sh @@ -60,7 +60,7 @@ $STD bun run build msg_ok "Installed Umami" msg_info "Creating Service" -cat </root/.bun/bin/bun +cat </etc/systemd/system/umami.service echo "[Unit] Description=umami @@ -69,7 +69,7 @@ Type=simple Restart=always User=root WorkingDirectory=/opt/umami -ExecStart=/usr/bin/bun run start +ExecStart=/root/.bun/bin/bun run start [Install] WantedBy=multi-user.target