Skip to content
This repository was archived by the owner on Jul 23, 2025. It is now read-only.

Commit 5d2eae2

Browse files
github-actions[bot]bketelsen
github-actions[bot]
and
bketelsen
authored
pull upstream changes (#42)
Co-authored-by: bketelsen <37492+bketelsen@users.noreply.github.com>
1 parent 49b74cc commit 5d2eae2

53 files changed

Lines changed: 5727 additions & 151 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎install/daemonsync-install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $STD apt-get install -y g++-multilib
1818
msg_ok "Installed Dependencies"
1919

2020
msg_info "Installing Daemon Sync Server"
21-
curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/daemonsync_2.2.0.0059_amd64.deb" -o "daemonsync_2.2.0.0059_amd64.deb"
21+
curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/addon/daemonsync_2.2.0.0059_amd64.deb" -o "daemonsync_2.2.0.0059_amd64.deb"
2222
$STD dpkg -i daemonsync_2.2.0.0059_amd64.deb
2323
msg_ok "Installed Daemon Sync Server"
2424

‎install/paperless-ngx-install.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ Requires=redis.service
209209
210210
[Service]
211211
WorkingDirectory=/opt/paperless/src
212-
ExecStart=/usr/local/bin/gunicorn -c /opt/paperless/gunicorn.conf.py paperless.asgi:application
212+
ExecStart=granian --interface asginl --ws "paperless.asgi:application"
213+
Environment=GRANIAN_HOST=::
214+
Environment=GRANIAN_PORT=8000
215+
Environment=GRANIAN_WORKERS=1
213216
214217
[Install]
215218
WantedBy=multi-user.target

‎install/tandoor-install.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ $STD apt-get install -y \
3838
python3 \
3939
python3-dev \
4040
python3-setuptools \
41-
python3-pip
41+
python3-pip \
42+
python3-xmlsec
4243
rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
4344
msg_ok "Setup Python3"
4445

‎misc/build.func‎

Lines changed: 29 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
77

88
variables() {
9-
NSAPP=$(echo ${APP,,} | tr -d ' ') # This function sets the NSAPP variable by converting the value of the APP variable to lowercase and removing any spaces.
9+
NSAPP=$(echo "${APP,,}" | tr -d ' ') # This function sets the NSAPP variable by converting the value of the APP variable to lowercase and removing any spaces.
1010
var_install="${NSAPP}-install" # sets the var_install variable by appending "-install" to the value of NSAPP.
1111
INTEGER='^[0-9]+([.][0-9]+)?$' # it defines the INTEGER regular expression pattern.
1212
PVEHOST_NAME=$(hostname) # gets the Proxmox Hostname and sets it to Uppercase
@@ -70,7 +70,7 @@ catch_errors() {
7070
# This function is called when an error occurs. It receives the exit code, line number, and command that caused the error, and displays an error message.
7171
error_handler() {
7272
source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func)
73-
if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID >/dev/null; then kill $SPINNER_PID >/dev/null; fi
73+
if [ -n "$SPINNER_PID" ] && ps -p "$SPINNER_PID" >/dev/null; then kill "$SPINNER_PID" >/dev/null; fi
7474
printf "\e[?25h"
7575
local exit_code="$?"
7676
local line_number="$1"
@@ -285,25 +285,25 @@ update_motd_ip() {
285285

286286
# Function to download & save header files
287287
get_header() {
288-
local app_name=$(echo "${APP,,}" | tr -d ' ')
289-
local header_url="https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/headers/${app_name}"
290-
local local_header_path="$HOME/.config/incusscripts/headers/${app_name}"
288+
local app_name=$(echo "${APP,,}" | tr -d ' ')
289+
local header_url="https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/headers/${app_name}"
290+
local local_header_path="$HOME/.config/incusscripts/headers/${app_name}"
291291

292-
mkdir -p "$(dirname "$local_header_path")"
292+
mkdir -p "$(dirname "$local_header_path")"
293293

294-
if [ ! -s "$local_header_path" ]; then
295-
if ! curl -fsSL "$header_url" -o "$local_header_path"; then
296-
echo -e "Failed to download header for ${app_name}. No header will be displayed."
297-
return 1
298-
fi
294+
if [ ! -s "$local_header_path" ]; then
295+
if ! curl -fsSL "$header_url" -o "$local_header_path"; then
296+
echo -e "Failed to download header for ${app_name}. No header will be displayed."
297+
return 1
299298
fi
299+
fi
300300

301-
cat "$local_header_path"
301+
cat "$local_header_path"
302302
}
303303

304304
# This function sets the APP-Name into an ASCII Header in Slant, figlet needed on proxmox main node.
305305
header_info() {
306-
local app_name=$(echo ${APP,,} | tr -d ' ')
306+
local app_name=$(echo "${APP,,}" | tr -d ' ')
307307
local header_content
308308

309309
# Download & save Header-File locally
@@ -407,128 +407,6 @@ exit_script() {
407407
# This function allows the user to configure advanced settings for the script.
408408
advanced_settings() {
409409
whiptail --backtitle "Incus Scripts" --msgbox --title "Here is an instructional tip:" "To make a selection, use the Spacebar." 8 58
410-
whiptail --backtitle "Incus Scripts" --msgbox --title "Default distribution for $APP" "Default is: ${var_os} ${var_version} \n \nIf the default Linux distribution is not adhered to, script support will be discontinued. \n" 10 58
411-
if [ "$var_os" != "alpine" ]; then
412-
var_default_os="${var_os}"
413-
var_os=""
414-
while [ -z "$var_os" ]; do
415-
if [ "$var_default_os" == "debian" ]; then
416-
if var_os=$(whiptail --backtitle "Incus Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
417-
"debian" "" ON \
418-
"ubuntu" "" OFF \
419-
3>&1 1>&2 2>&3); then
420-
if [ -n "$var_os" ]; then
421-
echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
422-
fi
423-
else
424-
exit_script
425-
fi
426-
fi
427-
if [ "$var_default_os" == "ubuntu" ]; then
428-
if var_os=$(whiptail --backtitle "Incus Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
429-
"debian" "" OFF \
430-
"ubuntu" "" ON \
431-
3>&1 1>&2 2>&3); then
432-
if [ -n "$var_os" ]; then
433-
echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
434-
fi
435-
else
436-
exit_script
437-
fi
438-
fi
439-
done
440-
fi
441-
442-
if [ "$var_os" == "debian" ]; then
443-
var_default_version="${var_version}"
444-
var_version=""
445-
while [ -z "$var_version" ]; do
446-
if [ "$var_default_version" == "11" ]; then
447-
if var_version=$(whiptail --backtitle "Incus Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
448-
"11" "Bullseye" ON \
449-
"12" "Bookworm" OFF \
450-
3>&1 1>&2 2>&3); then
451-
if [ -n "$var_version" ]; then
452-
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
453-
fi
454-
else
455-
exit_script
456-
fi
457-
fi
458-
if [ "$var_default_version" == "12" ]; then
459-
if var_version=$(whiptail --backtitle "Incus Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
460-
"11" "Bullseye" OFF \
461-
"12" "Bookworm" ON \
462-
3>&1 1>&2 2>&3); then
463-
if [ -n "$var_version" ]; then
464-
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
465-
fi
466-
else
467-
exit_script
468-
fi
469-
fi
470-
done
471-
fi
472-
473-
if [ "$var_os" == "ubuntu" ]; then
474-
var_default_version="${var_version}"
475-
var_version=""
476-
while [ -z "$var_version" ]; do
477-
if [ "$var_default_version" == "20.04" ]; then
478-
if var_version=$(whiptail --backtitle "Incus Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
479-
"20.04" "Focal" ON \
480-
"22.04" "Jammy" OFF \
481-
"24.04" "Noble" OFF \
482-
"24.10" "Oracular" OFF \
483-
3>&1 1>&2 2>&3); then
484-
if [ -n "$var_version" ]; then
485-
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
486-
fi
487-
else
488-
exit_script
489-
fi
490-
elif [ "$var_default_version" == "22.04" ]; then
491-
if var_version=$(whiptail --backtitle "Incus Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
492-
"20.04" "Focal" OFF \
493-
"22.04" "Jammy" ON \
494-
"24.04" "Noble" OFF \
495-
"24.10" "Oracular" OFF \
496-
3>&1 1>&2 2>&3); then
497-
if [ -n "$var_version" ]; then
498-
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
499-
fi
500-
else
501-
exit_script
502-
fi
503-
elif [ "$var_default_version" == "24.04" ]; then
504-
if var_version=$(whiptail --backtitle "Incus Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
505-
"20.04" "Focal" OFF \
506-
"22.04" "Jammy" OFF \
507-
"24.04" "Noble" ON \
508-
"24.10" "Oracular" OFF \
509-
3>&1 1>&2 2>&3); then
510-
if [ -n "$var_version" ]; then
511-
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
512-
fi
513-
else
514-
exit_script
515-
fi
516-
else
517-
if var_version=$(whiptail --backtitle "Incus Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
518-
"20.04" "Focal" OFF \
519-
"22.04" "Jammy" OFF \
520-
"24.04" "Noble" OFF \
521-
"24.10" "Oracular" ON \
522-
3>&1 1>&2 2>&3); then
523-
if [ -n "$var_version" ]; then
524-
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
525-
fi
526-
else
527-
exit_script
528-
fi
529-
fi
530-
done
531-
fi
532410
# Setting Default Tag for Advanced Settings
533411
TAGS="community-script;${var_tags:-}"
534412
CT_DEFAULT_TYPE="${CT_TYPE}"
@@ -544,6 +422,8 @@ advanced_settings() {
544422
if [ "$CT_TYPE" -eq 0 ]; then
545423
CT_TYPE_DESC="Privileged"
546424
fi
425+
echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
426+
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
547427
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
548428
fi
549429
else
@@ -560,6 +440,8 @@ advanced_settings() {
560440
if [ "$CT_TYPE" -eq 0 ]; then
561441
CT_TYPE_DESC="Privileged"
562442
fi
443+
echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
444+
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
563445
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
564446
fi
565447
else
@@ -599,7 +481,7 @@ advanced_settings() {
599481
fi
600482
done
601483

602-
if CT_ID=$(whiptail --backtitle "Incus Scripts" --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
484+
if CT_ID=$(whiptail --backtitle "Incus Scripts" --inputbox "Set Container ID" 8 58 "$NEXTID" --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
603485
if [ -z "$CT_ID" ]; then
604486
CT_ID="$NEXTID"
605487
echo -e "${CONTAINERID}${BOLD}${DGN}Container ID: ${BGN}$CT_ID${CL}"
@@ -610,18 +492,18 @@ advanced_settings() {
610492
exit
611493
fi
612494

613-
if CT_NAME=$(whiptail --backtitle "Incus Scripts" --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
495+
if CT_NAME=$(whiptail --backtitle "Incus Scripts" --inputbox "Set Hostname" 8 58 "$NSAPP" --title "HOSTNAME" 3>&1 1>&2 2>&3); then
614496
if [ -z "$CT_NAME" ]; then
615497
HN="$NSAPP"
616498
else
617-
HN=$(echo ${CT_NAME,,} | tr -d ' ')
499+
HN=$(echo "${CT_NAME,,}" | tr -d ' ')
618500
fi
619501
echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
620502
else
621503
exit_script
622504
fi
623505

624-
if DISK_SIZE=$(whiptail --backtitle "Incus Scripts" --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
506+
if DISK_SIZE=$(whiptail --backtitle "Incus Scripts" --inputbox "Set Disk Size in GB" 8 58 "$var_disk" --title "DISK SIZE" 3>&1 1>&2 2>&3); then
625507
if [ -z "$DISK_SIZE" ]; then
626508
DISK_SIZE="$var_disk"
627509
echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE} GB${CL}"
@@ -636,7 +518,7 @@ advanced_settings() {
636518
exit_script
637519
fi
638520

639-
if CORE_COUNT=$(whiptail --backtitle "Incus Scripts" --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
521+
if CORE_COUNT=$(whiptail --backtitle "Incus Scripts" --inputbox "Allocate CPU Cores" 8 58 "$var_cpu" --title "CORE COUNT" 3>&1 1>&2 2>&3); then
640522
if [ -z "$CORE_COUNT" ]; then
641523
CORE_COUNT="$var_cpu"
642524
echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
@@ -647,7 +529,7 @@ advanced_settings() {
647529
exit_script
648530
fi
649531

650-
if RAM_SIZE=$(whiptail --backtitle "Incus Scripts" --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
532+
if RAM_SIZE=$(whiptail --backtitle "Incus Scripts" --inputbox "Allocate RAM in MiB" 8 58 "$var_ram" --title "RAM" 3>&1 1>&2 2>&3); then
651533
if [ -z "$RAM_SIZE" ]; then
652534
RAM_SIZE="$var_ram"
653535
echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE} MiB${CL}"
@@ -727,7 +609,7 @@ advanced_settings() {
727609
echo -e "${DISABLEIPV6}${BOLD}${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
728610

729611
if MTU1=$(whiptail --backtitle "Incus Scripts" --inputbox "Set Interface MTU Size (leave blank for default [The MTU of your selected vmbr, default is 1500])" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
730-
if [ -z $MTU1 ]; then
612+
if [ -z "$MTU1" ]; then
731613
MTU1="Default"
732614
MTU=""
733615
else
@@ -739,7 +621,7 @@ advanced_settings() {
739621
fi
740622

741623
if SD=$(whiptail --backtitle "Incus Scripts" --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
742-
if [ -z $SD ]; then
624+
if [ -z "$SD" ]; then
743625
SX=Host
744626
SD=""
745627
else
@@ -752,7 +634,7 @@ advanced_settings() {
752634
fi
753635

754636
if NX=$(whiptail --backtitle "Incus Scripts" --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
755-
if [ -z $NX ]; then
637+
if [ -z "$NX" ]; then
756638
NX=Host
757639
NS=""
758640
else
@@ -764,7 +646,7 @@ advanced_settings() {
764646
fi
765647

766648
if MAC1=$(whiptail --backtitle "Incus Scripts" --inputbox "Set a MAC Address(leave blank for generated MAC)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
767-
if [ -z $MAC1 ]; then
649+
if [ -z "$MAC1" ]; then
768650
MAC1="Default"
769651
MAC=""
770652
else
@@ -776,7 +658,7 @@ advanced_settings() {
776658
fi
777659

778660
if VLAN1=$(whiptail --backtitle "Incus Scripts" --inputbox "Set a Vlan(leave blank for no VLAN)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
779-
if [ -z $VLAN1 ]; then
661+
if [ -z "$VLAN1" ]; then
780662
VLAN1="Default"
781663
VLAN=""
782664
else
@@ -787,7 +669,7 @@ advanced_settings() {
787669
exit_script
788670
fi
789671

790-
if ADV_TAGS=$(whiptail --backtitle "Incus Scripts" --inputbox "Set Custom Tags?[If you remove all, there will be no tags!]" 8 58 ${TAGS} --title "Advanced Tags" 3>&1 1>&2 2>&3); then
672+
if ADV_TAGS=$(whiptail --backtitle "Incus Scripts" --inputbox "Set Custom Tags?[If you remove all, there will be no tags!]" 8 58 "${TAGS}" --title "Advanced Tags" 3>&1 1>&2 2>&3); then
791673
if [ -n "${ADV_TAGS}" ]; then
792674
ADV_TAGS=$(echo "$ADV_TAGS" | tr -d '[:space:]')
793675
TAGS="${ADV_TAGS}"

‎misc/install.func‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ EOF
205205
$STD apt-get update
206206
$STD apt-get -o Dpkg::Options::="--force-confold" -y dist-upgrade
207207
rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
208-
$STD apt-get install -y wget logrotate
208+
$STD apt-get install -y wget logrotate curl
209209
if [[ "$INSTALL_SSH" == "yes" ]]; then
210210
$STD apt-get install -y openssh-server
211211
fi

0 commit comments

Comments
 (0)