diff --git a/conf/zamba.conf.example b/conf/zamba.conf.example index 5274fa8..f0f8bd2 100644 --- a/conf/zamba.conf.example +++ b/conf/zamba.conf.example @@ -25,7 +25,8 @@ LXC_SHAREFS_SIZE="100" # Defines the Proxmox storage where your LXC container's filesystem shared by Zamba will be generated (default: local-zfs) LXC_SHAREFS_STORAGE="local-zfs" # Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) -LXC_SHAREFS_MOUNTPOINT="tank" +# Moved to constants-service.conf, be careful if you override this value +# LXC_SHAREFS_MOUNTPOINT="tank" # cpu core count (default: 0 = unlimited) LXC_THREADS=0 diff --git a/install.sh b/install.sh index 92eca48..560af26 100755 --- a/install.sh +++ b/install.sh @@ -155,11 +155,16 @@ if [ $LXC_DHCP == true ]; then else pct set $LXC_NBR -net0 "name=eth0,bridge=$LXC_BRIDGE,firewall=1,gw=$LXC_GW,ip=$LXC_IP,type=veth$VLAN" -nameserver $LXC_DNS -searchdomain $LXC_DOMAIN fi + sleep 2 if [ $LXC_MP -gt 0 ]; then pct set $LXC_NBR -mp0 $LXC_SHAREFS_STORAGE:$LXC_SHAREFS_SIZE,backup=1,mp=/$LXC_SHAREFS_MOUNTPOINT + pool=$(grep -A 4 $LXC_SHAREFS_MOUNTPOINT /etc/pve/storage.cfg | grep "pool " | cut -d ' ' -f2) + dataset=$(grep mp0 /etc/pve/lxc/$LXC_NBR.conf | cut -d ':' -f3 | cut -d',' -f1) + zfs set recordsize=$LXC_MP_RECORDSIZE $pool/$dataset fi + sleep 2; PS3="Select the Server-Function: " diff --git a/src/ansible-semaphore/constants-service.conf b/src/ansible-semaphore/constants-service.conf index 89fe5aa..9204cd7 100644 --- a/src/ansible-semaphore/constants-service.conf +++ b/src/ansible-semaphore/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/authentik/constants-service.conf b/src/authentik/constants-service.conf index ca2f81b..af4c4ca 100644 --- a/src/authentik/constants-service.conf +++ b/src/authentik/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="var/lib/docker" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/bookstack/constants-service.conf b/src/bookstack/constants-service.conf index 5fbe65d..c4548eb 100644 --- a/src/bookstack/constants-service.conf +++ b/src/bookstack/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/checkmk/constants-service.conf b/src/checkmk/constants-service.conf index f4b4382..c6b6627 100644 --- a/src/checkmk/constants-service.conf +++ b/src/checkmk/constants-service.conf @@ -10,8 +10,13 @@ # Debian Version, which will be installed LXC_TEMPLATE_VERSION="debian-12-standard" + # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="omd" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/debian-priv/constants-service.conf b/src/debian-priv/constants-service.conf index 7d06bc8..48ffd59 100644 --- a/src/debian-priv/constants-service.conf +++ b/src/debian-priv/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="0" diff --git a/src/debian-unpriv/constants-service.conf b/src/debian-unpriv/constants-service.conf index ae9bfcc..a7e36f5 100644 --- a/src/debian-unpriv/constants-service.conf +++ b/src/debian-unpriv/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/docker/constants-service.conf b/src/docker/constants-service.conf index 32cc867..01b28ca 100644 --- a/src/docker/constants-service.conf +++ b/src/docker/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="var/lib/docker" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/ecodms/constants-service.conf b/src/ecodms/constants-service.conf index 86a2eda..c7744af 100644 --- a/src/ecodms/constants-service.conf +++ b/src/ecodms/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/gitea/constants-service.conf b/src/gitea/constants-service.conf index fa61d04..43c49cd 100644 --- a/src/gitea/constants-service.conf +++ b/src/gitea/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/kimai/constants-service.conf b/src/kimai/constants-service.conf index 8fc122c..a940f2e 100644 --- a/src/kimai/constants-service.conf +++ b/src/kimai/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/kopano-core/constants-service.conf b/src/kopano-core/constants-service.conf index b34a62d..0dae961 100644 --- a/src/kopano-core/constants-service.conf +++ b/src/kopano-core/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-11-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/mailcow/constants-service.conf b/src/mailcow/constants-service.conf index 520118f..2a4ef89 100644 --- a/src/mailcow/constants-service.conf +++ b/src/mailcow/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="var/lib/docker" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/matrix/constants-service.conf b/src/matrix/constants-service.conf index 793aee5..57f799e 100644 --- a/src/matrix/constants-service.conf +++ b/src/matrix/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/nextcloud/constants-service.conf b/src/nextcloud/constants-service.conf index bd39390..684f4c1 100644 --- a/src/nextcloud/constants-service.conf +++ b/src/nextcloud/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/omada/constants-service.conf b/src/omada/constants-service.conf index 048e0ad..83aedc6 100644 --- a/src/omada/constants-service.conf +++ b/src/omada/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-11-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/onlyoffice/constants-service.conf b/src/onlyoffice/constants-service.conf index 81018da..e5ffe58 100644 --- a/src/onlyoffice/constants-service.conf +++ b/src/onlyoffice/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/open3a/constants-service.conf b/src/open3a/constants-service.conf index 5fbe65d..c4548eb 100644 --- a/src/open3a/constants-service.conf +++ b/src/open3a/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/piler/constants-service.conf b/src/piler/constants-service.conf index 9aa8aff..873a465 100644 --- a/src/piler/constants-service.conf +++ b/src/piler/constants-service.conf @@ -9,7 +9,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="var/piler" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/proxmox-pbs/constants-service.conf b/src/proxmox-pbs/constants-service.conf index 13579f1..92b94cb 100644 --- a/src/proxmox-pbs/constants-service.conf +++ b/src/proxmox-pbs/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="128K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/rei3/constants-service.conf b/src/rei3/constants-service.conf index 5a22a77..ac00ebb 100644 --- a/src/rei3/constants-service.conf +++ b/src/rei3/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/unifi/constants-service.conf b/src/unifi/constants-service.conf index babc82b..d9ef60e 100644 --- a/src/unifi/constants-service.conf +++ b/src/unifi/constants-service.conf @@ -13,7 +13,11 @@ LXC_TEMPLATE_VERSION="debian-11-standard" # libssl1.1 is unsupported on debian bookworm # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/urbackup/constants-service.conf b/src/urbackup/constants-service.conf index b24adc9..9222b47 100644 --- a/src/urbackup/constants-service.conf +++ b/src/urbackup/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="128K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/vaultwarden/constants-service.conf b/src/vaultwarden/constants-service.conf index b14393b..d9325a7 100644 --- a/src/vaultwarden/constants-service.conf +++ b/src/vaultwarden/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/zabbix/constants-service.conf b/src/zabbix/constants-service.conf index f15397e..8271c81 100644 --- a/src/zabbix/constants-service.conf +++ b/src/zabbix/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/zammad/constants-service.conf b/src/zammad/constants-service.conf index 92cc445..014cafd 100644 --- a/src/zammad/constants-service.conf +++ b/src/zammad/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="0" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="1" diff --git a/src/zmb-ad-join/constants-service.conf b/src/zmb-ad-join/constants-service.conf index 32ece93..1042bbc 100644 --- a/src/zmb-ad-join/constants-service.conf +++ b/src/zmb-ad-join/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=0 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="backup" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="0" diff --git a/src/zmb-ad/constants-service.conf b/src/zmb-ad/constants-service.conf index 0939fc1..6016953 100644 --- a/src/zmb-ad/constants-service.conf +++ b/src/zmb-ad/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="backup" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="0" diff --git a/src/zmb-cups/constants-service.conf b/src/zmb-cups/constants-service.conf index 3bc3806..5bf228d 100644 --- a/src/zmb-cups/constants-service.conf +++ b/src/zmb-cups/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="16K" # Create unprivileged container LXC_UNPRIVILEGED="0" diff --git a/src/zmb-member/constants-service.conf b/src/zmb-member/constants-service.conf index 1abbb20..71c2446 100644 --- a/src/zmb-member/constants-service.conf +++ b/src/zmb-member/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="128K" # Create unprivileged container LXC_UNPRIVILEGED="0" diff --git a/src/zmb-standalone/constants-service.conf b/src/zmb-standalone/constants-service.conf index e5088ee..ffe82ed 100644 --- a/src/zmb-standalone/constants-service.conf +++ b/src/zmb-standalone/constants-service.conf @@ -11,7 +11,11 @@ LXC_TEMPLATE_VERSION="debian-12-standard" # Create sharefs mountpoint -LXC_MP="1" +LXC_MP=1 +# Defines the mountpoint of the filesystem shared by Zamba inside your LXC container (default: tank) +LXC_SHAREFS_MOUNTPOINT="tank" +# Defines the recordsize of mp0 +LXC_MP_RECORDSIZE="128K" # Create unprivileged container LXC_UNPRIVILEGED="0"