From 1f50209744f36c1602b11a3787dacfd3ea76527e Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 20 Jul 2015 04:23:33 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 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 f521cab..dbff7ed 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -18,7 +18,7 @@
 backup_dir=/var/backup
 backup_dir_is_mount=y
 backup_mode=rootgz
-backup_delete=y
+backup_delete=n
 monit_url=
 monit_user=
 monit_password=

--
Gitblit v1.9.1