Location of a Web Server

My company is about to bring it’s web hosting in house. Right now we have a Cisco 2621 between our DSL and the internal network. The router is running both NAT and has a firewall package. I am however not sure where to put the Web Server. ShouldI put it on my internal network and just setup one-to-one NAT, create a DMZ and again use one-to-one NAT, or create a DMZ and assign public IP addresses.

Also, if I want to access the webserver internally for uploading programmed pages, should I access it via the public domain or should I add a second NIC card to the server and attach it to the internal network. Thanks a for your help.