From f0c9d5e7e9d8d511ddd0835e4cff60b9db43e284 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Thu, 30 Apr 2015 20:38:48 +0300
Subject: rz-mux-tool: generate cron bkp scripts

---
 src/local/rz-mux/rz-mux-tool.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/local/rz-mux/rz-mux-tool.sh')

diff --git a/src/local/rz-mux/rz-mux-tool.sh b/src/local/rz-mux/rz-mux-tool.sh
index 21a20a41..e961d28b 100644
--- a/src/local/rz-mux/rz-mux-tool.sh
+++ b/src/local/rz-mux/rz-mux-tool.sh
@@ -55,7 +55,11 @@ set_path_vars() {
     neo4j_module__confdir=/etc/neo4j/mux-conf.d/${RZI_NAME}
     neo4j_module__rootdir=/var/lib/neo4j/mux-root.d/${RZI_NAME}
 
+<<<<<<< HEAD
     rz_module__confdir=/etc/rhizi/mux-conf.d/${RZI_NAME}
+=======
+    rz_module__conf=/etc/rhizi/mux-conf.d/${RZI_NAME}
+>>>>>>> 1688d01... rz-mux-tool: generate cron bkp scripts
     rz_module__bkp=/var/lib/rhizi/mux-bkp.d/${RZI_NAME}
 
     apache_module__siteconf_filename=${RZI_NAME}.conf
-- 
cgit v1.3.1