Added test if file is empty, include sites-enabled, remove duplicated upstream