From 7972151d0448b99e0ba28c819a698757c27c1d55 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Oct 2014 13:13:09 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5'

---
 install/tpl/server.ini.master |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 315feda..c563650 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -17,7 +17,6 @@
 admin_notify_events=1
 backup_dir=/var/backup
 backup_dir_is_mount=n
-backup_dir_mount_cmd=
 backup_mode=rootgz
 backup_delete=y
 monit_url=
@@ -63,6 +62,7 @@
 website_path=/var/www/clients/client[client_id]/web[website_id]
 website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/
 website_symlinks_rel=n
+network_filesystem=n
 vhost_conf_dir=/etc/apache2/sites-available
 vhost_conf_enabled_dir=/etc/apache2/sites-enabled
 nginx_vhost_conf_dir=/etc/nginx/sites-available

--
Gitblit v1.9.1