> However, I have slowly been expanding this computer's role: it's > always been a firewall/gateway/NAT box. But I also want it to be a > massive data store (to house files for a video-on-demand system) > using nfs/samba, a backup server (rsync) and house some relatively > light-weight subversion (svn) repositories. >
I'd invest in one machine to just be the firewall. As secure as OpenBSD is, the more features a firewall has, the more problems it can have.