summaryrefslogtreecommitdiff
path: root/src/local/rz-mux/rz-mux-tool.sh
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-04-30 20:38:48 +0300
committerLV-426 <lv-426@taproot.org.il>2015-05-01 03:17:30 +0300
commitf0c9d5e7e9d8d511ddd0835e4cff60b9db43e284 (patch)
treef616edc256e90ad744a48b1bcb436f3dda8f1c66 /src/local/rz-mux/rz-mux-tool.sh
parenta37dc6d311f58def9ee5285bafd232b63141db49 (diff)
rz-mux-tool: generate cron bkp scripts
Diffstat (limited to 'src/local/rz-mux/rz-mux-tool.sh')
-rw-r--r--src/local/rz-mux/rz-mux-tool.sh4
1 files changed, 4 insertions, 0 deletions
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