--- ./modules/install_server/files/autoinstall/partman/custom/varnish.cfg	2019-12-06 14:17:56.723546140 +0100
+++ ./modules/install_server/files/autoinstall/partman/custom/cacheproxy.cfg	2020-07-21 14:46:41.984381034 +0200
@@ -1,11 +1,13 @@
-# Automatic software RAID partitioning
-#
-# * two disks, sda & sdb
-# * primary partitions, no LVM
-# * layout:
-#   /dev/sdX1 - root fs: ext4, RAID1, 10GB
-#   /dev/sdX2 - empty 0-block partition (to keep /dev/sdX3 consistent)
-#   /dev/sdX3 - 100% of remainder as ext4 for varnish disk cache
+# cacheproxy partman recipe, new hardware mid-2018
+# first hardware of this config: cp1075-cp1090
+# * /dev/sd[ab]:
+# ** small/cheap SSDs
+# ** single primary partition filling each drive
+# ** md-raid1 these into a single ext4 rootfs
+# * /dev/nvme0n1
+# ** high-performance nvme drive for cache storage
+# ** ignored in partman
+# ** manual setup in late_command.sh (LBA format, etc)
 
 d-i	partman-auto/method		string	raid
 d-i	partman-md/device_remove_md	boolean	true
@@ -22,16 +24,8 @@
 # Define physical partitions
 d-i	partman-auto/expert_recipe	string	\
 		multiraid ::	\
-			10000	10000	10000	raid		\
+			10000	10000	-1	raid		\
 				$primary{ } method{ raid }	\
-			.					\
-			0	0	0	linux-swap	\
-				$primary{ } method{ keep }	\
-			.					\
-			0	500	1000000000	ext4		\
-				$primary{ } method{ format }	\
-				format{ } use_filesystem{ }	\
-				filesystem{ ext4 }		\
 			.
 
 # Parameters are:
@@ -50,7 +44,3 @@
 d-i	partman/confirm_nooverwrite 	boolean	true
 d-i	partman-basicfilesystems/no_mount_point	boolean	false
 d-i	partman-basicfilesystems/no_swap boolean false
-
-# method{ keep } on a partition that has no known filesystem
-# produces a "No file system is specified for partition" prompt; silence it
-d-i	partman-basicmethods/method_only	boolean	false