Improve apache2 recipes