new resin.xml

installer.py

@@ -241,6 +241,8 @@ class Installer:
     self.__run_command("make install", cwd="resin-4.0.36")
     self.__run_command("mv conf/resin.properties conf/resin.properties.orig", cwd="resin-4.0.36")
     self.__run_command("cat ../config/resin.properties > resin-4.0.36/conf/resin.properties")
+    self.__run_command("mv conf/resin.xml conf/resin.xml.orig", cwd="resin-4.0.36")
+    self.__run_command("cat ../config/resin.xml > resin-4.0.36/conf/resin.xml")
 
     ##############################################################
     #

servlet/setup.py

@@ -17,7 +17,7 @@ def start(args):
       return 0
     subprocess.check_call("rm -rf $RESIN_HOME/webapps/*", shell=True)
     subprocess.check_call("cp servlet/target/servlet.war $RESIN_HOME/webapps/", shell=True)
-    subprocess.check_call("$RESIN_HOME/bin/resinctl -conf config/resin.xml start", shell=True)
+    subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True)
     return 0
   except subprocess.CalledProcessError:
     return 1