Merge branch '6570-apache2-NameVirtualHost' into 'develop'

Till Brehm · Till Brehm · commit 93d72697d6f2 · 2023-09-08T12:06:05.000Z
apache2 adding commented NameVirtualHost lines makes no sense

Closes #6570

See merge request ispconfig/ispconfig3!1800
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -2396,8 +2396,8 @@ public function configure_apache() {
 			replaceLine('/etc/apache2/ports.conf', 'Listen 443', 'Listen 443', 1);
 
 			// Comment out the namevirtualhost lines, as they were added by ispconfig in ispconfig.conf file again
-			replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost *:80', '# NameVirtualHost *:80', 1);
-			replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost *:443', '# NameVirtualHost *:443', 1);
+			replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost *:80', '# NameVirtualHost *:80', 1, 0);
+			replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost *:443', '# NameVirtualHost *:443', 1, 0);
 		}
 
 		if(is_file('/etc/apache2/mods-available/fcgid.conf')) {

Original file line number	Diff line number	Diff line change
`@@ -2396,8 +2396,8 @@ public function configure_apache() {`
`2396`	`2396`	`replaceLine('/etc/apache2/ports.conf', 'Listen 443', 'Listen 443', 1);`
`2397`	`2397`
`2398`	`2398`	`// Comment out the namevirtualhost lines, as they were added by ispconfig in ispconfig.conf file again`
`2399`		`- replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost :80', '# NameVirtualHost :80', 1);`
`2400`		`- replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost :443', '# NameVirtualHost :443', 1);`
	`2399`	`+ replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost :80', '# NameVirtualHost :80', 1, 0);`
	`2400`	`+ replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost :443', '# NameVirtualHost :443', 1, 0);`
`2401`	`2401`	`}`
`2402`	`2402`
`2403`	`2403`	`if(is_file('/etc/apache2/mods-available/fcgid.conf')) {`