X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fsenslab%2Fconfig%2Fbash_nukem;h=2aaeec18e629da73a55c91991285103ad0db0376;hb=1ca62657b0e80664a840e4856618dc5103fb1252;hp=b1a56d5244324a3eb95c92e6aa799247a00a709b;hpb=8c4c5f8f1d71375c44b27d89c94bec8468ea7157;p=sfa.git

diff --git a/sfa/senslab/config/bash_nukem b/sfa/senslab/config/bash_nukem
index b1a56d52..2aaeec18 100755
--- a/sfa/senslab/config/bash_nukem
+++ b/sfa/senslab/config/bash_nukem
@@ -28,6 +28,9 @@ else
     exit 
 fi
 
+# First restart sfa (prevents stalling when connecting
+# to the DB and dropping tables)
+sudo service sfa restart
 # Nuke the database 
 sudo sfaadmin.py registry nuke
 
@@ -60,9 +63,12 @@ sudo python setup.py install
 # and     /etc/sfa/configs/site.xml
 # into    /etc/sfa/sfa_config.xml
 # sudo sfa-config-tty
-sudo cp $git_local_repo/sfa/senslab/config/$vm/sfa_config /etc/sfa/sfa_config
+# 
+#sudo cp $git_local_repo/sfa/senslab/config/$vm/sfa_config /etc/sfa/sfa_config
 sudo cp $git_local_repo/sfa/senslab/config/$vm/sfa_config.xml /etc/sfa/sfa_config.xml
-sudo cp $git_local_repo/sfa/senslab/config/$vm/site.xml  /etc/sfa/site.xml
+sudo cp $git_local_repo/sfa/senslab/config/$vm/default_config.xml /etc/sfa/default_config.xml
+# sudo cp $git_local_repo/sfa/senslab/config/$vm/site.xml  /etc/sfa/site.xml
+# sudo cp $git_local_repo/sfa/senslab/config/$vm/site_config  /etc/sfa/configs/site_config
 # sudo ln -s ldap_config.py  /etc/sfa/ldap_config.py
 sudo cp $git_local_repo/sfa/senslab/config/ldap_config.py  /etc/sfa/ldap_config.py 
 sudo service sfa restart