Use same Apache server name configuration across distros

roles/common/tasks/apache.yml

@@ -9,16 +9,9 @@
   command: a2enmod headers creates=/etc/apache2/mods-enabled/headers.load
   notify: restart apache
 
-- name: Set ServerName for Apache
-  template: src=fqdn.j2 dest=/etc/apache2/conf.d/fqdn
-  notify: restart apache
-  when: ansible_distribution_release != 'trusty'
-
-- name: Create ServerName configuration file for Apache for Ubuntu Trusty
+- name: Create ServerName configuration file for Apache
   template: src=fqdn.j2 dest=/etc/apache2/conf-available/fqdn.conf
-  when: ansible_distribution_release == 'trusty'
 
-- name: Set ServerName for Apache for Ubuntu Trusty
+- name: Set ServerName for Apache
   command: a2enconf fqdn creates=/etc/apache2/conf-enabled/fqdn.conf
   notify: restart apache
-  when: ansible_distribution_release == 'trusty'