Update CHANGELOG.md (#5209)

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

CHANGELOG.md

@@ -14,8 +14,45 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment.
 
 
+## 2025-06-17
+
 ## 2025-06-16
 
+### 🆕 New Scripts
+
+  - Intel NIC offload Fix by @rcastley [@MickLesk](https://github.com/MickLesk) ([#5155](https://github.com/community-scripts/ProxmoxVE/pull/5155))
+
+### 🚀 Updated Scripts
+
+  - [core] Move install_php() from VED to main [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#5182](https://github.com/community-scripts/ProxmoxVE/pull/5182))
+- Firefly: Add Data Importer to LXC [@tremor021](https://github.com/tremor021) ([#5159](https://github.com/community-scripts/ProxmoxVE/pull/5159))
+
+  - #### 🐞 Bug Fixes
+
+    - Wastebin: Fix missing dependencies [@tremor021](https://github.com/tremor021) ([#5185](https://github.com/community-scripts/ProxmoxVE/pull/5185))
+    - Kasm: Storing Creds Fix [@omiinaya](https://github.com/omiinaya) ([#5162](https://github.com/community-scripts/ProxmoxVE/pull/5162))
+
+  - #### ✨ New Features
+
+    - add optional Cloud-init support to Debian VM script  [@koendiender](https://github.com/koendiender) ([#5137](https://github.com/community-scripts/ProxmoxVE/pull/5137))
+
+  - #### 🔧 Refactor
+
+    - Refactor: 2FAuth [@tremor021](https://github.com/tremor021) ([#5184](https://github.com/community-scripts/ProxmoxVE/pull/5184))
+
+### 🌐 Website
+
+  - Refactor layout and component styles for improved responsiveness [@BramSuurdje](https://github.com/BramSuurdje) ([#5195](https://github.com/community-scripts/ProxmoxVE/pull/5195))
+
+  - #### 🐞 Bug Fixes
+
+    - Refactor ScriptItem and ConfigFile components to conditionally render config file location. Update ConfigFile to accept configPath prop instead of item. [@BramSuurdje](https://github.com/BramSuurdje) ([#5197](https://github.com/community-scripts/ProxmoxVE/pull/5197))
+    - Update default image asset in the public directory and update api route to only search for files that end with .json [@BramSuurdje](https://github.com/BramSuurdje) ([#5179](https://github.com/community-scripts/ProxmoxVE/pull/5179))
+
+  - #### ✨ New Features
+
+    - Update default image asset in the public directory [@BramSuurdje](https://github.com/BramSuurdje) ([#5189](https://github.com/community-scripts/ProxmoxVE/pull/5189))
+
 ## 2025-06-15
 
 ### 🆕 New Scripts

ct/2fauth.sh

@@ -24,21 +24,16 @@ function update_script() {
   check_container_storage
   check_container_resources
 
-  # Check if installation is present | -f for file, -d for folder
   if [[ ! -d "/opt/2fauth" ]]; then
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-
-  # Crawling the new version and checking whether an update is required
   RELEASE=$(curl -fsSL https://api.github.com/repos/Bubka/2FAuth/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
   if [[ "${RELEASE}" != "$(cat /opt/2fauth_version.txt)" ]] || [[ ! -f /opt/2fauth_version.txt ]]; then
     msg_info "Updating $APP to ${RELEASE}"
-
     $STD apt-get update
     $STD apt-get -y upgrade
 
-    # Creating Backup
     msg_info "Creating Backup"
     mv "/opt/2fauth" "/opt/2fauth-backup"
     if ! dpkg -l | grep -q 'php8.3'; then
@@ -46,37 +41,24 @@ function update_script() {
     fi
     msg_ok "Backup Created"
 
-    # Upgrade PHP
     if ! dpkg -l | grep -q 'php8.3'; then
       $STD apt-get install -y \
         lsb-release \
-        gpg
+        gnupg2
-      curl -fsSL https://packages.sury.org/php/apt.gpg | gpg --dearmor -o /usr/share/keyrings/deb.sury.org-php.gpg
+      PHP_VERSION="8.3" PHP_MODULE="common,ctype,fileinfo,fpm,mysql,cli" install_php
-      echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" >/etc/apt/sources.list.d/php.list
-      $STD apt-get update
-      $STD apt-get install -y php8.3-{bcmath,common,ctype,curl,fileinfo,fpm,gd,mbstring,mysql,xml,cli,intl}
       sed -i 's/php8.2/php8.3/g' /etc/nginx/conf.d/2fauth.conf
     fi
-
+    fetch_and_deploy_gh_release "Bubka/2FAuth"
-    # Execute Update
-    curl -fsSL -o "${RELEASE}.zip" "https://github.com/Bubka/2FAuth/archive/refs/tags/${RELEASE}.zip"
-    $STD unzip "${RELEASE}.zip"
-    mv "2FAuth-${RELEASE//v/}/" "/opt/2fauth"
     mv "/opt/2fauth-backup/.env" "/opt/2fauth/.env"
     mv "/opt/2fauth-backup/storage" "/opt/2fauth/storage"
     cd "/opt/2fauth" || return
-
     chown -R www-data: "/opt/2fauth"
     chmod -R 755 "/opt/2fauth"
-
     export COMPOSER_ALLOW_SUPERUSER=1
     $STD composer install --no-dev --prefer-source
-
     php artisan 2fauth:install
-
     $STD systemctl restart nginx
 
-    # Cleaning up
     msg_info "Cleaning Up"
     rm -rf "v${RELEASE}.zip"
     if dpkg -l | grep -q 'php8.2'; then
@@ -86,7 +68,6 @@ function update_script() {
     $STD apt-get -y autoclean
     msg_ok "Cleanup Completed"
 
-    # Last Action
     echo "${RELEASE}" >/opt/2fauth_version.txt
     msg_ok "Updated $APP to ${RELEASE}"
   else

ct/firefly.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
 # Copyright (c) 2021-2025 community-scripts ORG
-# Author: quantumryuu
+# Author: quantumryuu | Co-Author: Slaviša Arežina (tremor021)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://firefly-iii.org/
 

frontend/public/json/add-iptag.json

@@ -1,23 +1,23 @@
 {
   "name": "Proxmox VE LXC IP-Tag",
-  "slug": "add-lxc-iptag",
+  "slug": "add-iptag",
   "categories": [
     1
   ],
-  "date_created": "2024-12-16",
+  "date_created": "2025-06-16",
   "type": "pve",
   "updateable": false,
   "privileged": false,
   "interface_port": null,
   "documentation": null,
   "website": null,
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/proxmox.webp",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/svg/proxmox.svg",
-  "config_path": "/opt/lxc-iptag/iptag.conf",
+  "config_path": "",
   "description": "This script automatically adds IP address as tags to LXC containers using a Systemd service. The service also updates the tags if a LXC IP address is changed.",
   "install_methods": [
     {
       "type": "default",
-      "script": "tools/pve/add-lxc-iptag.sh",
+      "script": "tools/pve/add-iptag.sh",
       "resources": {
         "cpu": null,
         "ram": null,
@@ -36,6 +36,10 @@
       "text": "Execute within the Proxmox shell",
       "type": "info"
     },
+    {
+      "text": "Configuration: `nano /opt/iptag/iptag.conf`. iptag.service must be restarted after change.",
+      "type": "info"
+    },
     {
       "text": "The Proxmox Node must contain ipcalc and net-tools. `apt-get install -y ipcalc net-tools`",
       "type": "warning"

frontend/public/json/firefly.json

@@ -32,6 +32,10 @@
     "password": null
   },
   "notes": [
+    {
+      "text": "Data Importer is at `http://<LXC_IP>/dataimporter/`",
+      "type": "info"
+    },
     {
       "text": "Database credentials: `cat ~/firefly.creds`",
       "type": "info"

frontend/public/json/nic-offloading-fix.json

@@ -4,7 +4,7 @@
   "categories": [
     1
   ],
-  "date_created": "2025-06-15",
+  "date_created": "2025-05-25",
   "type": "pve",
   "updateable": false,
   "privileged": false,

frontend/public/json/versions.json

@@ -1,4 +1,84 @@
 [
+  {
+    "name": "kimai/kimai",
+    "version": "2.36.1",
+    "date": "2025-06-16T19:20:54Z"
+  },
+  {
+    "name": "bunkerity/bunkerweb",
+    "version": "testing",
+    "date": "2025-06-16T18:10:42Z"
+  },
+  {
+    "name": "msgbyte/tianji",
+    "version": "v1.21.14",
+    "date": "2025-06-16T17:54:48Z"
+  },
+  {
+    "name": "goauthentik/authentik",
+    "version": "version/2025.6.2",
+    "date": "2025-06-16T17:54:39Z"
+  },
+  {
+    "name": "NodeBB/NodeBB",
+    "version": "v2.8.20",
+    "date": "2025-06-16T17:03:52Z"
+  },
+  {
+    "name": "emqx/emqx",
+    "version": "e5.9.1-alpha.1",
+    "date": "2025-06-16T15:34:01Z"
+  },
+  {
+    "name": "open-webui/open-webui",
+    "version": "v0.6.15",
+    "date": "2025-06-16T14:34:42Z"
+  },
+  {
+    "name": "grokability/snipe-it",
+    "version": "v8.1.16",
+    "date": "2025-06-16T13:49:37Z"
+  },
+  {
+    "name": "clusterzx/paperless-ai",
+    "version": "v3.0.5",
+    "date": "2025-06-16T13:25:55Z"
+  },
+  {
+    "name": "n8n-io/n8n",
+    "version": "n8n@1.95.3",
+    "date": "2025-06-03T11:09:42Z"
+  },
+  {
+    "name": "Graylog2/graylog2-server",
+    "version": "6.3.0-rc.1",
+    "date": "2025-06-16T11:28:08Z"
+  },
+  {
+    "name": "home-assistant/operating-system",
+    "version": "15.2",
+    "date": "2025-04-14T15:37:12Z"
+  },
+  {
+    "name": "moghtech/komodo",
+    "version": "v1.18.3",
+    "date": "2025-06-16T07:03:46Z"
+  },
+  {
+    "name": "Jackett/Jackett",
+    "version": "v0.22.2020",
+    "date": "2025-06-16T05:56:11Z"
+  },
+  {
+    "name": "esphome/esphome",
+    "version": "2025.5.2",
+    "date": "2025-06-03T08:45:14Z"
+  },
+  {
+    "name": "firefly-iii/firefly-iii",
+    "version": "v6.2.17",
+    "date": "2025-06-11T12:07:38Z"
+  },
   {
     "name": "jellyfin/jellyfin",
     "version": "v10.10.7",
@@ -49,11 +129,6 @@
     "version": "v5.26.2.10099",
     "date": "2025-06-11T20:10:39Z"
   },
-  {
-    "name": "Jackett/Jackett",
-    "version": "v0.22.2017",
-    "date": "2025-06-15T05:54:05Z"
-  },
   {
     "name": "traccar/traccar",
     "version": "v6.7.3",
@@ -74,11 +149,6 @@
     "version": "v25.0",
     "date": "2025-05-12T09:12:04Z"
   },
-  {
-    "name": "bunkerity/bunkerweb",
-    "version": "v1.6.2-rc5",
-    "date": "2025-06-14T16:44:14Z"
-  },
   {
     "name": "ollama/ollama",
     "version": "v0.9.1-rc1",
@@ -94,15 +164,10 @@
     "version": "v2.15.0",
     "date": "2025-06-14T10:48:57Z"
   },
-  {
-    "name": "firefly-iii/firefly-iii",
-    "version": "v6.2.17",
-    "date": "2025-06-11T12:07:38Z"
-  },
   {
     "name": "runtipi/runtipi",
-    "version": "v4.2.1",
+    "version": "nightly",
-    "date": "2025-06-03T20:04:28Z"
+    "date": "2025-06-14T07:49:50Z"
   },
   {
     "name": "FlareSolverr/FlareSolverr",
@@ -139,11 +204,6 @@
     "version": "v12.0.1+security-01",
     "date": "2025-06-13T04:15:18Z"
   },
-  {
-    "name": "msgbyte/tianji",
-    "version": "v1.21.13",
-    "date": "2025-06-13T04:11:30Z"
-  },
   {
     "name": "FlowiseAI/Flowise",
     "version": "flowise@3.0.2",
@@ -159,11 +219,6 @@
     "version": "v2.3.0p34",
     "date": "2025-06-12T12:15:44Z"
   },
-  {
-    "name": "n8n-io/n8n",
-    "version": "n8n@1.95.3",
-    "date": "2025-06-03T11:09:42Z"
-  },
   {
     "name": "docker/compose",
     "version": "v2.37.1",
@@ -194,11 +249,6 @@
     "version": "2.0.0-alpha-4",
     "date": "2025-05-14T05:01:45Z"
   },
-  {
-    "name": "esphome/esphome",
-    "version": "2025.5.2",
-    "date": "2025-06-03T08:45:14Z"
-  },
   {
     "name": "MediaBrowser/Emby.Releases",
     "version": "4.8.11.0",
@@ -214,11 +264,6 @@
     "version": "0.50.3",
     "date": "2025-06-11T15:19:52Z"
   },
-  {
-    "name": "kimai/kimai",
-    "version": "2.36.0",
-    "date": "2025-06-11T12:31:07Z"
-  },
   {
     "name": "cloudflare/cloudflared",
     "version": "2025.6.0",
@@ -254,11 +299,6 @@
     "version": "server/public/v0.1.15",
     "date": "2025-06-11T03:56:25Z"
   },
-  {
-    "name": "emqx/emqx",
-    "version": "e5.10.0",
-    "date": "2025-06-10T16:03:18Z"
-  },
   {
     "name": "node-red/node-red",
     "version": "4.1.0-beta.1",
@@ -269,21 +309,11 @@
     "version": "v0.107.62",
     "date": "2025-05-27T12:10:19Z"
   },
-  {
-    "name": "open-webui/open-webui",
-    "version": "v0.6.14",
-    "date": "2025-06-10T14:18:04Z"
-  },
   {
     "name": "element-hq/synapse",
     "version": "v1.131.0",
     "date": "2025-06-03T14:13:00Z"
   },
-  {
-    "name": "Graylog2/graylog2-server",
-    "version": "6.3.0-beta.5",
-    "date": "2025-06-10T11:19:42Z"
-  },
   {
     "name": "OctoPrint/OctoPrint",
     "version": "1.11.2",
@@ -339,11 +369,6 @@
     "version": "v3.3.0",
     "date": "2025-06-09T15:58:04Z"
   },
-  {
-    "name": "NodeBB/NodeBB",
-    "version": "v2.8.19",
-    "date": "2025-06-09T15:32:25Z"
-  },
   {
     "name": "seanmorley15/AdventureLog",
     "version": "v0.10.0",
@@ -384,11 +409,6 @@
     "version": "v1.10.0",
     "date": "2025-06-07T08:31:48Z"
   },
-  {
-    "name": "moghtech/komodo",
-    "version": "v1.18.1",
-    "date": "2025-06-07T06:25:20Z"
-  },
   {
     "name": "OliveTin/OliveTin",
     "version": "2025.6.6",
@@ -399,11 +419,6 @@
     "version": "v4.1.2",
     "date": "2025-06-06T17:44:58Z"
   },
-  {
-    "name": "goauthentik/authentik",
-    "version": "version/2025.6.1",
-    "date": "2025-06-06T15:28:21Z"
-  },
   {
     "name": "ioBroker/ioBroker",
     "version": "2025-05-31",
@@ -499,11 +514,6 @@
     "version": "1.26.3",
     "date": "2025-06-02T22:00:14Z"
   },
-  {
-    "name": "grokability/snipe-it",
-    "version": "v8.1.15",
-    "date": "2025-06-02T17:38:24Z"
-  },
   {
     "name": "inventree/InvenTree",
     "version": "0.17.13",
@@ -659,11 +669,6 @@
     "version": "3.2.0-rc2",
     "date": "2025-05-21T20:09:07Z"
   },
-  {
-    "name": "clusterzx/paperless-ai",
-    "version": "v3.0.4",
-    "date": "2025-05-21T19:03:53Z"
-  },
   {
     "name": "ipfs/kubo",
     "version": "v0.35.0",
@@ -904,11 +909,6 @@
     "version": "0.22.5",
     "date": "2025-04-15T02:52:26Z"
   },
-  {
-    "name": "home-assistant/operating-system",
-    "version": "15.2",
-    "date": "2025-04-14T15:37:12Z"
-  },
   {
     "name": "Tautulli/Tautulli",
     "version": "v2.15.2",

frontend/src/app/api/categories/route.ts

@@ -19,7 +19,11 @@ const getMetadata = async () => {
 
 const getScripts = async () => {
   const filePaths = (await fs.readdir(jsonDir))
-    .filter((fileName) => fileName !== metadataFileName && fileName !== versionFileName)
+    .filter((fileName) => 
+      fileName.endsWith(".json") && 
+      fileName !== metadataFileName && 
+      fileName !== versionFileName
+    )
     .map((fileName) => path.resolve(jsonDir, fileName));
 
   const scripts = await Promise.all(

frontend/src/app/layout.tsx

@@ -104,7 +104,7 @@ export default function RootLayout({
             <Navbar />
             <div className="flex min-h-screen flex-col justify-center">
               <div className="flex w-full justify-center">
-                <div className="w-full max-w-7xl ">
+                <div className="w-full max-w-[1440px] ">
                   <QueryProvider>
                     <NuqsAdapter>{children}</NuqsAdapter>
                   </QueryProvider>

frontend/src/app/scripts/_components/ScriptAccordion.tsx

@@ -56,7 +56,7 @@ export default function ScriptAccordion({
       value={expandedItem}
       onValueChange={handleAccordionChange}
       collapsible
-      className="overflow-y-scroll max-h-[calc(100vh-225px)] overflow-x-hidden mt-3 p-2"
+      className="overflow-y-scroll max-h-[calc(100vh-225px)] overflow-x-hidden p-2"
     >
       {items.map((category) => (
         <AccordionItem

frontend/src/app/scripts/_components/ScriptItem.tsx

@@ -15,12 +15,12 @@ import { ResourceDisplay } from "./ResourceDisplay";
 import { getDisplayValueFromType } from "./ScriptInfoBlocks";
 import Alerts from "./ScriptItems/Alerts";
 import Buttons from "./ScriptItems/Buttons";
+import ConfigFile from "./ScriptItems/ConfigFile";
 import DefaultPassword from "./ScriptItems/DefaultPassword";
 import Description from "./ScriptItems/Description";
 import InstallCommand from "./ScriptItems/InstallCommand";
 import InterFaces from "./ScriptItems/InterFaces";
 import Tooltips from "./ScriptItems/Tooltips";
-import ConfigFile from "./ScriptItems/ConfigFile";
 
 interface ScriptItemProps {
   item: Script;
@@ -120,7 +120,7 @@ export function ScriptItem({ item, setSelectedScript }: ScriptItemProps) {
   };
 
   return (
-    <div className="w-full max-w-5xl mx-auto">
+    <div className="w-full mx-auto">
       <div className="flex w-full flex-col">
         <div className="mb-3 flex items-center justify-between">
           <h2 className="text-2xl font-semibold tracking-tight text-foreground/90">Selected Script</h2>
@@ -132,7 +132,7 @@ export function ScriptItem({ item, setSelectedScript }: ScriptItemProps) {
           </button>
         </div>
 
-        <div className="rounded-xl border border-border/40 bg-gradient-to-b from-card/30 to-background/50 backdrop-blur-sm shadow-sm">
+        <div className="rounded-xl border border-border bg-gradient-to-b from-card/30 to-background/50 backdrop-blur-sm shadow-sm">
           <div className="p-6 space-y-6">
             <Suspense fallback={<div className="animate-pulse h-32 bg-accent/20 rounded-xl" />}>
               <ScriptHeader item={item} />
@@ -152,16 +152,18 @@ export function ScriptItem({ item, setSelectedScript }: ScriptItemProps) {
               <div className="">
                 <InstallCommand item={item} />
               </div>
-              <Separator />
+              {item.config_path && (
-              <div className="flex gap-3 px-4 py-2 bg-accent/25">
+                <>
-                <h2 className="text-lg font-semibold">
+                  <Separator />
-                  Location of config file
+                  <div className="flex gap-3 px-4 py-2 bg-accent/25">
-                </h2>
+                    <h2 className="text-lg font-semibold">Location of config file</h2>
-              </div>
+                  </div>
-              <Separator />
+                  <Separator />
-              <div className="">
+                  <div className="">
-                <ConfigFile item={item} />
+                    <ConfigFile configPath={item.config_path} />
-              </div>
+                  </div>
+                </>
+              )}
             </div>
 
             <DefaultPassword item={item} />

frontend/src/app/scripts/_components/ScriptItems/ConfigFile.tsx

@@ -1,10 +1,9 @@
 import ConfigCopyButton from "@/components/ui/config-copy-button";
-import { Script } from "@/lib/types";
 
-export default function ConfigFile({ item }: { item: Script }) {
+export default function ConfigFile({ configPath }: { configPath: string }) {
   return (
     <div className="px-4 pb-4">
-      <ConfigCopyButton>{item.config_path ? item.config_path : "No config path set"}</ConfigCopyButton>
+      <ConfigCopyButton>{configPath}</ConfigCopyButton>
     </div>
   );
 }

frontend/src/app/scripts/_components/Sidebar.tsx

@@ -22,7 +22,7 @@ const Sidebar = ({
 	}, [] as Script[]);
 
 	return (
-		<div className="flex min-w-72 flex-col sm:max-w-72">
+		<div className="flex min-w-[350px] flex-col sm:max-w-[350px]">
 			<div className="flex items-end justify-between pb-4">
 				<h1 className="text-xl font-bold">Categories</h1>
 				<p className="text-xs italic text-muted-foreground">

frontend/src/app/scripts/page.tsx

@@ -47,7 +47,7 @@ function ScriptContent() {
             setSelectedScript={setSelectedScript}
           />
         </div>
-        <div className="mx-7 w-full sm:mx-0 sm:ml-7">
+        <div className="mx-4 w-full sm:mx-0 sm:ml-4">
           {selectedScript && item ? (
             <ScriptItem item={item} setSelectedScript={setSelectedScript} />
           ) : (

frontend/src/components/Navbar.tsx

@@ -34,7 +34,7 @@ function Navbar() {
 						isScrolled ? "glass border-b bg-background/50" : ""
 					}`}
 				>
-					<div className="flex h-20 w-full max-w-7xl items-center justify-between sm:flex-row">
+					<div className="flex h-20 w-full max-w-[1440px] items-center justify-between sm:flex-row">
 						<Link
 							href={"/"}
 							className="flex cursor-pointer w-full justify-center sm:justify-start flex-row-reverse items-center gap-2 font-semibold sm:flex-row"

install/2fauth-install.sh

@@ -15,17 +15,12 @@ update_os
 
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
-  lsb-release
+  lsb-release \
-curl -fsSL https://packages.sury.org/php/apt.gpg | gpg --dearmor -o /usr/share/keyrings/deb.sury.org-php.gpg
+  nginx
-echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" >/etc/apt/sources.list.d/php.list
-$STD apt-get update
-
-$STD apt-get install -y \
-  nginx \
-  composer \
-  php8.3-{bcmath,common,ctype,curl,fileinfo,fpm,gd,intl,mbstring,mysql,xml,cli}
 msg_ok "Installed Dependencies"
 
+PHP_VERSION="8.3" PHP_MODULE="common,ctype,fileinfo,fpm,mysql,cli" install_php
+install_composer
 install_mariadb
 
 msg_info "Setting up Database"
@@ -43,16 +38,12 @@ $STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUS
 } >>~/2FAuth.creds
 msg_ok "Set up Database"
 
-msg_info "Setup 2FAuth"
+fetch_and_deploy_gh_release "Bubka/2FAuth"
-RELEASE=$(curl -fsSL https://api.github.com/repos/Bubka/2FAuth/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-curl -fsSL "https://github.com/Bubka/2FAuth/archive/refs/tags/${RELEASE}.zip" -o "${RELEASE}.zip"
-$STD unzip "${RELEASE}.zip"
-mv "2FAuth-${RELEASE//v/}/" /opt/2fauth
 
-cd "/opt/2fauth" || return
+msg_info "Setup 2FAuth"
+cd /opt/2fauth
 cp .env.example .env
 IPADDRESS=$(hostname -I | awk '{print $1}')
-
 sed -i -e "s|^APP_URL=.*|APP_URL=http://$IPADDRESS|" \
   -e "s|^DB_CONNECTION=$|DB_CONNECTION=mysql|" \
   -e "s|^DB_DATABASE=$|DB_DATABASE=$DB_NAME|" \
@@ -60,22 +51,16 @@ sed -i -e "s|^APP_URL=.*|APP_URL=http://$IPADDRESS|" \
   -e "s|^DB_PORT=$|DB_PORT=3306|" \
   -e "s|^DB_USERNAME=$|DB_USERNAME=$DB_USER|" \
   -e "s|^DB_PASSWORD=$|DB_PASSWORD=$DB_PASS|" .env
-
 export COMPOSER_ALLOW_SUPERUSER=1
 $STD composer update --no-plugins --no-scripts
 $STD composer install --no-dev --prefer-source --no-plugins --no-scripts
-
 $STD php artisan key:generate --force
-
 $STD php artisan migrate:refresh
 $STD php artisan passport:install -q -n
 $STD php artisan storage:link
 $STD php artisan config:cache
-
 chown -R www-data: /opt/2fauth
 chmod -R 755 /opt/2fauth
-
-echo "${RELEASE}" >"/opt/2fauth_version.txt"
 msg_ok "Setup 2fauth"
 
 msg_info "Configure Service"
@@ -107,7 +92,6 @@ server {
         }
 }
 EOF
-
 systemctl reload nginx
 msg_ok "Configured Service"
 
@@ -115,7 +99,6 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -f "/opt/v${RELEASE}.zip"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"

install/firefly-install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Copyright (c) 2021-2025 community-scripts ORG
-# Author: quantumryuu
+# Author: quantumryuu | Co-Author: Slaviša Arežina (tremor021)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://firefly-iii.org/
 
@@ -30,7 +30,6 @@ msg_info "Setting up database"
 DB_NAME=firefly
 DB_USER=firefly
 DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-MYSQL_VERSION=$(mariadb --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -n1)
 $STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
 $STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
 mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
@@ -43,6 +42,7 @@ mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRI
 msg_ok "Set up database"
 
 msg_info "Installing Firefly III (Patience)"
+LOCAL_IP=$(hostname -I | awk '{print $1}')
 RELEASE=$(curl -fsSL https://api.github.com/repos/firefly-iii/firefly-iii/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
 cd /opt
 curl -fsSL "https://github.com/firefly-iii/firefly-iii/releases/download/v${RELEASE}/FireflyIII-v${RELEASE}.tar.gz" -o "FireflyIII-v${RELEASE}.tar.gz"
@@ -61,6 +61,14 @@ $STD php artisan firefly:upgrade-database
 $STD php artisan firefly:correct-database
 $STD php artisan firefly:report-integrity
 $STD php artisan firefly:laravel-passport-keys
+IMPORTER_RELEASE=$(curl -fsSL https://api.github.com/repos/firefly-iii/data-importer/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
+mkdir -p /opt/firefly/dataimporter
+cd /opt
+curl -fsSL "https://github.com/firefly-iii/data-importer/releases/download/v${IMPORTER_RELEASE}/DataImporter-v${IMPORTER_RELEASE}.tar.gz" -o "DataImporter-v${IMPORTER_RELEASE}.tar.gz"
+tar -xzf "DataImporter-v${IMPORTER_RELEASE}.tar.gz" -C /opt/firefly/dataimporter
+cp /opt/firefly/dataimporter/.env.example /opt/firefly/dataimporter/.env
+sed -i "s#FIREFLY_III_URL=#FIREFLY_III_URL=http://${LOCAL_IP}#g" /opt/firefly/dataimporter/.env
+chown -R www-data:www-data /opt/firefly
 echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
 msg_ok "Installed Firefly III"
 
@@ -76,6 +84,17 @@ cat <<EOF >/etc/apache2/sites-available/firefly.conf
         Require all granted
     </Directory>
 
+  Alias /dataimporter/ /opt/firefly/dataimporter/public/
+
+    <Directory /opt/firefly/dataimporter/public/>
+        Options Indexes FollowSymLinks
+        AllowOverride All
+        Require all granted
+    </Directory>
+    <FilesMatch \.php$>
+        SetHandler application/x-httpd-php
+    </FilesMatch>
+
     ErrorLog /var/log/apache2/error.log
     CustomLog /var/log/apache2/access.log combined
 
@@ -93,7 +112,8 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -rf /opt/FireflyIII-v${RELEASE}.tar.gz
+rm -rf "/opt/FireflyIII-v${RELEASE}.tar.gz"
+rm -rf "/opt/DataImporter-v${IMPORTER_RELEASE}.tar.gz"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"

install/kasm-install.sh

@@ -16,17 +16,25 @@ update_os
 msg_info "Installing Kasm Workspaces"
 KASM_VERSION=$(curl -fsSL 'https://www.kasmweb.com/downloads' | grep -o 'https://kasm-static-content.s3.amazonaws.com/kasm_release_[^"]*\.tar\.gz' | head -n 1 | sed -E 's/.*release_(.*)\.tar\.gz/\1/')
 curl -fsSL -o "/opt/kasm_release_${KASM_VERSION}.tar.gz" "https://kasm-static-content.s3.amazonaws.com/kasm_release_${KASM_VERSION}.tar.gz"
-tar -xf "/opt/kasm_release_${KASM_VERSION}.tar.gz" -C /opt
+
-printf 'y\ny\ny\n4\n' | bash /opt/kasm_release/install.sh
+cd /opt
-touch ~/kasm-install.output
+tar -xf "kasm_release_${KASM_VERSION}.tar.gz"
-sed -n '/Kasm UI Login Credentials/,$p' ~/kasm-install.output >~/kasm.creds
+chmod +x /opt/kasm_release/install.sh
+printf 'y\ny\ny\n4\n' | bash /opt/kasm_release/install.sh > ~/kasm-install.output 2>&1
+cat ~/kasm-install.output | grep -A 20 -i "credentials\|login\|password\|admin" | sed '1i Kasm-Workspaces-Credentials' >~/kasm.creds
+
 msg_ok "Installed Kasm Workspaces"
 
 motd_ssh
 customize
 
+msg_info "Displaying Kasm Credentials"
+cat ~/kasm.creds
+msg_ok "Kasm Credentials displayed"
+
 msg_info "Cleaning up"
-$STD rm -f "/opt/kasm_release_${KASM_VERSION}.tar.gz"
+rm -f /opt/kasm_release_${KASM_VERSION}.tar.gz
+rm -f ~/kasm-install.output
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"

install/wastebin-install.sh

@@ -13,6 +13,10 @@ setting_up_container
 network_check
 update_os
 
+msg_info "Installing dependencies"
+$STD apt-get install -y zstd
+msg_ok "Installed dependencies"
+
 msg_info "Installing Wastebin"
 temp_file=$(mktemp)
 RELEASE=$(curl -fsSL https://api.github.com/repos/matze/wastebin/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')

misc/tools.func

@@ -380,45 +380,44 @@ install_php() {
   # Deduplicate modules
   COMBINED_MODULES=$(echo "$COMBINED_MODULES" | tr ',' '\n' | awk '!seen[$0]++' | paste -sd, -)
 
-  local CURRENT_PHP
+  local CURRENT_PHP=""
   if command -v php >/dev/null 2>&1; then
     CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2)
-  else
-    CURRENT_PHP=""
   fi
 
   if [[ -z "$CURRENT_PHP" ]]; then
-    msg_info "Setup PHP $PHP_VERSION"
+    msg_info "No PHP found, setting up PHP $PHP_VERSION"
   elif [[ "$CURRENT_PHP" != "$PHP_VERSION" ]]; then
     msg_info "PHP $CURRENT_PHP detected, migrating to PHP $PHP_VERSION"
-    if [[ ! -f /etc/apt/sources.list.d/php.list ]]; then
-      $STD curl -fsSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
-      $STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
-      echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ ${DISTRO_CODENAME} main" \
-        >/etc/apt/sources.list.d/php.list
-      $STD apt-get update
-    fi
-
     $STD apt-get purge -y "php${CURRENT_PHP//./}"* || true
   fi
 
+  # Ensure Sury repo is available
+  if [[ ! -f /etc/apt/sources.list.d/php.list ]]; then
+    $STD curl -fsSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+    $STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
+    echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ ${DISTRO_CODENAME} main" \
+      >/etc/apt/sources.list.d/php.list
+    $STD apt-get update
+  fi
+
   local MODULE_LIST="php${PHP_VERSION}"
   IFS=',' read -ra MODULES <<<"$COMBINED_MODULES"
   for mod in "${MODULES[@]}"; do
     MODULE_LIST+=" php${PHP_VERSION}-${mod}"
   done
+
   if [[ "$PHP_FPM" == "YES" ]]; then
     MODULE_LIST+=" php${PHP_VERSION}-fpm"
   fi
 
-  if [[ "$PHP_APACHE" == "YES" ]]; then
+  if [[ "$PHP_APACHE" == "YES" ]] && [[ -n "$CURRENT_PHP" ]]; then
-    # Optionally disable old Apache PHP module
     if [[ -f /etc/apache2/mods-enabled/php${CURRENT_PHP}.load ]]; then
       $STD a2dismod php${CURRENT_PHP} || true
     fi
   fi
 
-  if [[ "$PHP_FPM" == "YES" ]]; then
+  if [[ "$PHP_FPM" == "YES" ]] && [[ -n "$CURRENT_PHP" ]]; then
     $STD systemctl stop php${CURRENT_PHP}-fpm || true
     $STD systemctl disable php${CURRENT_PHP}-fpm || true
   fi
@@ -436,8 +435,7 @@ install_php() {
   fi
 
   # Patch all relevant php.ini files
-  local PHP_INI_PATHS=()
+  local PHP_INI_PATHS=("/etc/php/${PHP_VERSION}/cli/php.ini")
-  PHP_INI_PATHS+=("/etc/php/${PHP_VERSION}/cli/php.ini")
   [[ "$PHP_FPM" == "YES" ]] && PHP_INI_PATHS+=("/etc/php/${PHP_VERSION}/fpm/php.ini")
   [[ "$PHP_APACHE" == "YES" ]] && PHP_INI_PATHS+=("/etc/php/${PHP_VERSION}/apache2/php.ini")
 
@@ -452,7 +450,6 @@ install_php() {
     fi
   done
 }
-
 # ------------------------------------------------------------------------------
 # Installs or updates Composer globally.
 #

tools/headers/add-iptag

@@ -0,0 +1,6 @@
+    ________      ______           
+   /  _/ __ \    /_  __/___ _____ _
+   / // /_/ /_____/ / / __ `/ __ `/
+ _/ // ____/_____/ / / /_/ / /_/ / 
+/___/_/         /_/  \__,_/\__, /  
+                          /____/   

tools/headers/add-lxc-iptag

@@ -1,6 +0,0 @@
-    __   _  ________   ________      ______           
-   / /  | |/ / ____/  /  _/ __ \    /_  __/___ _____ _
-  / /   |   / /       / // /_/ /_____/ / / __ `/ __ `/
- / /___/   / /___   _/ // ____/_____/ / / /_/ / /_/ / 
-/_____/_/|_\____/  /___/_/         /_/  \__,_/\__, /  
-                                             /____/   

tools/pve/add-lxc-iptag.sh

@@ -1,357 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2025 community-scripts ORG
-# Author: MickLesk (Canbiz)
-# License: MIT
-# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/gitsang/lxc-iptag
-
-function header_info {
-  clear
-  cat <<"EOF"
-    __   _  ________   ________      ______           
-   / /  | |/ / ____/  /  _/ __ \    /_  __/___ _____ _
-  / /   |   / /       / // /_/ /_____/ / / __ `/ __ `/
- / /___/   / /___   _/ // ____/_____/ / / /_/ / /_/ / 
-/_____/_/|_\____/  /___/_/         /_/  \__,_/\__, /  
-                                             /____/   
-EOF
-}
-
-clear
-header_info
-APP="LXC IP-Tag"
-hostname=$(hostname)
-
-# Farbvariablen
-YW=$(echo "\033[33m")
-GN=$(echo "\033[1;92m")
-RD=$(echo "\033[01;31m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD=" "
-CM=" ✔️ ${CL}"
-CROSS=" ✖️ ${CL}"
-
-# This function enables error handling in the script by setting options and defining a trap for the ERR signal.
-catch_errors() {
-  set -Eeuo pipefail
-  trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-}
-
-# 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.
-error_handler() {
-  if [ -n "$SPINNER_PID" ] && ps -p "$SPINNER_PID" >/dev/null; then kill "$SPINNER_PID" >/dev/null; fi
-  printf "\e[?25h"
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-# This function displays a spinner.
-spinner() {
-  local frames=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏')
-  local spin_i=0
-  local interval=0.1
-  printf "\e[?25l"
-
-  local color="${YWB}"
-
-  while true; do
-    printf "\r ${color}%s${CL}" "${frames[spin_i]}"
-    spin_i=$(((spin_i + 1) % ${#frames[@]}))
-    sleep "$interval"
-  done
-}
-
-# This function displays an informational message with a yellow color.
-msg_info() {
-  local msg="$1"
-  echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}"
-  spinner &
-  SPINNER_PID=$!
-}
-
-# This function displays a success message with a green color.
-msg_ok() {
-  if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID >/dev/null; then kill $SPINNER_PID >/dev/null; fi
-  printf "\e[?25h"
-  local msg="$1"
-  echo -e "${BFR}${CM}${GN}${msg}${CL}"
-}
-
-# This function displays a error message with a red color.
-msg_error() {
-  if [ -n "$SPINNER_PID" ] && ps -p "$SPINNER_PID" >/dev/null; then kill "$SPINNER_PID" >/dev/null; fi
-  printf "\e[?25h"
-  local msg="$1"
-  echo -e "${BFR}${CROSS}${RD}${msg}${CL}"
-}
-
-while true; do
-  read -p "This will install ${APP} on ${hostname}. Proceed? (y/n): " yn
-  case $yn in
-  [Yy]*) break ;;
-  [Nn]*)
-    msg_error "Installation cancelled."
-    exit
-    ;;
-  *) msg_error "Please answer yes or no." ;;
-  esac
-done
-
-if ! pveversion | grep -Eq "pve-manager/8\.[0-4](\.[0-9]+)*"; then
-  msg_error "This version of Proxmox Virtual Environment is not supported"
-  msg_error "⚠️ Requires Proxmox Virtual Environment Version 8.0 or later."
-  msg_error "Exiting..."
-  sleep 2
-  exit
-fi
-
-FILE_PATH="/usr/local/bin/iptag"
-if [[ -f "$FILE_PATH" ]]; then
-  msg_info "The file already exists: '$FILE_PATH'. Skipping installation."
-  exit 0
-fi
-
-msg_info "Installing Dependencies"
-apt-get update &>/dev/null
-apt-get install -y ipcalc net-tools &>/dev/null
-msg_ok "Installed Dependencies"
-
-msg_info "Setting up IP-Tag Scripts"
-mkdir -p /opt/lxc-iptag
-msg_ok "Setup IP-Tag Scripts"
-
-msg_info "Setup Default Config"
-if [[ ! -f /opt/lxc-iptag/iptag.conf ]]; then
-  cat <<EOF >/opt/lxc-iptag/iptag.conf
-# Configuration file for LXC IP tagging
-
-# List of allowed CIDRs
-CIDR_LIST=(
-  192.168.0.0/16
-  172.16.0.0/12
-  10.0.0.0/8
-  100.64.0.0/10
-)
-
-# Interval settings (in seconds)
-LOOP_INTERVAL=60
-FW_NET_INTERFACE_CHECK_INTERVAL=60
-LXC_STATUS_CHECK_INTERVAL=-1
-FORCE_UPDATE_INTERVAL=1800
-EOF
-  msg_ok "Setup default config"
-else
-  msg_ok "Default config already exists"
-fi
-
-msg_info "Setup Main Function"
-if [[ ! -f /opt/lxc-iptag/iptag ]]; then
-  cat <<'EOF' >/opt/lxc-iptag/iptag
-#!/bin/bash
-
-# =============== CONFIGURATION =============== #
-
-CONFIG_FILE="/opt/lxc-iptag/iptag.conf"
-
-# Load the configuration file if it exists
-if [ -f "$CONFIG_FILE" ]; then
-  # shellcheck source=./lxc-iptag.conf
-  source "$CONFIG_FILE"
-fi
-
-# Convert IP to integer for comparison
-ip_to_int() {
-  local ip="${1}"
-  local a b c d
-
-  IFS=. read -r a b c d <<< "${ip}"
-  echo "$((a << 24 | b << 16 | c << 8 | d))"
-}
-
-# Check if IP is in CIDR
-ip_in_cidr() {
-  local ip="${1}"
-  local cidr="${2}"
-
-  ip_int=$(ip_to_int "${ip}")
-  netmask_int=$(ip_to_int "$(ipcalc -b "${cidr}" | grep Broadcast | awk '{print $2}')")
-  masked_ip_int=$(( "${ip_int}" & "${netmask_int}" ))
-  [[ ${ip_int} -eq ${masked_ip_int} ]] && return 0 || return 1
-}
-
-# Check if IP is in any CIDRs
-ip_in_cidrs() {
-  local ip="${1}"
-  local cidrs=()
-
-  mapfile -t cidrs < <(echo "${2}" | tr ' ' '\n')
-  for cidr in "${cidrs[@]}"; do
-  ip_in_cidr "${ip}" "${cidr}" && return 0
-  done
-
-  return 1
-}
-
-# Check if IP is valid
-is_valid_ipv4() {
-  local ip=$1
-  local regex="^([0-9]{1,3}\.){3}[0-9]{1,3}$"
-
-  if [[ $ip =~ $regex ]]; then
-    IFS='.' read -r -a parts <<< "$ip"
-    for part in "${parts[@]}"; do
-      if ! [[ $part =~ ^[0-9]+$ ]] || ((part < 0 || part > 255)); then
-        return 1
-      fi
-    done
-    return 0
-  else
-    return 1
-  fi
-}
-
-lxc_status_changed() {
-  current_lxc_status=$(pct list 2>/dev/null)
-  if [ "${last_lxc_status}" == "${current_lxc_status}" ]; then
-    return 1
-  else
-    last_lxc_status="${current_lxc_status}"
-    return 0
-  fi
-}
-
-fw_net_interface_changed() {
-  current_net_interface=$(ifconfig | grep "^fw")
-  if [ "${last_net_interface}" == "${current_net_interface}" ]; then
-    return 1
-  else
-    last_net_interface="${current_net_interface}"
-    return 0
-  fi
-}
-
-# =============== MAIN =============== #
-
-update_lxc_iptags() {
-  vmid_list=$(pct list 2>/dev/null | grep -v VMID | awk '{print $1}')
-  for vmid in ${vmid_list}; do
-    last_tagged_ips=()
-    current_valid_ips=()
-    next_tags=()
-
-    # Parse current tags
-    mapfile -t current_tags < <(pct config "${vmid}" | grep tags | awk '{print $2}' | sed 's/;/\n/g')
-    for current_tag in "${current_tags[@]}"; do
-      if is_valid_ipv4 "${current_tag}"; then
-        last_tagged_ips+=("${current_tag}")
-        continue
-      fi
-      next_tags+=("${current_tag}")
-    done
-
-    # Get current IPs
-    current_ips_full=$(lxc-info -n "${vmid}" -i | awk '{print $2}')
-    for ip in ${current_ips_full}; do
-      if is_valid_ipv4 "${ip}" && ip_in_cidrs "${ip}" "${CIDR_LIST[*]}"; then
-        current_valid_ips+=("${ip}")
-        next_tags+=("${ip}")
-      fi
-    done
-
-    # Skip if no ip change
-    if [[ "$(echo "${last_tagged_ips[@]}" | tr ' ' '\n' | sort -u)" == "$(echo "${current_valid_ips[@]}" | tr ' ' '\n' | sort -u)" ]]; then
-      echo "Skipping ${vmid} cause ip no changes"
-      continue
-    fi
-
-    # Set tags
-    echo "Setting ${vmid} tags from ${current_tags[*]} to ${next_tags[*]}"
-    pct set "${vmid}" -tags "$(IFS=';'; echo "${next_tags[*]}")"
-  done
-}
-
-check() {
-  current_time=$(date +%s)
-
-  time_since_last_lxc_status_check=$((current_time - last_lxc_status_check_time))
-  if [[ "${LXC_STATUS_CHECK_INTERVAL}" -gt 0 ]] \
-    && [[ "${time_since_last_lxc_status_check}" -ge "${STATUS_CHECK_INTERVAL}" ]]; then
-    echo "Checking lxc status..."
-    last_lxc_status_check_time=${current_time}
-    if lxc_status_changed; then
-      update_lxc_iptags
-      last_update_time=${current_time}
-      return
-    fi
-  fi
-
-  time_since_last_fw_net_interface_check=$((current_time - last_fw_net_interface_check_time))
-  if [[ "${FW_NET_INTERFACE_CHECK_INTERVAL}" -gt 0 ]] \
-    && [[ "${time_since_last_fw_net_interface_check}" -ge "${FW_NET_INTERFACE_CHECK_INTERVAL}" ]]; then
-    echo "Checking fw net interface..."
-    last_fw_net_interface_check_time=${current_time}
-    if fw_net_interface_changed; then
-      update_lxc_iptags
-      last_update_time=${current_time}
-      return
-    fi
-  fi
-
-  time_since_last_update=$((current_time - last_update_time))
-  if [ ${time_since_last_update} -ge ${FORCE_UPDATE_INTERVAL} ]; then
-    echo "Force updating lxc iptags..."
-    update_lxc_iptags
-    last_update_time=${current_time}
-    return
-  fi
-}
-
-# main: Set the IP tags for all LXC containers
-main() {
-  while true; do
-    check
-    sleep "${LOOP_INTERVAL}"
-  done
-}
-
-main
-EOF
-  msg_ok "Setup Main Function"
-else
-  msg_ok "Main Function already exists"
-fi
-chmod +x /opt/lxc-iptag/iptag
-
-msg_info "Creating Service"
-if [[ ! -f /lib/systemd/system/iptag.service ]]; then
-  cat <<EOF >/lib/systemd/system/iptag.service
-[Unit]
-Description=LXC IP-Tag service
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/opt/lxc-iptag/iptag
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-EOF
-  msg_ok "Created Service"
-else
-  msg_ok "Service already exists."
-fi
-
-msg_ok "Setup IP-Tag Scripts"
-
-msg_info "Starting Service"
-systemctl daemon-reload &>/dev/null
-systemctl enable -q --now iptag.service &>/dev/null
-msg_ok "Started Service"
-SPINNER_PID=""
-echo -e "\n${APP} installation completed successfully! ${CL}\n"

tools/pve/nic-offloading-fix.sh

@@ -0,0 +1,227 @@
+#!/usr/bin/env bash
+
+# Creates a systemd service to disable NIC offloading features for Intel e1000e interfaces
+# Author: rcastley
+# License: MIT
+
+YW=$(echo "\033[33m")
+YWB=$'\e[93m'
+BL=$(echo "\033[36m")
+RD=$(echo "\033[01;31m")
+BGN=$(echo "\033[4;92m")
+GN=$(echo "\033[1;92m")
+DGN=$(echo "\033[32m")
+CL=$(echo "\033[m")
+TAB="  "
+CM="${TAB}✔️${TAB}"
+CROSS="${TAB}✖️${TAB}"
+INFO="${TAB}ℹ️${TAB}${CL}"
+WARN="${TAB}⚠️${TAB}${CL}"
+
+function header_info {
+  clear
+  cat <<"EOF"
+
+    _   ____________   ____  __________                ___                ____  _            __    __
+   / | / /  _/ ____/  / __ \/ __/ __/ /___  ____ _____/ (_)___  ____ _   / __ \(_)________ _/ /_  / /__  _____
+  /  |/ // // /      / / / / /_/ /_/ / __ \/ __ `/ __  / / __ \/ __ `/  / / / / / ___/ __ `/ __ \/ / _ \/ ___/
+ / /|  // // /___   / /_/ / __/ __/ / /_/ / /_/ / /_/ / / / / / /_/ /  / /_/ / (__  ) /_/ / /_/ / /  __/ /
+/_/ |_/___/\____/   \____/_/ /_/ /_/\____/\__,_/\__,_/_/_/ /_/\__, /  /_____/_/____/\__,_/_.___/_/\___/_/
+                                                             /____/
+
+EOF
+}
+
+header_info
+
+function msg_info() { echo -e "${INFO} ${YW}${1}...${CL}"; }
+function msg_ok() { echo -e "${CM} ${GN}${1}${CL}"; }
+function msg_error() { echo -e "${CROSS} ${RD}${1}${CL}"; }
+function msg_warn() { echo -e "${WARN} ${YWB}${1}"; }
+
+# Check for root privileges
+if [ "$(id -u)" -ne 0 ]; then
+    msg_error "Error: This script must be run as root."
+    exit 1
+fi
+
+if ! command -v ethtool >/dev/null 2>&1; then
+    msg_info "Installing ethtool"
+    apt-get update &>/dev/null
+    apt-get install -y ethtool &>/dev/null || { msg_error "Failed to install ethtool. Exiting."; exit 1; }
+    msg_ok "ethtool installed successfully"
+fi
+
+# Get list of network interfaces using Intel e1000e driver
+INTERFACES=()
+COUNT=0
+
+msg_info "Searching for Intel e1000e interfaces"
+
+for device in /sys/class/net/*; do
+    interface="$(basename "$device")"  # or adjust the rest of the usages below, as mostly you'll use the path anyway
+    # Skip loopback interface and virtual interfaces
+    if [[ "$interface" != "lo" ]] && [[ ! "$interface" =~ ^(tap|fwbr|veth|vmbr|bonding_masters) ]]; then
+        # Check if the interface uses the e1000e driver
+        driver=$(basename $(readlink -f /sys/class/net/$interface/device/driver 2>/dev/null) 2>/dev/null)
+
+        if [[ "$driver" == "e1000e" ]]; then
+            # Get MAC address for additional identification
+            mac=$(cat /sys/class/net/$interface/address 2>/dev/null)
+            INTERFACES+=("$interface" "Intel e1000e NIC ($mac)")
+            ((COUNT++))
+        fi
+    fi
+done
+
+# Check if any Intel e1000e interfaces were found
+if [ ${#INTERFACES[@]} -eq 0 ]; then
+    whiptail --title "Error" --msgbox "No Intel e1000e network interfaces found!" 10 60
+    msg_error "No Intel e1000e network interfaces found! Exiting."
+    exit 1
+fi
+
+msg_ok "Found ${BL}$COUNT${GN} Intel e1000e interfaces"
+
+# Create a checklist for interface selection with all interfaces initially checked
+INTERFACES_CHECKLIST=()
+for ((i=0; i<${#INTERFACES[@]}; i+=2)); do
+    INTERFACES_CHECKLIST+=("${INTERFACES[i]}" "${INTERFACES[i+1]}" "ON")
+done
+
+# Show interface selection checklist
+SELECTED_INTERFACES=$(whiptail --backtitle "Intel e1000e NIC Offloading Disabler" --title "Network Interfaces" \
+                    --separate-output --checklist "Select Intel e1000e network interfaces\n(Space to toggle, Enter to confirm):" 15 80 6 \
+                    "${INTERFACES_CHECKLIST[@]}" 3>&1 1>&2 2>&3)
+
+exitstatus=$?
+if [ $exitstatus != 0 ]; then
+    msg_info "User canceled. Exiting."
+    exit 0
+fi
+
+# Check if any interfaces were selected
+if [ -z "$SELECTED_INTERFACES" ]; then
+    msg_error "No interfaces selected. Exiting."
+    exit 0
+fi
+
+# Convert the selected interfaces into an array
+readarray -t INTERFACE_ARRAY <<< "$SELECTED_INTERFACES"
+
+# Show the number of selected interfaces
+INTERFACE_COUNT=${#INTERFACE_ARRAY[@]}
+
+# Print selected interfaces
+for iface in "${INTERFACE_ARRAY[@]}"; do
+    msg_ok "Selected interface: ${BL}$iface${CL}"
+done
+
+# Ask for confirmation with the list of selected interfaces
+CONFIRMATION_MSG="You have selected the following interface(s):\n\n"
+for iface in "${INTERFACE_ARRAY[@]}"; do
+    SPEED=$(cat /sys/class/net/$iface/speed 2>/dev/null)
+    MAC=$(cat /sys/class/net/$iface/address 2>/dev/null)
+    CONFIRMATION_MSG+="- $iface (MAC: $MAC, Speed: ${SPEED}Mbps)\n"
+done
+CONFIRMATION_MSG+="\nThis will create systemd service(s) to disable offloading features.\n\nProceed?"
+
+if ! whiptail --backtitle "Intel e1000e NIC Offloading Disabler" --title "Confirmation" \
+    --yesno "$CONFIRMATION_MSG" 20 80; then
+    msg_info "User canceled. Exiting."
+    exit 0
+fi
+
+# Loop through all selected interfaces and create services for each
+for SELECTED_INTERFACE in "${INTERFACE_ARRAY[@]}"; do
+    # Create service name for this interface
+    SERVICE_NAME="disable-nic-offload-$SELECTED_INTERFACE.service"
+    SERVICE_PATH="/etc/systemd/system/$SERVICE_NAME"
+
+    # Create the service file with e1000e specific optimizations
+    msg_info "Creating systemd service for interface: ${BL}$SELECTED_INTERFACE${YW}"
+
+    # Start with the common part of the service file
+    cat > "$SERVICE_PATH" << EOF
+[Unit]
+Description=Disable NIC offloading for Intel e1000e interface $SELECTED_INTERFACE
+After=network.target
+
+[Service]
+Type=oneshot
+# Disable all offloading features for Intel e1000e
+ExecStart=/sbin/ethtool -K $SELECTED_INTERFACE gso off gro off tso off tx off rx off rxvlan off txvlan off sg off
+RemainAfterExit=true
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+    # Check if service file was created successfully
+    if [ ! -f "$SERVICE_PATH" ]; then
+        whiptail --title "Error" --msgbox "Failed to create service file for $SELECTED_INTERFACE!" 10 50
+        msg_error "Failed to create service file for $SELECTED_INTERFACE! Skipping to next interface."
+        continue
+    fi
+
+    # Configure this service
+    {
+        echo "25"; sleep 0.2
+        # Reload systemd to recognize the new service
+        systemctl daemon-reload
+        echo "50"; sleep 0.2
+        # Start the service
+        systemctl start "$SERVICE_NAME"
+        echo "75"; sleep 0.2
+        # Enable the service to start on boot
+        systemctl enable "$SERVICE_NAME"
+        echo "100"; sleep 0.2
+    } | whiptail --backtitle "Intel e1000e NIC Offloading Disabler" --gauge "Configuring service for $SELECTED_INTERFACE..." 10 80 0
+
+    # Individual service status
+    if systemctl is-active --quiet "$SERVICE_NAME"; then
+        SERVICE_STATUS="Active"
+    else
+        SERVICE_STATUS="Inactive"
+    fi
+
+    if systemctl is-enabled --quiet "$SERVICE_NAME"; then
+        BOOT_STATUS="Enabled"
+    else
+        BOOT_STATUS="Disabled"
+    fi
+
+    # Show individual service results
+    msg_ok "Service for ${BL}$SELECTED_INTERFACE${GN} created and enabled!"
+    msg_info "${TAB}Service: ${BL}$SERVICE_NAME${YW}"
+    msg_info "${TAB}Status: ${BL}$SERVICE_STATUS${YW}"
+    msg_info "${TAB}Start on boot: ${BL}$BOOT_STATUS${YW}"
+done
+
+# Prepare summary of all interfaces
+SUMMARY_MSG="Services created successfully!\n\n"
+SUMMARY_MSG+="Configured Interfaces:\n"
+
+for iface in "${INTERFACE_ARRAY[@]}"; do
+    SERVICE_NAME="disable-nic-offload-$iface.service"
+    if systemctl is-active --quiet "$SERVICE_NAME"; then
+        SVC_STATUS="Active"
+    else
+        SVC_STATUS="Inactive"
+    fi
+
+    if systemctl is-enabled --quiet "$SERVICE_NAME"; then
+        BOOT_SVC_STATUS="Enabled"
+    else
+        BOOT_SVC_STATUS="Disabled"
+    fi
+
+    SUMMARY_MSG+="- $iface: $SVC_STATUS, Boot: $BOOT_SVC_STATUS\n"
+done
+
+# Show summary results
+whiptail --backtitle "Intel e1000e NIC Offloading Disabler" --title "Success" --msgbox "$SUMMARY_MSG" 20 80
+
+msg_ok "Intel e1000e optimization complete for ${#INTERFACE_ARRAY[@]} interface(s)!"
+
+exit 0

vm/debian-vm.sh

@@ -57,6 +57,7 @@ MACADDRESS="${TAB}🔗${TAB}${CL}"
 VLANTAG="${TAB}🏷️${TAB}${CL}"
 CREATING="${TAB}🚀${TAB}${CL}"
 ADVANCED="${TAB}🧩${TAB}${CL}"
+CLOUD="${TAB}☁️${TAB}${CL}"
 
 THIN="discard=on,ssd=1,"
 set -e
@@ -191,6 +192,7 @@ function default_settings() {
   VLAN=""
   MTU=""
   START_VM="yes"
+  CLOUD_INIT="no"
   METHOD="default"
   echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}${VMID}${CL}"
   echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}i440fx${CL}"
@@ -204,6 +206,7 @@ function default_settings() {
   echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}${MAC}${CL}"
   echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}Default${CL}"
   echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}Default${CL}"
+  echo -e "${CLOUD}${BOLD}${DGN}Configure Cloud-init: ${BGN}no${CL}"
   echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}"
   echo -e "${CREATING}${BOLD}${DGN}Creating a Debian 12 VM using the above default settings${CL}"
 }
@@ -373,6 +376,14 @@ function advanced_settings() {
     exit-script
   fi
 
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "CLOUD-INIT" --yesno "Configure the VM with Cloud-init?" --defaultno 10 58); then
+    echo -e "${CLOUD}${BOLD}${DGN}Configure Cloud-init: ${BGN}yes${CL}"
+    CLOUD_INIT="yes"
+  else
+    echo -e "${CLOUD}${BOLD}${DGN}Configure Cloud-init: ${BGN}no${CL}"
+    CLOUD_INIT="no"
+  fi
+
   if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then
     echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}"
     START_VM="yes"
@@ -439,7 +450,11 @@ fi
 msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
 msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."
 msg_info "Retrieving the URL for the Debian 12 Qcow2 Disk Image"
-URL=https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-nocloud-amd64.qcow2
+if [ "$CLOUD_INIT" == "yes" ]; then
+  URL=https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-genericcloud-amd64.qcow2
+else
+  URL=https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-nocloud-amd64.qcow2
+fi
 sleep 2
 msg_ok "${CL}${BL}${URL}${CL}"
 curl -f#SL -o "$(basename "$URL")" "$URL"
@@ -474,11 +489,20 @@ qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE}
   -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
 qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
-qm set $VMID \
+if [ "$CLOUD_INIT" == "yes" ]; then
-  -efidisk0 ${DISK0_REF}${FORMAT} \
+  qm set $VMID \
-  -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=${DISK_SIZE} \
+    -efidisk0 ${DISK0_REF}${FORMAT} \
-  -boot order=scsi0 \
+    -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=${DISK_SIZE} \
-  -serial0 socket >/dev/null
+    -scsi1 ${STORAGE}:cloudinit \
+    -boot order=scsi0 \
+    -serial0 socket >/dev/null
+else
+  qm set $VMID \
+    -efidisk0 ${DISK0_REF}${FORMAT} \
+    -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=${DISK_SIZE} \
+    -boot order=scsi0 \
+    -serial0 socket >/dev/null
+fi
 DESCRIPTION=$(
   cat <<EOF
 <div align='center'>