Now using arnoudj/puppet