IP phone Traffic Shapping

[jfinnigan]

What kind of traffic shaping do we need for our VoIP System.

We have a digium/asterisk box.

Currently in my Cisco configs this is all I have:

class-map match-all VOIP
match access-group 120

class VOIP
 priority 1000

We have VOIP traffic going over both the Lan inferfaces (Voice is on a specific  vlan  but I need it to have priority over other vlans traffic too) , our VPN (i'm going with Tinc on pfsense) and the wan interface.

Thoughts?

Thanks,
Jason

EDIT: I will be using Pfsense 2.1 not 2.0