Remove references to Trusty and Wheezy

Make a clean distinction between Debian 7 and Debian 8.  Anticipate the
next Ubuntu LTS release (Xenial) that is planned for support.

CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
 Make sure you agree with the license (GPLv3). See [LICENSE.md](./LICENSE.md) for details.
 
-Code that is committed to the master branch should work with both Debian 8 "Jessie" and Ubuntu 14.04 LTS "Trusty".
+Code that is committed to the master branch should work with both Debian 8 "Jessie" (and Ubuntu 16.04 LTS "Xenial" once it is available).
 
 ## Development environment
 

README.md

@@ -19,7 +19,7 @@ What do you get if you point Sovereign at a server? All kinds of good stuff!
 -   [IMAP](https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol) over SSL via [Dovecot](http://dovecot.org/), complete with full text search provided by [Solr](https://lucene.apache.org/solr/).
 -   [POP3](https://en.wikipedia.org/wiki/Post_Office_Protocol) over SSL, also via Dovecot
 -   [SMTP](https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol) over SSL via Postfix, including a nice set of [DNSBLs](https://en.wikipedia.org/wiki/DNSBL) to discard spam before it ever hits your filters.
--   Webmail via [Roundcube](http://www.roundcube.net/). **NOTE:** currently [only available on Ubuntu Trusty](http://forums.debian.net/viewtopic.php?f=10&t=121928).
+-   Webmail via [Roundcube](http://www.roundcube.net/). **NOTE:** currently unavailable.
 -   Mobile push notifications via [Z-Push](http://z-push.sourceforge.net/soswp/index.php?pages_id=1&t=home).
 -   Email client [automatic configuration](https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration).
 -   Jabber/[XMPP](http://xmpp.org/) instant messaging via [Prosody](http://prosody.im/).

Vagrantfile

@@ -36,8 +36,8 @@ Vagrant.configure('2') do |config|
     jessie.vm.box = 'box-cutter/debian81'
   end
 
-  # Ubuntu 14.04.2 (LTS) 64-bit
-  config.vm.define 'trusty', autostart: false do |trusty|
-    trusty.vm.box = 'box-cutter/ubuntu1404'
+  # Ubuntu 16.04 (LTS) 64-bit (currently unavailable)
+  config.vm.define 'xenial', autostart: false do |xenial|
+    xenial.vm.box = 'box-cutter/ubuntu1604'
   end
 end

roles/common/tasks/main.yml

@@ -1,11 +1,4 @@
 ---
-# Defines tasks applicable across all machines in the infrastructure.
-- name: Set up closest mirror autoselect (Ubuntu-only)
-  template: src=apt_sources.list.j2 dest=/etc/apt/sources.list
-  when: ansible_distribution == 'Ubuntu'
-  tags:
-    - dependencies
-
 - name: Update apt cache
   apt: update_cache=yes
   tags:

roles/common/tasks/ssl.yml

@@ -41,7 +41,6 @@
   command: a2enmod socache_shmcb
     creates=/etc/apache2/mods-enabled/socache_shmcb.load
   notify: restart apache
-  when: ansible_distribution_release != 'wheezy'
 
 - name: Add common Apache SSL config
   copy: src=etc_apache2_conf-available_ssl.conf

roles/common/templates/apt_sources.list.j2

@@ -1,5 +0,0 @@
-# This file is generated by Sovereign
-deb mirror://mirrors.ubuntu.com/mirrors.txt {{ ansible_distribution_release }} main restricted universe multiverse
-deb mirror://mirrors.ubuntu.com/mirrors.txt {{ ansible_distribution_release }}-updates main restricted universe multiverse
-deb mirror://mirrors.ubuntu.com/mirrors.txt {{ ansible_distribution_release }}-backports main restricted universe multiverse
-deb mirror://mirrors.ubuntu.com/mirrors.txt {{ ansible_distribution_release }}-security main restricted universe multiverse

roles/common/templates/etc_fail2ban_jail.local.j2

@@ -28,11 +28,7 @@ maxretry = 1
 enabled = true
 filter = dovecot-pop3imap
 action = iptables-multiport[name=dovecot-pop3imap, port="pop3,imap,993,995", protocol=tcp]
-{% if ansible_distribution == 'Ubuntu' %}
-logpath = /var/log/mail.log
-{% else %}
 logpath = /var/log/maillog
-{% endif %}
 maxretry = 20
 findtime = 1200
 bantime = 1200

roles/mailserver/tasks/dovecot.yml

@@ -10,15 +10,8 @@
   tags:
     - dependencies
 
-- name: Install Postgres 9.3 for Dovecot on Ubuntu Trusty
-  apt: pkg=postgresql-9.3 state=present
-  when: ansible_distribution_release == 'trusty'
-  tags:
-    - dependencies
-
-- name: Install Postgres 9.4 for Dovecot on Debian Jessie
-  apt: pkg=postgresql-9.4 state=present
-  when: ansible_distribution_release == 'jessie'
+- name: Install Postgres for Dovecot
+  apt: pkg=postgresql state=present
   tags:
     - dependencies
 

roles/mailserver/tasks/postfix.yml

@@ -1,12 +1,5 @@
-- name: Install Postgres 9.3 on Ubuntu Trusty
-  apt: pkg=postgresql-9.3 state=present
-  when: ansible_distribution_release == 'trusty'
-  tags:
-    - dependencies
-
-- name: Install Postgres 9.4 on Debian Jessie
-  apt: pkg=postgresql-9.4 state=present
-  when: ansible_distribution_release == 'jessie'
+- name: Install Postgres
+  apt: pkg=postgresql state=present
   tags:
     - dependencies
 

roles/mailserver/tasks/z-push.yml

@@ -41,22 +41,12 @@
 - name: Copy z-push's config.php into place
   template: src=usr_share_z-push_config.php.j2 dest=/usr/share/z-push/config.php
 
-- name: Configure z-push apache alias and php settings
-  copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf.d/z-push.conf
-  notify: restart apache
-  when: ansible_distribution_release != 'trusty' and ansible_distribution_release != 'jessie'
-
-
-- name: Create z-push apache alias and php configuration file for Ubuntu Trusty / jessie
+- name: Create z-push apache alias and php configuration file
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf-available/z-push.conf
-  when: ansible_distribution_release == 'trusty' or ansible_distribution_release == 'jessie'
 
-
-- name: Enable z-push Apache alias and PHP configuration file for Ubuntu Trusty / jessie
+- name: Enable z-push Apache alias and PHP configuration file
   command: a2enconf z-push creates=/etc/apache2/conf-enabled/z-push.conf
   notify: restart apache
-  when: ansible_distribution_release == 'trusty' or ansible_distribution_release == 'jessie'
-
 
 - name: Configure z-push logrotate
   copy: src=etc_logrotate_z-push dest=/etc/logrotate.d/z-push owner=root group=root mode=0644

roles/owncloud/tasks/owncloud.yml

@@ -20,27 +20,13 @@
 - name: Create database for ownCloud
   postgresql_db: login_host=localhost login_user={{ db_admin_username }} login_password="{{ db_admin_password }}" name={{ owncloud_db_database }} state=present owner={{ owncloud_db_username }}
 
-- name: Ensure repository key for ownCloud is in place for Debian Jesse
+- name: Ensure repository key for ownCloud is in place
   apt_key: url=http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_8.0/Release.key state=present
-  when: ansible_distribution_release == 'jessie'
   tags:
     - dependencies
 
-- name: Add ownCloud OpenSuSE repository for Debian Jessie
+- name: Add ownCloud OpenSuSE repository
   apt_repository: repo='deb http://download.opensuse.org/repositories/isv:/ownCloud:/community/Debian_8.0/ /'
-  when: ansible_distribution_release == 'jessie'
-  tags:
-    - dependencies
-
-- name: Ensure repository key for ownCloud is in place for Ubuntu Trusty
-  apt_key: url=http://download.opensuse.org/repositories/isv:ownCloud:community/xUbuntu_14.04/Release.key state=present
-  when: ansible_distribution_release == 'trusty'
-  tags:
-    - dependencies
-
-- name: Add ownCloud OpenSuSE repository for Ubuntu Trusty
-  apt_repository: repo='deb http://download.opensuse.org/repositories/isv:ownCloud:community/xUbuntu_14.04/ /'
-  when: ansible_distribution_release == 'trusty'
   tags:
     - dependencies
 

roles/webmail/tasks/main.yml

@@ -1,2 +1 @@
 - include: roundcube.yml tags=roundcube
-  when: ansible_distribution_release == 'trusty'