Feat: Quorum Status (#5278)

This commit is contained in:
CanbiZ
2025-06-19 18:50:23 +02:00
committed by GitHub
parent 204ec64f14
commit b5012c4225
5 changed files with 64 additions and 18 deletions

View File

@ -5,10 +5,10 @@
1) [adguard.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/ct/adguard.sh): This script collects system parameters. (Also holds the function to update the application.) 1) [adguard.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/ct/adguard.sh): This script collects system parameters. (Also holds the function to update the application.)
2) [build.func](https://github.com/community-scripts/ProxmoxVE/blob/main/misc/build.func): Adds user settings and integrates collected information. 2) [build.func](https://github.com/community-scripts/ProxmoxVE/blob/main/misc/build.func): Adds user settings and integrates collected information.
3) [create_lxc.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/ct/create_lxc.sh): Constructs the LXC container. 3) [create_lxc.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/misc/create_lxc.sh): Constructs the LXC container.
4) [adguard-install.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/install/adguard-install.sh): Executes functions from [install.func](https://github.com/community-scripts/ProxmoxVE/blob/main/misc/install.func), and installs the application. 4) [adguard-install.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/install/adguard-install.sh): Executes functions from [install.func](https://github.com/community-scripts/ProxmoxVE/blob/main/misc/install.func), and installs the application.
5) [adguard.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/ct/adguard.sh) (again): To display the completion message. 5) [adguard.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/ct/adguard.sh) (again): To display the completion message.
The installation process uses reusable scripts: [build.func](https://github.com/community-scripts/ProxmoxVE/blob/main/misc/build.func), [create_lxc.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/ct/create_lxc.sh), and [install.func](https://github.com/community-scripts/ProxmoxVE/blob/main/misc/install.func), which are not specific to any particular application. The installation process uses reusable scripts: [build.func](https://github.com/community-scripts/ProxmoxVE/blob/main/misc/build.func), [create_lxc.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/misc/create_lxc.sh), and [install.func](https://github.com/community-scripts/ProxmoxVE/blob/main/misc/install.func), which are not specific to any particular application.
To gain a better understanding, focus on reviewing [adguard-install.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/install/adguard-install.sh). This script contains the commands and configurations for installing and configuring AdGuard Home within the LXC container. To gain a better understanding, focus on reviewing [adguard-install.sh](https://github.com/community-scripts/ProxmoxVE/blob/main/install/adguard-install.sh). This script contains the commands and configurations for installing and configuring AdGuard Home within the LXC container.

61
.github/autolabeler-config.json generated vendored
View File

@ -2,21 +2,43 @@
"new script": [ "new script": [
{ {
"fileStatus": "added", "fileStatus": "added",
"includeGlobs": ["ct/**", "install/**", "misc/**", "turnkey/**", "vm/**"], "includeGlobs": [
"ct/**",
"install/**",
"misc/**",
"turnkey/**",
"vm/**"
],
"excludeGlobs": [] "excludeGlobs": []
} }
], ],
"update script": [ "update script": [
{ {
"fileStatus": "modified", "fileStatus": "modified",
"includeGlobs": ["ct/**", "install/**", "misc/**", "turnkey/**", "vm/**"], "includeGlobs": [
"excludeGlobs": ["misc/build.func", "misc/install.func", "misc/api.func"] "ct/**",
"install/**",
"misc/**",
"turnkey/**",
"vm/**"
],
"excludeGlobs": [
"misc/build.func",
"misc/install.func",
"misc/api.func"
]
} }
], ],
"delete script": [ "delete script": [
{ {
"fileStatus": "removed", "fileStatus": "removed",
"includeGlobs": ["ct/**", "install/**", "misc/**", "turnkey/**", "vm/**"], "includeGlobs": [
"ct/**",
"install/**",
"misc/**",
"turnkey/**",
"vm/**"
],
"excludeGlobs": [] "excludeGlobs": []
} }
], ],
@ -27,7 +49,7 @@
"*.md", "*.md",
".github/**", ".github/**",
"misc/*.func", "misc/*.func",
"ct/create_lxc.sh", "misc/create_lxc.sh",
"api/**" "api/**"
], ],
"excludeGlobs": [] "excludeGlobs": []
@ -36,46 +58,57 @@
"core": [ "core": [
{ {
"fileStatus": null, "fileStatus": null,
"includeGlobs": ["misc/*.func", "ct/create_lxc.sh"], "includeGlobs": [
"misc/*.func",
"misc/create_lxc.sh"
],
"excludeGlobs": [] "excludeGlobs": []
} }
], ],
"website": [ "website": [
{ {
"fileStatus": null, "fileStatus": null,
"includeGlobs": ["frontend/**"], "includeGlobs": [
"frontend/**"
],
"excludeGlobs": [] "excludeGlobs": []
} }
], ],
"api": [ "api": [
{ {
"fileStatus": null, "fileStatus": null,
"includeGlobs": ["api/**", "misc/api.func"], "includeGlobs": [
"api/**",
"misc/api.func"
],
"excludeGlobs": [] "excludeGlobs": []
} }
], ],
"github": [ "github": [
{ {
"fileStatus": null, "fileStatus": null,
"includeGlobs": [".github/**"], "includeGlobs": [
".github/**"
],
"excludeGlobs": [] "excludeGlobs": []
} }
], ],
"json": [ "json": [
{ {
"fileStatus": "modified", "fileStatus": "modified",
"includeGlobs": ["frontend/public/json/**"], "includeGlobs": [
"frontend/public/json/**"
],
"excludeGlobs": [] "excludeGlobs": []
} }
], ],
"high risk": [ "high risk": [
{ {
"fileStatus": null, "fileStatus": null,
"includeGlobs": [ "includeGlobs": [
"misc/build.func", "misc/build.func",
"misc/install.func", "misc/install.func",
"ct/create_lxc.sh" "misc/create_lxc.sh"
], ],
"excludeGlobs": [] "excludeGlobs": []
} }
@ -83,7 +116,9 @@
"documentation": [ "documentation": [
{ {
"fileStatus": null, "fileStatus": null,
"includeGlobs": ["*.md"], "includeGlobs": [
"*.md"
],
"excludeGlobs": [] "excludeGlobs": []
} }
] ]

View File

@ -51,8 +51,8 @@ jobs:
NON_COMPLIANT_FILES="" NON_COMPLIANT_FILES=""
for FILE in $CHANGED_FILES; do for FILE in $CHANGED_FILES; do
# Datei "ct/create_lxc.sh" explizit überspringen # Skip File "misc/create_lxc.sh"
if [[ "$FILE" == "ct/create_lxc.sh" ]]; then if [[ "$FILE" == "misc/create_lxc.sh" ]]; then
continue continue
fi fi
BASENAME=$(echo "$(basename "${FILE%.*}")") BASENAME=$(echo "$(basename "${FILE%.*}")")

View File

@ -1143,7 +1143,7 @@ build_container() {
$PW $PW
" "
# This executes create_lxc.sh and creates the container and .conf file # This executes create_lxc.sh and creates the container and .conf file
bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/create_lxc.sh)" $? bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/create_lxc.sh)" $?
LXC_CONFIG=/etc/pve/lxc/${CTID}.conf LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
if [ "$CT_TYPE" == "0" ]; then if [ "$CT_TYPE" == "0" ]; then

View File

@ -207,6 +207,17 @@ msg_ok "Using ${BL}$TEMPLATE_STORAGE${CL} ${GN}for Template Storage."
CONTAINER_STORAGE=$(select_storage container) CONTAINER_STORAGE=$(select_storage container)
msg_ok "Using ${BL}$CONTAINER_STORAGE${CL} ${GN}for Container Storage." msg_ok "Using ${BL}$CONTAINER_STORAGE${CL} ${GN}for Container Storage."
# Check Cluster Quorum if in Cluster
if [ -f /etc/pve/corosync.conf ]; then
msg_info "Checking Proxmox cluster quorum status"
if ! pvecm status | awk -F':' '/^Quorate/ { exit ($2 ~ /Yes/) ? 0 : 1 }'; then
printf "\e[?25h"
msg_error "Cluster is not quorate. Start all nodes or configure quorum device (QDevice)."
exit 210
fi
msg_ok "Cluster is quorate"
fi
# Update LXC template list # Update LXC template list
msg_info "Updating LXC Template List" msg_info "Updating LXC Template List"
#check_network #check_network