Merge 610eff3d2a into ed9c083dda

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -8,7 +8,7 @@ body:
         # 🐞 **Script Issue Report**
         Thank you for taking the time to report an issue! Please provide as much detail as possible to help us address the problem efficiently.  
 
-        ## ⚠️ **IMPORTANT**  
+        ## ⚠️ **IMPORTANT - READ FIRST**  
         - 🔍 **Search first:** Before submitting, check if the issue has already been reported or resolved in [closed issues](https://github.com/community-scripts/ProxmoxVE/issues?q=is%3Aissue+is%3Aclosed). If found, comment on that issue instead of creating a new one.  
         Alternatively, check the **[Discussions](https://github.com/community-scripts/ProxmoxVE/discussions)** under the *"Announcement"* or *"Guide"* categories for relevant information.  
         - 🛠️ **Supported environments only:** Ensure you are using a default Linux distribution. Custom setups may not be supported.  

.github/pull_request_template.md

@@ -1,22 +1,20 @@
-> **🛠️ Note:**  
-> We are meticulous about merging code into the main branch, so please understand that pull requests not meeting the project's standards may be rejected. It's never personal!  
-> 🎮 **Note for game-related scripts:** These have a lower likelihood of being merged.
-
----
-
 ## ✍️ Description
-Provide a summary of the changes made and/or reference the issue being addressed.
+
 
  
 
 - - -
-**_Please remove unneeded lines!_**
+- Related Issue: #
-- Related Issue: # (issue number, if applicable)  
+- Related PR: #
-- Related PR: # (if applicable)  
+- Related Discussion: #
-- Related Discussion: []()(if applicable)  
-
 - - - 
 
+
+## ✅ Prerequisites
+The following steps must be completed for the pull request to be considered:  
+- [] Self-review performed (I have reviewed my code to ensure it follows established patterns and conventions.)  
+- [] Testing performed (I have thoroughly tested my changes and verified expected functionality.)
+
 ## 🛠️ Type of Change
 Please check the relevant options:  
 - [] Bug fix (non-breaking change that resolves an issue)  
@@ -25,15 +23,6 @@ Please check the relevant options:
 - [] New script (a fully functional and thoroughly tested script or set of scripts)  
 
 ---
-
-## ✅ Prerequisites
-The following steps must be completed for the pull request to be considered:  
-- [ ] Self-review performed (I have reviewed my code to ensure it follows established patterns and conventions.)  
-- [ ] Testing performed (I have thoroughly tested my changes and verified expected functionality.)  
-- [ ] Documentation updated (I have updated any relevant documentation)
-
----
-
 ## 📋 Additional Information (optional)
 Provide any extra context or screenshots about the feature or fix here.  
 

CHANGELOG.md

@@ -16,6 +16,10 @@ All LXC instances created using this repository come pre-installed with Midnight
 > [!IMPORTANT]
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow
 
+## 2025-01-17
+
+### Changed
+
 ## 2025-01-16
 
 ### Changed

README.md

@@ -7,106 +7,98 @@
 </div>
 
 <div style="border: 2px solid #d1d5db; padding: 20px; border-radius: 8px; background-color: #f9fafb;">
-  <h2 align="center">Proxmox VE Helper-Scripts: A Community Legacy</h2>
+  <h2 align="center">Proxmox VE Helper-Scripts</h2>
-  <p>Dear Community,</p>
+  <p align="center">A Community Legacy in Memory of @tteck</p>
-  <p>In agreement with <a href="https://github.com/tteck">tteck</a> and <a href="https://github.com/community-scripts">Community-Scripts</a>, this project has now transitioned into a community-driven effort. We aim to continue his work, building on the foundation he laid to support Proxmox users worldwide. Tteck sadly <a href="https://github.com/community-scripts/ProxmoxVE/discussions/237">passed away in early November 2024</a>. This project will be a memorial for his incredible contribution to the community.</p>
-
   <p align="center">
     <a href="https://helper-scripts.com">
       <img src="https://img.shields.io/badge/Website-4c9b3f?style=for-the-badge&logo=github&logoColor=white" alt="Website" />
     </a>
+    <a href="https://discord.gg/UHrpNWGwkH">
+      <img src="https://img.shields.io/badge/Discord-7289da?style=for-the-badge&logo=discord&logoColor=white" alt="Discord" />
+    </a> 
+    <a href="https://ko-fi.com/community_scripts">
+      <img src="https://img.shields.io/badge/Donate-FF5F5F?style=for-the-badge&logo=ko-fi&logoColor=white" alt="Donate" />
+    </a>
     <a href="https://github.com/community-scripts/ProxmoxVE/blob/main/.github/CONTRIBUTING.md">
       <img src="https://img.shields.io/badge/Contribute-ff4785?style=for-the-badge&logo=git&logoColor=white" alt="Contribute" />
     </a> 
     <a href="https://github.com/community-scripts/ProxmoxVE/blob/main/USER_SUBMITTED_GUIDES.md">
       <img src="https://img.shields.io/badge/Guides-0077b5?style=for-the-badge&logo=read-the-docs&logoColor=white" alt="Guides" />
     </a> 
-  <a href="https://discord.gg/UHrpNWGwkH">
-    <img src="https://img.shields.io/badge/Discord-7289da?style=for-the-badge&logo=discord&logoColor=white" alt="Discord" />
-  </a> 
     <a href="https://github.com/community-scripts/ProxmoxVE/blob/main/CHANGELOG.md">
       <img src="https://img.shields.io/badge/Changelog-6c5ce7?style=for-the-badge&logo=git&logoColor=white" alt="Changelog" />
     </a>
   </p>
-
+</div>
-<hr>
-
-## 🚀&nbsp; Introduction
-
-**Proxmox VE Helper-Scripts** is a community-driven initiative that simplifies the setup of Proxmox Virtual Environment (VE). Originally created by [tteck](https://github.com/tteck), these scripts automate and streamline the process of creating and configuring Linux containers (LXC) and virtual machines (VMs) on Proxmox VE.
 
 ---
 
-## 📦&nbsp; Features
+## 🚀 Project Overview
 
-- **Interactive Setup**: Select simple or advanced options for your VM or LXC container configurations.
+**Proxmox VE Helper-Scripts** is a collection of tools to simplify the setup and management of Proxmox Virtual Environment (VE). Originally created by [tteck](https://github.com/tteck), these scripts are now continued by the community. Our goal is to preserve and expand upon tteck's work, providing an ongoing resource for Proxmox users worldwide.
-- **Customizable Configuration**: Advanced setup allows you to fine-tune your environment.
-- **Ease of Use**: Scripts automatically validate inputs to generate the final configuration.
-- **Proxmox Integration**: Seamlessly integrates with Proxmox VE to provide a user-friendly experience.
-- **Community-Driven**: This project is actively maintained and improved by the community.
-
-<hr>
-
-## 🚀&nbsp; Installation
-
-To install the Proxmox Helper Scripts, simply follow these steps:
-
-1. Open the [Website](https://helper-scripts.com/)
-2. Search for the desired script, e.g. **"Home Assistant OS VM"**.
-3. In the **"How To Install"** section, copy the provided **Bash command**.
-4. Open the Proxmox shell on your **main node**.
-5. Paste the command into the console, hit enter, and you are away! 🚀
-
-For detailed instructions, check out our [official guides](https://github.com/community-scripts/ProxmoxVE/blob/main/USER_SUBMITTED_GUIDES.md).
 
 ---
 
-## ❤️&nbsp; Community and Contributions
+## 📦 Features
 
-The Proxmox Helper Scripts project is community-driven, and we highly appreciate any contributions — whether it's through reporting bugs, suggesting features, improving documentation, or spreading the word. We are committed to maintaining transparency and sustainability in this open-source effort.
+- **Interactive Setup**: Choose between simple and advanced options for configuring VMs and LXC containers.
+- **Customizable Configurations**: Advanced setup for fine-tuning your environment.
+- **Seamless Integration**: Works seamlessly with Proxmox VE for a smooth experience.
+- **Community-driven**: Actively maintained and improved by the Proxmox community.
 
-### 💖&nbsp; Donate to Support the Project
+---
+## ✅ Requirements
 
-We offer two donation options to help maintain and grow this project:
+Ensure your system meets the following prerequisites:
-
-- **Ko-Fi for tteck**: [Donate to tteck's wife](https://ko-fi.com/proxmoxhelperscripts) - All donations will go directly to Angie, wife of the founder of this project [who passed away in early November 2024](https://github.com/community-scripts/ProxmoxVE/discussions/237).
-- **Ko-Fi for Community Edition**: [Donate to this project](https://ko-fi.com/community_scripts) -  All funds will go towards script maintenance infrastructure and server costs. **Our most immediate need is funding testing infrastructure**.  Your contributions help keep the project running. To honor tteck's legacy this project will also raise money for charity (cancer research, hospice care). Of the money donated to this project, 30% will be donated to charity. Income, expenditure and charitable donations will be disclosed annually in a transparent manner. 
-
-<hr>
-
-## 💬&nbsp; Get Help
-
-Have a question or ran into an issue? Join the conversation and get help from fellow community members:
-
-- **Discord**: Join our [Proxmox Helper Scripts Discord server](https://discord.gg/UHrpNWGwkH) to chat with other users and get support.
-- **GitHub Discussions**: [Ask questions or report issues](https://github.com/community-scripts/ProxmoxVE/discussions).
-
-<hr>
-
-## 🤝&nbsp; Found a bug or missing feature?
-
-If you’ve encountered an issue or identified an area for improvement, please file a new issue on our [GitHub issues page](https://github.com/community-scripts/ProxmoxVE/issues). If you’ve already found a solution or improvement, feel free to submit a pull request! We’d love to review and merge your contributions.
-
-<hr>
-
-## ✅&nbsp; Requirements
-
-To use the Proxmox VE Helper-Scripts, your system should meet the following requirements:
 
 - **Proxmox VE version**: 8.x or higher
 - **Linux**: Compatible with most distributions
-- **Dependencies**: Ensure that your system has bash and curl installed.
+- **Dependencies**: bash and curl should be installed.
-
-<hr>
-
-## 📜&nbsp; License
-
-This project is licensed under the terms of the [MIT License](LICENSE).
 
 ---
 
-## 📢&nbsp; Acknowledgments
+## 🚀 Installation
+
+To install the Proxmox Helper Scripts, follow these steps:
+
+1. Visit the [Website](https://helper-scripts.com/).
+2. Search for the desired script, e.g., **"Home Assistant OS VM"**.
+3. Copy the provided **Bash command** from the **"How To Install"** section.
+4. Open the Proxmox shell on your **main node** and paste the command.
+5. Press enter to start the installation! 🚀
+
+---
+
+## ❤️ Community and Contributions
+
+We appreciate any contributions to the project—whether it's bug reports, feature requests, documentation improvements, or spreading the word. Your involvement helps keep the project alive and sustainable.
+
+## 💖 Donate to Support the Project
+- **Ko-Fi for Community Edition**: [Donate to support this project](https://ko-fi.com/community_scripts) – Donations go towards maintaining the project, testing infrastructure, and charity (cancer research, hospice care). 30% of the funds will be donated to charity.
+
+---
+
+## 💬 Get Help
+
+Join our community for support:
+
+- **Discord**: Join our [Proxmox Helper Scripts Discord server](https://discord.gg/UHrpNWGwkH) for real-time support.
+- **GitHub Discussions**: [Ask questions or report issues](https://github.com/community-scripts/ProxmoxVE/discussions).
+
+## 🤝 Report a Bug or Feature Request
+
+If you encounter any issues or have suggestions for improvement, file a new issue on our [GitHub issues page](https://github.com/community-scripts/ProxmoxVE/issues). You can also submit pull requests with solutions or enhancements!
+
+---
+
+## 📜 License
+
+This project is licensed under the [MIT License](LICENSE).
+
+</br>
+</br>
+<p align="center">
+  <i style="font-size: smaller;"><b>Proxmox</b>® is a registered trademark of <a href="https://www.proxmox.com/en/about/company">Proxmox Server Solutions GmbH</a>.</i>
+</p>
 
-This community project is a memorial to the memory of [tteck](https://github.com/tteck). His foundational work created a thriving Proxmox community. Tteck worked on this project right until the end, even while in hospice. We are dedicated to keeping his vision alive and expanding upon it with the continued support of this vibrant community.
 
-Proxmox® is a registered trademark of [Proxmox Server Solutions GmbH](https://www.proxmox.com/en/about/company).

misc/build.func

@@ -531,7 +531,7 @@ advanced_settings() {
 
   if [ "$NET" != "dhcp" ]; then
     while true; do
-      GATE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Enter gateway IP address" 8 58 --title "Gateway IP" 3>&1 1>&2 2>&3)
+      GATE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Enter gateway IP address" 8 58 $GATE1 --title "Gateway IP" 3>&1 1>&2 2>&3)
       if [ -z "$GATE1" ]; then
         whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox "Gateway IP address cannot be empty" 8 58
       elif [[ ! "$GATE1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
@@ -551,7 +551,7 @@ advanced_settings() {
     APT_CACHER=""
     APT_CACHER_IP=""
   else
-    if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for default)" 8 58 --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
+    if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for default)" 8 58 $APT_CACHER_IP --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
       APT_CACHER="${APT_CACHER_IP:+yes}"
       echo -e "${NETWORK}${BOLD}${DGN}APT-Cacher IP Address: ${BGN}${APT_CACHER_IP:-Default}${CL}"
     else
@@ -566,7 +566,7 @@ advanced_settings() {
   fi
   echo -e "${DISABLEIPV6}${BOLD}${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
 
-  if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
+  if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 $MTU1 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
       MTU1="Default"
       MTU=""
@@ -578,7 +578,7 @@ advanced_settings() {
     exit_script
   fi
 
-  if SD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
+  if SD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 $SD --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
       SX=Host
       SD=""
@@ -591,7 +591,7 @@ advanced_settings() {
     exit_script
   fi
 
-  if NX=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+  if NX=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 $NX --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
     if [ -z $NX ]; then
       NX=Host
       NS=""
@@ -615,7 +615,7 @@ advanced_settings() {
     exit_script
   fi
 
-  if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
+  if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for default)" 8 58 $VLAN1 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
       VLAN1="Default"
       VLAN=""
@@ -687,6 +687,7 @@ install_script() {
   root_check
   arch_check
   ssh_check
+  read_proxmox_helper_scripts_env
 
   if systemctl is-active -q ping-instances.service; then
     systemctl -q stop ping-instances.service
@@ -955,3 +956,21 @@ EOF
     systemctl start ping-instances.service
   fi
 }
+
+
+# Set a global variable for the PHS environment file
+PVE_ENV="/etc/pve-helper-scripts.conf"
+
+# This function loads the environment file for common configuration in Proxmox-Helper-Scripts
+function read_proxmox_helper_scripts_env(){
+  #Check if file exists
+  if [ ! -f "$PVE_ENV" ]; then
+    msg_info "${BL}Creating Proxmox-Helper-Scripts configuration file.${CL}"
+    touch "$PVE_ENV"
+    chown root:root "$PVE_ENV"
+    chmod 0600 "$PVE_ENV"
+    msg_ok "${BL}Created Proxmox-Helper-Scripts configuration file.${CL}"
+  else
+    source "$PVE_ENV"
+  fi
+}