add optional assets directive
Merge branch 'vhost'