From 522ef8b7cbb68e0105c2263647471ab5da922c79 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 22 Sep 2011 09:45:42 -0400
Subject: [PATCH] Merged language files.

---
 install/dist/conf/debian60.conf.php |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/install/dist/conf/debian60.conf.php b/install/dist/conf/debian60.conf.php
index 35e6160..7d3abda 100644
--- a/install/dist/conf/debian60.conf.php
+++ b/install/dist/conf/debian60.conf.php
@@ -206,10 +206,8 @@
 $conf['nginx']['php_fpm_start_port'] = 9010;
 $conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';
 
-//* Ufw
-$conf['ufw']['installed'] = false;
-$conf['squid']['config_dir'] = '/etc/ufw';
-$conf['squid']['init_script'] = 'ufw';
+//* OpenVZ
+$conf['openvz']['installed'] = false;
 
 //*Bastille-Firwall
 $conf['bastille']['installed'] = false;

--
Gitblit v1.9.1