Given how open you have this set up I must ask if you have any windows machines on this network that need to communicate with your two systems.  If not then some headache reduction may be found in using Linux native file share such as nfs or sshfs.  Just a thought.