ziver/webadmin
1
0
Fork 0
Code Pull requests Releases Activity

Zutil changes

Browse source
This commit is contained in:
Ziver Koc 2016-07-14 17:50:55 +02:00
parent 8532b681ca
commit bb546ce046
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/wa/server/plugin/apache/ApacheConfigVirtualHost.java
View file

@ -5,7 +5,6 @@ import wa.server.WAContext;
import wa.server.plugin.WAConfigEntry; import wa.server.plugin.WAConfigEntry;
import wa.server.plugin.WAServiceConfig; import wa.server.plugin.WAServiceConfig;
import wa.server.util.ConfigFileUtil; import wa.server.util.ConfigFileUtil;
import zutil.db.DBConnection;
import zutil.db.bean.DBBean; import zutil.db.bean.DBBean;
import zutil.db.bean.DBBean.DBTable; import zutil.db.bean.DBBean.DBTable;
import zutil.io.IOUtil; import zutil.io.IOUtil;
@ -48,12 +47,12 @@ public class ApacheConfigVirtualHost implements WAServiceConfig{
@Override @Override
public void configure() throws Exception { public void configure() throws Exception {
// Update main configuration file // Update main configuration file
FileInputStream in = new FileInputStream(STATIC_PRE_CONF);
ConfigFileUtil.writeBetweenBoundary( ConfigFileUtil.writeBetweenBoundary(
WAConstants.getConfigFile(APACHE_MAIN_CONFIG_FILE), WAConstants.getConfigFile(APACHE_MAIN_CONFIG_FILE),
"#", "#",
IOUtil.getContentAsString( IOUtil.readContentAsString(in));
new FileInputStream(STATIC_PRE_CONF))); in.close();
// Write Vhost configuration // Write Vhost configuration
for(ApacheVirtualHostEntry vhost : vhosts){ for(ApacheVirtualHostEntry vhost : vhosts){
vhost.configure(); vhost.configure();