treewide: improve template expansion

also: support *.toml as extra configuration dictionaries

image-entry.d/70-merge-dirs.sh

@@ -16,6 +16,9 @@ overlaydirs --merge "${target_root}" /etc/angie.dist /etc/angie /angie "${fake_d
 ## fixup after merge
 for n in ${persist_dirs} ; do rm -f "${target_root}/$n" ; done
 rm -rf "${fake_dir}"
+if [ -d "${target_root}/mod" ] ; then
+	find "${target_root}/mod/" -follow -name '.*.preseed' -type f -exec rm -f {} +
+fi
 
 if [ "${NGX_HTTP_STATIC_MERGE}" = 0 ] ; then
 	src0=/etc/angie.dist/static