Fixed: Doouble Entry for isp vhost by isp3 update

tbrehm · tbrehm · commit 0c78af296047 · 2008-11-18T12:13:40.000Z
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -624,8 +624,9 @@ public function install_ispconfig()
 		//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
 		//* and create the symlink
 		if($this->install_ispconfig_interface == true) {
-			if(!@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {
-				exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");
+			if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");
+			if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
+				exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
 			}
 		}
 		
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -642,8 +642,9 @@ public function install_ispconfig()
 		//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
 		//* and create the symlink
 		if($this->install_ispconfig_interface == true) {
-			if(!@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {
-				exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");
+			if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");
+			if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
+				exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
 			}
 		}
 		
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -837,7 +837,7 @@ public function install_ispconfig()
 		//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
 		//* and create the symlink
 		if($this->install_ispconfig_interface == true) {
-			if(!@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");
+			if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");
 			if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
 				exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
 			}

Original file line number	Diff line number	Diff line change
`@@ -624,8 +624,9 @@ public function install_ispconfig()`
`624`	`624`	`//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");`
`625`	`625`	`//* and create the symlink`
`626`	`626`	`if($this->install_ispconfig_interface == true) {`
`627`		`- if(!@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {`
`628`		`- exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");`
	`627`	`+ if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");`
	`628`	`+ if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {`
	`629`	`+ exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");`
`629`	`630`	`}`
`630`	`631`	`}`
`631`	`632`
Original file line number	Diff line number	Diff line change
`@@ -642,8 +642,9 @@ public function install_ispconfig()`
`642`	`642`	`//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");`
`643`	`643`	`//* and create the symlink`
`644`	`644`	`if($this->install_ispconfig_interface == true) {`
`645`		`- if(!@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {`
`646`		`- exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");`
	`645`	`+ if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");`
	`646`	`+ if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {`
	`647`	`+ exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");`
`647`	`648`	`}`
`648`	`649`	`}`
`649`	`650`
Original file line number	Diff line number	Diff line change
`@@ -837,7 +837,7 @@ public function install_ispconfig()`
`837`	`837`	`//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");`
`838`	`838`	`//* and create the symlink`
`839`	`839`	`if($this->install_ispconfig_interface == true) {`
`840`		`- if(!@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");`
	`840`	`+ if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");`
`841`	`841`	`if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {`
`842`	`842`	`exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");`
`843`	`843`	`}`