I started rsyncing files from server 2 to server 1, approx. on Friday, maybe tomorrow already, depening on how fast the million files are moved, I will move the db in a very short break of maybe half an hour. Then I'll reinstall server 2 and set up the fileserver there and rsync back to it.