added ispconfig.conf apache include for fedora and opensuse.

tbrehm · tbrehm · commit 9de0c46baee7 · 2009-03-04T14:02:29.000Z
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -422,6 +422,15 @@ public function configure_apache()
 		}
 		unset($content);
 		
+		//* Copy the ISPConfig configuration include
+        $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
+        $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
+        
+		copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
+		if(!@is_link($vhost_conf_enabled_dir."/000-ispconfig.conf")) {
+			exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/000-ispconfig.conf");
+		}
+		
 	}
 	
 	public function configure_firewall()
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -430,6 +430,15 @@ public function configure_apache()
 		}
 		unset($content);
 		
+		//* Copy the ISPConfig configuration include
+        $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
+        $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
+        
+		copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
+		if(!@is_link($vhost_conf_enabled_dir."/000-ispconfig.conf")) {
+			exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/000-ispconfig.conf");
+		}
+		
 	}
 	
 	public function configure_firewall()

Original file line number	Diff line number	Diff line change
`@@ -422,6 +422,15 @@ public function configure_apache()`
`422`	`422`	`}`
`423`	`423`	`unset($content);`
`424`	`424`
	`425`	`+ //* Copy the ISPConfig configuration include`
	`426`	`+ $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];`
	`427`	`+ $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];`
	`428`	`+`
	`429`	`+ copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');`
	`430`	`+ if(!@is_link($vhost_conf_enabled_dir."/000-ispconfig.conf")) {`
	`431`	`+ exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/000-ispconfig.conf");`
	`432`	`+ }`
	`433`	`+`
`425`	`434`	`}`
`426`	`435`
`427`	`436`	`public function configure_firewall()`
Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,15 @@ public function configure_apache()`
`430`	`430`	`}`
`431`	`431`	`unset($content);`
`432`	`432`
	`433`	`+ //* Copy the ISPConfig configuration include`
	`434`	`+ $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];`
	`435`	`+ $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];`
	`436`	`+`
	`437`	`+ copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');`
	`438`	`+ if(!@is_link($vhost_conf_enabled_dir."/000-ispconfig.conf")) {`
	`439`	`+ exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/000-ispconfig.conf");`
	`440`	`+ }`
	`441`	`+`
`433`	`442`	`}`
`434`	`443`
`435`	`444`	`public function configure_firewall()`