From a9279d77a30e17e7ceccbf358e83317a2f2c5110 Mon Sep 17 00:00:00 2001 From: Bruno Alves <57677900+balves42@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:31:57 +0000 Subject: [PATCH 01/10] Update nginxproxymanager-install.sh Added golang --- install/nginxproxymanager-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index 6c6b0fd80..1a231b938 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -39,7 +39,8 @@ $STD apt-get install -y \ python3-venv \ python3-cffi \ python3-certbot \ - python3-certbot-dns-cloudflare + python3-certbot-dns-cloudflare \ + golang rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED $STD pip3 install certbot-dns-multi==4.15.0 $STD python3 -m venv /opt/certbot/ From 194e213021f9453e4ae1dcb1ee0d6239c1ec148a Mon Sep 17 00:00:00 2001 From: Bruno Alves <57677900+balves42@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:32:47 +0000 Subject: [PATCH 02/10] Update nginxproxymanager.sh --- ct/nginxproxymanager.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 717a4d95e..12ccfacba 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -9,7 +9,7 @@ APP="Nginx Proxy Manager" var_tags="proxy" var_cpu="2" var_ram="1024" -var_disk="4" +var_disk="15" var_os="debian" var_version="12" var_unprivileged="1" @@ -157,4 +157,4 @@ 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}http://${IP}:81${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:81${CL}" From 3ac367ff59f25d2340e4eccb6f5173ad0667755c Mon Sep 17 00:00:00 2001 From: Bruno Alves <57677900+balves42@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:41:01 +0000 Subject: [PATCH 03/10] Update nginxproxymanager.sh --- ct/nginxproxymanager.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 12ccfacba..4cbe2120a 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/balves42/Proxmox/main/misc/build.func) # Copyright (c) 2021-2025 tteck # Author: tteck (tteckster) -# License: MIT | https://github.com/asylumexp/Proxmox/raw/main/LICENSE +# License: MIT | https://github.com/balves42/Proxmox/raw/main/LICENSE # Source: https://nginxproxymanager.com/ APP="Nginx Proxy Manager" From 2fbbde55ab4e8328b31b7b6f14dc80e07c9b4f14 Mon Sep 17 00:00:00 2001 From: Bruno Alves <57677900+balves42@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:53:30 +0000 Subject: [PATCH 04/10] Update build.func --- misc/build.func | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/misc/build.func b/misc/build.func index 9cba9936d..72b3fa89a 100644 --- a/misc/build.func +++ b/misc/build.func @@ -1,7 +1,7 @@ # Copyright (c) 2021-2025 tteck # Author: tteck (tteckster) # License: MIT -# https://github.com/asylumexp/Proxmox/raw/main/LICENSE +# https://github.com/balves42/Proxmox/raw/main/LICENSE variables() { 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. @@ -202,7 +202,7 @@ maxkeys_check() { arch_check() { if [ "$(dpkg --print-architecture)" != "arm64" ]; then echo -e "\n ${INFO}${YWB}This script will not work on non arm64 systems! \n" - echo -e "\n ${YWB}Visit https://github.com/asylumexp/Proxmox for AMD64 support. \n" + echo -e "\n ${YWB}Visit https://github.com/balves42/Proxmox for AMD64 support. \n" echo -e "Exiting..." sleep 2 exit @@ -1029,9 +1029,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/asylumexp/Proxmox/main/misc/alpine-install.func)" + export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/balves42/Proxmox/main/misc/alpine-install.func)" else - export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/install.func)" + export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/balves42/Proxmox/main/misc/install.func)" fi export RANDOM_UUID="$RANDOM_UUID" export CACHER="$APT_CACHER" @@ -1063,7 +1063,7 @@ build_container() { $PW " # This executes create_lxc.sh and creates the container and .conf file - bash -c "$(wget -qLO - https://raw.githubusercontent.com/asylumexp/Proxmox/main/ct/create_lxc.sh)" || exit $? + bash -c "$(wget -qLO - https://raw.githubusercontent.com/balves42/Proxmox/main/ct/create_lxc.sh)" || exit $? LXC_CONFIG=/etc/pve/lxc/${CTID}.conf if [ "$CT_TYPE" == "0" ]; then @@ -1125,7 +1125,7 @@ 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/asylumexp/Proxmox/main/install/$var_install.sh)" || exit $? + lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/balves42/Proxmox/main/install/$var_install.sh)" || exit $? } @@ -1138,7 +1138,7 @@ description() { cat < - Logo + Logo

${APP} LXC

@@ -1151,15 +1151,15 @@ description() { - GitHub + GitHub - Discussions + Discussions - Issues + Issues EOF From fe633d33c69fa9ce0716c46eb7d33980c1b52cd9 Mon Sep 17 00:00:00 2001 From: Bruno Alves <57677900+balves42@users.noreply.github.com> Date: Thu, 27 Feb 2025 16:27:56 +0000 Subject: [PATCH 05/10] Update nginxproxymanager-install.sh --- install/nginxproxymanager-install.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index 1a231b938..19e40189f 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -49,8 +49,15 @@ msg_ok "Installed Python Dependencies" VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" msg_info "Installing Openresty" -wget -qO - https://openresty.org/package/pubkey.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/openresty-archive-keyring.gpg -echo -e "deb http://openresty.org/package/debian bullseye openresty" >/etc/apt/sources.list.d/openresty.list +#wget -qO - https://openresty.org/package/pubkey.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/openresty-archive-keyring.gpg +#echo -e "deb http://openresty.org/package/debian bullseye openresty" >/etc/apt/sources.list.d/openresty.list +wget -O - https://openresty.org/package/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/openresty.gpg + +codename=`grep -Po 'VERSION="[0-9]+ \(\K[^)]+' /etc/os-release` + +echo "deb http://openresty.org/package/arm64/debian $codename openresty" \ + | sudo tee /etc/apt/sources.list.d/openresty.list + $STD apt-get update $STD apt-get -y install openresty msg_ok "Installed Openresty" From 9bb4a1cadbfa700f9082288fe8980be15b579e6b Mon Sep 17 00:00:00 2001 From: Bruno Alves <57677900+balves42@users.noreply.github.com> Date: Thu, 27 Feb 2025 17:01:53 +0000 Subject: [PATCH 06/10] Update README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 0bfa144b6..b07129cc8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ +# Nginx Proxy Manager on ARM64 Proxmox + +This fork contains fixes related to the install of Nginx Proxy Manager such as: +* Installation of missing golang dependency +* HD Space insufficent for compilation and upgraded from 4GB to 15GB (change it if you find it overkill) +* Arm64 fix on openresty dependency +

+
From a6a551aafb083e92a940cd0152344604961dd7c5 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:47:53 +1000 Subject: [PATCH 07/10] Update nginxproxymanager-install.sh --- install/nginxproxymanager-install.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index 19e40189f..72e6a957b 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -49,15 +49,9 @@ msg_ok "Installed Python Dependencies" VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" msg_info "Installing Openresty" -#wget -qO - https://openresty.org/package/pubkey.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/openresty-archive-keyring.gpg -#echo -e "deb http://openresty.org/package/debian bullseye openresty" >/etc/apt/sources.list.d/openresty.list wget -O - https://openresty.org/package/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/openresty.gpg - codename=`grep -Po 'VERSION="[0-9]+ \(\K[^)]+' /etc/os-release` - -echo "deb http://openresty.org/package/arm64/debian $codename openresty" \ - | sudo tee /etc/apt/sources.list.d/openresty.list - +echo "deb http://openresty.org/package/arm64/debian $codename openresty" | sudo tee /etc/apt/sources.list.d/openresty.list $STD apt-get update $STD apt-get -y install openresty msg_ok "Installed Openresty" From dfa3ec6f1b27b2241c5aa755dd26ea5154f3d584 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:48:49 +1000 Subject: [PATCH 08/10] Revert "Update README.md" This reverts commit 9bb4a1cadbfa700f9082288fe8980be15b579e6b. --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index b07129cc8..0bfa144b6 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,3 @@ -# Nginx Proxy Manager on ARM64 Proxmox - -This fork contains fixes related to the install of Nginx Proxy Manager such as: -* Installation of missing golang dependency -* HD Space insufficent for compilation and upgraded from 4GB to 15GB (change it if you find it overkill) -* Arm64 fix on openresty dependency -

-
From 612b6cc67603d1cfcdb58c3a0c111d2da63984ad Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:48:52 +1000 Subject: [PATCH 09/10] Revert "Update build.func" This reverts commit 2fbbde55ab4e8328b31b7b6f14dc80e07c9b4f14. --- misc/build.func | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/misc/build.func b/misc/build.func index 72b3fa89a..9cba9936d 100644 --- a/misc/build.func +++ b/misc/build.func @@ -1,7 +1,7 @@ # Copyright (c) 2021-2025 tteck # Author: tteck (tteckster) # License: MIT -# https://github.com/balves42/Proxmox/raw/main/LICENSE +# https://github.com/asylumexp/Proxmox/raw/main/LICENSE variables() { 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. @@ -202,7 +202,7 @@ maxkeys_check() { arch_check() { if [ "$(dpkg --print-architecture)" != "arm64" ]; then echo -e "\n ${INFO}${YWB}This script will not work on non arm64 systems! \n" - echo -e "\n ${YWB}Visit https://github.com/balves42/Proxmox for AMD64 support. \n" + echo -e "\n ${YWB}Visit https://github.com/asylumexp/Proxmox for AMD64 support. \n" echo -e "Exiting..." sleep 2 exit @@ -1029,9 +1029,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/balves42/Proxmox/main/misc/alpine-install.func)" + export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/alpine-install.func)" else - export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/balves42/Proxmox/main/misc/install.func)" + export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/install.func)" fi export RANDOM_UUID="$RANDOM_UUID" export CACHER="$APT_CACHER" @@ -1063,7 +1063,7 @@ build_container() { $PW " # This executes create_lxc.sh and creates the container and .conf file - bash -c "$(wget -qLO - https://raw.githubusercontent.com/balves42/Proxmox/main/ct/create_lxc.sh)" || exit $? + bash -c "$(wget -qLO - https://raw.githubusercontent.com/asylumexp/Proxmox/main/ct/create_lxc.sh)" || exit $? LXC_CONFIG=/etc/pve/lxc/${CTID}.conf if [ "$CT_TYPE" == "0" ]; then @@ -1125,7 +1125,7 @@ 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/balves42/Proxmox/main/install/$var_install.sh)" || exit $? + lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/asylumexp/Proxmox/main/install/$var_install.sh)" || exit $? } @@ -1138,7 +1138,7 @@ description() { cat < - Logo + Logo

${APP} LXC

@@ -1151,15 +1151,15 @@ description() { - GitHub + GitHub - Discussions + Discussions - Issues + Issues
EOF From 6c04141cd67edd538012794ec9db9bf8d7cf7612 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:50:10 +1000 Subject: [PATCH 10/10] Update nginxproxymanager.sh --- ct/nginxproxymanager.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 4cbe2120a..249165b7e 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -1,15 +1,15 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/balves42/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) # Copyright (c) 2021-2025 tteck # Author: tteck (tteckster) -# License: MIT | https://github.com/balves42/Proxmox/raw/main/LICENSE +# License: MIT | https://github.com/asylumexp/Proxmox/raw/main/LICENSE # Source: https://nginxproxymanager.com/ APP="Nginx Proxy Manager" var_tags="proxy" var_cpu="2" var_ram="1024" -var_disk="15" +var_disk="12" var_os="debian" var_version="12" var_unprivileged="1"