dedent site body lines when parsing Caddyfile

This commit is contained in:
Daniel committed 2026-04-06 23:15:33 +02:00
1 parent 61dd1c7a41
commit 79eaa7e28b
1 file changed
+13
+13
View File
@@ -38,6 +38,19 @@ function parseCaddyfile(string $content): array {
if ($depth > 0) $block[] = $lines[$i]; if ($depth > 0) $block[] = $lines[$i];
$i++; $i++;
} }
// Strip common leading indent from body lines
$nonempty = array_filter($block, fn($l) => trim($l) !== '');
if ($nonempty) {
preg_match('/^(\s*)/', reset($nonempty), $ind);
$prefix = $ind[1];
foreach ($nonempty as $l) {
preg_match('/^(\s*)/', $l, $m2);
$len = min(strlen($prefix), strlen($m2[1]));
while ($len > 0 && substr($prefix, 0, $len) !== substr($m2[1], 0, $len)) $len--;
$prefix = substr($prefix, 0, $len);
}
if ($prefix !== '') $block = array_map(fn($l) => substr($l, strlen($prefix)), $block);
}
$result['sites'][] = ['address' => $address, 'body' => implode("\n", $block)]; $result['sites'][] = ['address' => $address, 'body' => implode("\n", $block)];
continue; continue;
} }