diff --git a/.github/workflows/changelog-pr.yaml b/.github/workflows/changelog-pr.yaml index 5ed78ed..664e327 100644 --- a/.github/workflows/changelog-pr.yaml +++ b/.github/workflows/changelog-pr.yaml @@ -89,7 +89,7 @@ jobs: const { data: pulls } = await github.rest.pulls.list({ owner: context.repo.owner, - repo: "ProxmoxVE", + repo: "ProxmoxVED", base: "main", state: "closed", sort: "updated", @@ -136,18 +136,19 @@ jobs: } - // Check if PR has "new script" label + if (prLabels.includes("new script")) { - // Find the New Script category const newScriptCategory = categorizedPRs.find(category => category.title === "New Scripts" || category.labels.includes("new script")); - if (newScriptCategory) { newScriptCategory.notes.push(prNote); } } else { - // Normal category processing for other PRs - for (const category of categorizedPRs) { + + let categorized = false; + const priorityCategories = categorizedPRs.slice(); + for (const category of priorityCategories) { + if (categorized) break; if (category.labels.some(label => prLabels.includes(label))) { if (category.subCategories && category.subCategories.length > 0) { const subCategory = category.subCategories.find(sub => @@ -159,10 +160,10 @@ jobs: } else { category.notes.push(prNote); } - } - else{ + } else { category.notes.push(prNote); } + categorized = true; } } } diff --git a/ct/wazuh.sh b/ct/wazuh.sh deleted file mode 100644 index 8186f5c..0000000 --- a/ct/wazuh.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func) -# Copyright (c) 2025 community-scripts ORG -# Author: Omar Minaya -# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE -# Source: https://wazuh.com/ - -APP="Wazuh" -var_tags="security;monitoring" -var_cpu="4" -var_ram="4096" -var_disk="18" -var_os="debian" -var_version="12" -var_unprivileged="1" - -header_info "$APP" -variables -color -catch_errors - -function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -d /var ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - msg_info "Updating ${APP} LXC" - $STD apt-get update - $STD apt-get -y upgrade - msg_ok "Updated ${APP} LXC" - exit -} - -start -build_container -description - -msg_ok "Completed Successfully!\n" -echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" -echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}https://${IP}:443${CL}" diff --git a/frontend/public/json/qbittorrent.json b/frontend/public/json/qbittorrent.json new file mode 100644 index 0000000..77c0367 --- /dev/null +++ b/frontend/public/json/qbittorrent.json @@ -0,0 +1,34 @@ +{ + "name": "qBittorrent", + "slug": "qbittorrent", + "categories": [ + 11 + ], + "date_created": "2024-05-02", + "type": "ct", + "updateable": false, + "privileged": false, + "interface_port": 8090, + "documentation": null, + "website": "https://www.qbittorrent.org/", + "logo": "https://raw.githubusercontent.com/selfhst/icons/refs/heads/main/svg/qbittorrent.svg", + "description": "qBittorrent offers a user-friendly interface that allows users to search for and download torrent files easily. It also supports magnet links, which allow users to start downloading files without the need for a torrent file.", + "install_methods": [ + { + "type": "default", + "script": "ct/qbittorrent.sh", + "resources": { + "cpu": 2, + "ram": 2048, + "hdd": 8, + "os": "debian", + "version": "12" + } + } + ], + "default_credentials": { + "username": "admin", + "password": "changeme" + }, + "notes": [] +} \ No newline at end of file diff --git a/frontend/public/json/wazuh.json b/frontend/public/json/wazuh.json deleted file mode 100644 index 223e5af..0000000 --- a/frontend/public/json/wazuh.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "Wazuh", - "slug": "wazuh", - "categories": [ - 1 - ], - "date_created": "2025-03-19", - "type": "ct", - "updateable": false, - "privileged": false, - "interface_port": 443, - "documentation": "https://documentation.wazuh.com/", - "website": "https://wazuh.com/", - "logo": "https://avatars.githubusercontent.com/u/13752566?s=200&v=4", - "description": "Wazuh is an open-source security monitoring solution that provides endpoint protection, network monitoring, and log analysis capabilities.", - "install_methods": [ - { - "type": "default", - "script": "ct/wazuh.sh", - "resources": { - "cpu": 4, - "ram": 4096, - "hdd": 10, - "os": "debian", - "version": "12" - } - } - ], - "default_credentials": { - "username": "root", - "password": null - }, - "notes": [ - { - "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.", - "type": "warning" - }, - { - "text": "Show password: `cat ~/wazuh.creds`", - "type": "info" - } - ] -} diff --git a/install/qbittorrent-install.sh b/install/qbittorrent-install.sh index bc302dd..05270f3 100644 --- a/install/qbittorrent-install.sh +++ b/install/qbittorrent-install.sh @@ -5,7 +5,7 @@ # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE # Source: https://www.qbittorrent.org/ -source /dev/stdin <<< "$FUNCTIONS_FILE_PATH" +source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" color verb_ip6 catch_errors @@ -22,7 +22,7 @@ msg_ok "Installed Dependencies" msg_info "Setup qBittorrent-nox" FULLRELEASE=$(curl -s https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') -RELEASE=$(echo $RELEASE | cut -c 9-13) +RELEASE=$(echo $FULLRELEASE | cut -c 9-13) mkdir -p /opt/qbittorrent curl -fsSL "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${FULLRELEASE}/x86_64-qbittorrent-nox -o /opt/qbittorrent/qbittorrent-nox" chmod +x /opt/qbittorrent/qbittorrent-nox @@ -45,9 +45,11 @@ cat </etc/systemd/system/qbittorrent-nox.service [Unit] Description=qBittorrent client After=network.target + [Service] ExecStart=/opt/qbittorrent/qbittorrent-nox Restart=always + [Install] WantedBy=multi-user.target EOF diff --git a/install/wazuh-install.sh b/install/wazuh-install.sh deleted file mode 100644 index 8b3cc05..0000000 --- a/install/wazuh-install.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2024 community-scripts ORG -# Author: Omar Minaya -# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE -# Source: https://wazuh.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 \ - sudo \ - mc \ - curl -msg_ok "Installed Dependencies" - -# Fetching the latest Wazuh version -msg_info "Fetching Latest Wazuh Version" -RELEASE=$(curl -s https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '"tag_name"' | awk -F '"' '{print substr($4, 2, length($2)-4)}') -msg_ok "Latest Wazuh Version: $RELEASE" - -msg_info "Setup Wazuh" -curl -fsSL https://packages.wazuh.com/$RELEASE/wazuh-install.sh -chmod +x wazuh-install.sh - -if [ "$STD" = "silent" ]; then - bash wazuh-install.sh -a >>~/wazuh-install.output -else - bash wazuh-install.sh -a | tee -a ~/wazuh-install.output -fi -cat ~/wazuh-install.output | grep -E "User|Password" | awk '{$1=$1};1' | sed '1i wazuh-credentials' >~/wazuh.creds -msg_ok "Setup Wazuh" - -motd_ssh -customize - -msg_info "Cleaning up" -rm -f wazuh-*.sh -rm -f ~/wazuh-install.output -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned"