Merge pull request #10 from burner1024/fix-conf.tmp-start

Remove temporary conf tree before starting and avoid double replace
disaster37 · Aug 19, 2015 · c31deaa · c31deaa
2 parents 889308b + 1252bdd
commit c31deaa
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/assets/init.py b/assets/init.py
@@ -239,7 +239,7 @@ def do_init_activemq():
     replace_all(ACTIVEMQ_HOME + "/bin/linux-x86-64/wrapper.conf" ,"set\.default\.ACTIVEMQ_DATA=%ACTIVEMQ_BASE%\/data", "set.default.ACTIVEMQ_DATA=/data/activemq")
 
     # Fix bug #4 "Cannot mount a custom activemq.xml"
-    replace_all(ACTIVEMQ_HOME + "/bin/linux-x86-64/wrapper.conf" ,"set\.default\.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf", "set.default.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf.tmp")
+    replace_all(ACTIVEMQ_HOME + "/bin/linux-x86-64/wrapper.conf" ,"set\.default\.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf$", "set.default.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf.tmp")
 
     # We replace the log output
     replace_all(ACTIVEMQ_CONF + "/log4j.properties", "\$\{activemq\.base\}\/data\/", "/var/log/activemq/")
@@ -366,6 +366,7 @@ def setting_all():
 
 
     # We move all config file on temporary folder (Fix bug # 4)
+    shutil.rmtree(ACTIVEMQ_CONF, ignore_errors=True);
     shutil.copytree(ACTIVEMQ_HOME + "/conf/", ACTIVEMQ_CONF); 
 
     # First we fix right on volume