ubuntu server 10.10 and Openvpn

I have one computer on my home network here that I have installed ubuntu server 10.10, Openvpn, and Samba on. My goal was to have access to my files (media files mostly music and movies) when I am not home. I had everything working perfectly, and true to my nature I couldn't leave it alone..lol...I had to make it better. Or so I thought. Now my Openvpn is all wonky. Any assistance would be greatly appreciated.

Openvpn server.conf

Code:

local 192.168.1.139
port 1193
;proto tcp
proto udp
;dev tap
dev tun0
;dev-node MyTap
ca ca.crt
cert server.crt
key server.key
dh dh2048.pem
server 10.8.0.0 255.255.255.0
ifconfig-pool-persist ipp.txt
;server-bridge 10.8.0.4 255.255.255.0 10.8.0.50 10.8.0.100
;server-bridge
;push "route 192.168.10.0 255.255.255.0"
;push "route 192.168.20.0 255.255.255.0"
;client-config-dir ccd
;route 192.168.40.128 255.255.255.248
;client-config-dir ccd
;route 10.9.0.0 255.255.255.252
;learn-address ./script
;push "redirect-gateway def1 bypass-dhcp"
;push "dhcp-option DNS 208.67.222.222"
;push "dhcp-option DNS 208.67.220.220"
;client-to-client
;duplicate-cn
keepalive 10 120
tls-auth ta.key 0
;cipher BF-CBC        # Blowfish (default)
;cipher AES-128-CBC   # AES
;cipher DES-EDE3-CBC  # Triple-DES
comp-lzo
;max-clients 100
user nobody
group nogroup
persist-key
persist-tun
status openvpn-status.log
;log         openvpn.log
;log-append  openvpn.log
verb 3
;mute 20

My client .ovpn

Code:

dev tun
;dev-node MyTap
proto udp
remote XXXXX.XXXXX.com 1193
;remote-random
resolv-retry infinite
nobind
;user nobody
;group nobody
persist-key
persist-tun
;http-proxy-retry 
;http-proxy [proxy server] [proxy port #]
;mute-replay-warnings
ca ca.crt
cert PORTABLE1.crt
key PORTABLE1.key
ns-cert-type server
tls-auth ta.key 1
cipher BF-CBC
comp-lzo
verb 3
;mute 20

The results of an ifconfig (this I'm confused bigtime on)

Code:

eth0      Link encap:Ethernet  HWaddr 00:11:09:2d:01:d5
          inet addr:192.168.1.139  Bcast:192.168.1.255  Mask:255.255.255.0
          inet6 addr: fe80::211:9ff:fe2d:1d5/64 Scope:Link
          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
          RX packets:36293 errors:0 dropped:0 overruns:0 frame:0
          TX packets:15618 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:1000
          RX bytes:14009008 (14.0 MB)  TX bytes:2330283 (2.3 MB)
          Interrupt:22

lo        Link encap:Local Loopback
          inet addr:127.0.0.1  Mask:255.0.0.0
          inet6 addr: ::1/128 Scope:Host
          UP LOOPBACK RUNNING  MTU:16436  Metric:1
          RX packets:8 errors:0 dropped:0 overruns:0 frame:0
          TX packets:8 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:0
          RX bytes:480 (480.0 B)  TX bytes:480 (480.0 B)

tun0      Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00                                                                                        -00
          inet addr:10.8.0.1  P-t-P:10.8.0.2  Mask:255.255.255.255
          UP POINTOPOINT RUNNING NOARP MULTICAST  MTU:1500  Metric:1
          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:100
          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)

My local lan addresses are 192.168.1.100/24 DHCP is my linksys router at 192.168.1.1
I want my vpn address range in 10.8.0.0/24
but when I connect my laptop (which is the only thing connected to my vpn) it gets an address of 10.8.0.18 but can't resolve names or connect to samba.
I have no Idea where 10.8.0.2 came from.

again any help would be greatly appreciated.

Mike