Merge pull request #20 from zentonic/patch-1

Update proxmox-zfs-postinstall.sh

README.md

@@ -12,6 +12,7 @@ Following settings are made:
 - Configure `vm.swappiness` interactively
 - Install checkmk Agent with optional encryption and registration
 - Added Support for Proxmox VE 7.0
+- Added Proxmox SDN features
 
 # Usage
 
@@ -20,3 +21,7 @@ Just download and execute the script, all settings are made interactively.
 wget https://github.com/bashclub/proxmox-zfs-postinstall/raw/main/proxmox-zfs-postinstall.sh
 bash ./proxmox-zfs-postinstall.sh
 ```
+
+# Author
+### Thorsten Spille
+[<img src="https://storage.ko-fi.com/cdn/brandasset/kofi_s_tag_dark.png" rel="Support me on Ko-Fi">](https://ko-fi.com/thorakel)

install-cockpit-zfs-manager

@@ -0,0 +1,61 @@
+#!/bin/bash
+source /etc/os-release
+echo "deb http://deb.debian.org/debian $VERSION_CODENAME-backports main" > /etc/apt/sources.list.d/$VERSION_CODENAME-backports.list
+apt update
+cat << EOF > /etc/apt/preferences.d/90_cockpit
+Package: cockpit cockpit-*
+Pin: release n=$VERSION_CODENAME-backports
+Pin-Priority: 990
+EOF
+apt install --yes --no-install-recommends cockpit
+git clone https://github.com/optimans/cockpit-zfs-manager.git && cp -r cockpit-zfs-manager/zfs /usr/share/cockpit
+mkdir -p /etc/cockpit/zfs
+mkdir -p /etc/cockpit/zfs/shares
+mkdir -p /etc/cockpit/zfs/snapshots
+cat << EOF > /etc/cockpit/zfs/config.json 
+{
+  "#1": "COCKPIT ZFS MANAGER",
+  "#2": "WARNING: DO NOT EDIT, AUTO-GENERATED CONFIGURATION",
+  "cockpit": {
+    "manage": true
+  },
+  "disks": {
+    "base2": false
+  },
+  "loglevel": "2",
+  "samba": {
+    "manage": false,
+    "windowscompatibility": true
+  },
+  "updates": {
+    "check": true
+  },
+  "zfs": {
+    "filesystem": {
+      "cloneorigin": false,
+      "quotarestrict": true,
+      "readonlylockdown": false,
+      "snapshotactions": true
+    },
+    "snapshot": {
+      "filesystemlist": true
+    },
+    "status": {
+      "errorcolors": true,
+      "trimunsupported": false
+    },
+    "storagepool": {
+      "activetab": 1,
+      "boot": true,
+      "bootlockdown": true,
+      "count": true,
+      "refreshall": false,
+      "root": true
+    }
+  }
+}
+EOF
+cat << EOF > /etc/cockpit/zfs/shares.conf 
+# COCKPIT ZFS MANAGER
+# WARNING: DO NOT EDIT, AUTO-GENERATED CONFIGURATION
+EOF

install-docker-portainer

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# create zfs filesystems
+zfs create -o com.sun:auto-snapshot=false -o mountpoint=/var/lib/docker rpool/docker
+zfs create -o com.sun:auto-snapshot=true -o mountpoint=/portainer rpool/portainer
+
+# add docker repository
+curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+# update package lists and install docker engine + docker-compose
+apt update
+DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq --no-install-recommends docker-ce docker-ce-cli containerd.io
+
+dc_version=$(wget -O - -q https://api.github.com/repos/docker/compose/releases/latest | grep -m1 "\"name\":" | cut -d'"' -f4)
+wget -O /usr/local/bin/docker-compose https://github.com/docker/compose/releases/download/${dc_version}/docker-compose-linux-x86_64
+chmod +x /usr/local/bin/docker-compose
+
+# install portainer
+cd /portainer
+mkdir data
+cat << EOF > /portainer/docker-compose.yml
+version: '3.2'
+
+services:
+
+  portainer:
+    image: portainer/portainer-ce
+    ports:
+      - "9443:9443"
+      - "8000:8000"
+    volumes:
+      - /portainer/data:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    restart: always
+EOF
+# start portainer
+docker-compose up -d

proxmox-zfs-postinstall.sh

@@ -3,7 +3,7 @@
 ###### CONFIG SECTION ######
 
 # Define basic tools to install
-TOOLS="sudo vim ifupdown2 net-tools dnsutils ethtool git curl unzip screen iftop lshw smartmontools nvme-cli lsscsi sysstat zfs-auto-snapshot htop mc rpl lsb-release"
+TOOLS="sudo vim ifupdown2 libpve-network-perl net-tools dnsutils ethtool git curl unzip screen tmux iftop lshw smartmontools nvme-cli lsscsi sysstat zfs-auto-snapshot htop mc rpl lsb-release"
 
 #### PVE CONF BACKUP CONFIGURATION ####
 
@@ -11,7 +11,7 @@ TOOLS="sudo vim ifupdown2 net-tools dnsutils ethtool git curl unzip screen iftop
 # IMPORTANT NOTE: Don't type in the leading /, this will be set where needed
 PVE_CONF_BACKUP_TARGET=rpool/pveconf
 
-# Define timer for your backup cronjob (default: every 15 minutes fron 3 through 59)
+# Define timer for your backup cronjob (default: every 15 minutes from 3 through 59)
 PVE_CONF_BACKUP_CRON_TIMER="3,18,33,48 * * * *"
 
 # Get Debian version info
@@ -99,7 +99,7 @@ fi
 echo -e "######## CONFIGURE SWAPPINESS ########\n"
 SWAPPINESS=$(cat /proc/sys/vm/swappiness)
 echo "The current swappiness is configured to '$SWAPPINESS %' of free memory until using swap."
-read -p "If you want to change the swappiness, please type in the percentage as number (0 = diasbled):" user_input
+read -p "If you want to change the swappiness, please type in the percentage as number (0 = disabled):" user_input
 if echo "$user_input" | grep -qE '^[0-9]+$'; then
     echo "Changing swappiness from '$SWAPPINESS %' to '$user_input %'"
     SWAPPINESS=$user_input
@@ -137,7 +137,7 @@ for interval in "${!auto_snap_keep[@]}"; do
 done
 
 #### CHECKMK AGENT CONFIGURATION ####
-read -p "Do you want to install checkmk agent of this machine? [y/N] " install_checkmk
+read -p "Do you want to install checkmk agent on this machine? [y/N] " install_checkmk
 if [[ "$install_checkmk" == "y" ]]; then
     read -p "Please specify the base url to your checkmk server (e.g. https://check.zmb.rocks/bashclub): " cmk_agent_url
     read -p "Enable agent encryption (requires setup of Agent Encryption on your checkmk instance). Do you want to activate agent encryption? [y/N] " cmk_encrypt
@@ -165,15 +165,32 @@ fi
 ###### INSTALLER SECTION ######
 
 # disable pve-enterprise repo and add pve-no-subscription repo
-if [[ "$(uname -r)" == *"-pve" ]]; then
+
+#Not tested, yet!
+read -p "Do you want to disable pve-enterprise repo and add pve-no-subscription repo (y/N)? " response
+
+if [ "${response,,}" == "y" ]; then
+    if [[ "$(uname -r)" == *"-pve" ]]; then
         echo "Deactivating pve-enterprise repository"
         mv /etc/apt/sources.list.d/pve-enterprise.list /etc/apt/sources.list.d/pve-enterprise.list.bak > /dev/null 2>&1
         echo "Activating pve-no-subscription repository"
-    echo "deb http://download.proxmox.com/debian/pve $VERSION_CODENAME pve-no-subscription" > /etc/apt/sources.list.d/pve-no-subscription.list
+        q=$(cat /etc/apt/sources.list | grep "pve-no-subscription")
+        if [ $? -gt 0 ]; then
+            echo "deb http://download.proxmox.com/debian/pve $VERSION_CODENAME pve-no-subscription" >> /etc/apt/sources.list
+        fi
+        rm -f /etc/apt/sources.list.d/pve-no-subscription.list
+    fi
 fi
+
 echo "Getting latest package lists"
 apt update > /dev/null 2>&1
 
+# include interfaces.d to enable SDN features
+q=$(cat /etc/network/interfaces | grep "source /etc/network/interfaces.d/*")
+if [ $? -gt 0 ]; then
+    echo "source /etc/network/interfaces.d/*" >> /etc/network/interfaces
+fi
+
 # update system and install basic tools
 echo "Upgrading system to latest version - Depending on your version this could take a while..."
 DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt -y -qq dist-upgrade > /dev/null 2>&1
@@ -206,7 +223,10 @@ zfs list $PVE_CONF_BACKUP_TARGET > /dev/null 2>&1
 if [ $? -ne 0 ]; then
     zfs create $PVE_CONF_BACKUP_TARGET
 fi
-echo "$PVE_CONF_BACKUP_CRON_TIMER root rsync -va --delete /etc /$PVE_CONF_BACKUP_TARGET > /$PVE_CONF_BACKUP_TARGET/pve-conf-backup.log" > /etc/cron.d/pve-conf-backup
+
+if [[ "$(df -h -t zfs | grep /$ | cut -d ' ' -f1)" == "rpool/ROOT/pve-1" ]] ; then
+  echo "$PVE_CONF_BACKUP_CRON_TIMER root rsync -va --delete /etc /$PVE_CONF_BACKUP_TARGET > /$PVE_CONF_BACKUP_TARGET/pve-conf-backup.log" > /etc/cron.d/pve-conf-backup
+fi
 
 ZFS_ARC_MIN_BYTES=$((ZFS_ARC_MIN_MEGABYTES * 1024 *1024))
 ZFS_ARC_MAX_BYTES=$((ZFS_ARC_MAX_MEGABYTES * 1024 *1024))
@@ -216,8 +236,8 @@ echo $ZFS_ARC_MIN_BYTES > /sys/module/zfs/parameters/zfs_arc_min
 echo $ZFS_ARC_MAX_BYTES > /sys/module/zfs/parameters/zfs_arc_max
 
 cat << EOF > /etc/modprobe.d/zfs.conf
-options zfs zfs_arc_min=$ZFS_ARC_MIN_BYTES
 options zfs zfs_arc_max=$ZFS_ARC_MAX_BYTES
+options zfs zfs_arc_min=$ZFS_ARC_MIN_BYTES
 EOF
 
 if [[ "$install_checkmk" == "y" ]]; then