Merge branch '5969-letsencrypt-certbot-does-not-create-webroot-map-anymore-for-new-domains' into 'develop'

Marius Burkard · Marius Burkard · commit f7a2aaa507d8 · 2020-12-18T21:08:28.000+01:00
Resolve "Letsencrypt (certbot) does not create webroot map anymore for new domains"

Closes #5969

See merge request ispconfig/ispconfig3!1360
diff --git a/server/lib/classes/letsencrypt.inc.php b/server/lib/classes/letsencrypt.inc.php
@@ -162,7 +162,7 @@ public function get_certbot_command($domains) {
 			$webroot_args = "$cmd --webroot-path /usr/local/ispconfig/interface/acme";
 		}
 
-		$cmd = $letsencrypt . " certonly -n --text --agree-tos --expand --authenticator webroot --server $acme_version --rsa-key-size 4096 --email postmaster@$domain $cmd --webroot-path /usr/local/ispconfig/interface/acme";
+		$cmd = $letsencrypt . " certonly -n --text --agree-tos --expand --authenticator webroot --server $acme_version --rsa-key-size 4096 --email postmaster@$domain $webroot_args";
 
 		return $cmd;
 	}

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function get_certbot_command($domains) {`
`162`	`162`	`$webroot_args = "$cmd --webroot-path /usr/local/ispconfig/interface/acme";`
`163`	`163`	`}`
`164`	`164`
`165`		`- $cmd = $letsencrypt . " certonly -n --text --agree-tos --expand --authenticator webroot --server $acme_version --rsa-key-size 4096 --email postmaster@$domain $cmd --webroot-path /usr/local/ispconfig/interface/acme";`
	`165`	`+ $cmd = $letsencrypt . " certonly -n --text --agree-tos --expand --authenticator webroot --server $acme_version --rsa-key-size 4096 --email postmaster@$domain $webroot_args";`
`166`	`166`
`167`	`167`	`return $cmd;`
`168`	`168`	`}`