浏览代码

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.
Mike Ashley 8 年前
父节点
当前提交
195d8811fc

+ 1
- 1
CONTRIBUTING.md 查看文件

@@ -4,7 +4,7 @@
4 4
 
5 5
 Make sure you agree with the license (GPLv3). See [LICENSE.md](./LICENSE.md) for details.
6 6
 
7
-Code that is committed to the master branch should work with both Debian 8 "Jessie" and Ubuntu 14.04 LTS "Trusty".
7
+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).
8 8
 
9 9
 ## Development environment
10 10
 

+ 1
- 1
README.md 查看文件

@@ -19,7 +19,7 @@ What do you get if you point Sovereign at a server? All kinds of good stuff!
19 19
 -   [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/).
20 20
 -   [POP3](https://en.wikipedia.org/wiki/Post_Office_Protocol) over SSL, also via Dovecot
21 21
 -   [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.
22
--   Webmail via [Roundcube](http://www.roundcube.net/). **NOTE:** currently [only available on Ubuntu Trusty](http://forums.debian.net/viewtopic.php?f=10&t=121928).
22
+-   Webmail via [Roundcube](http://www.roundcube.net/). **NOTE:** currently unavailable.
23 23
 -   Mobile push notifications via [Z-Push](http://z-push.sourceforge.net/soswp/index.php?pages_id=1&t=home).
24 24
 -   Email client [automatic configuration](https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration).
25 25
 -   Jabber/[XMPP](http://xmpp.org/) instant messaging via [Prosody](http://prosody.im/).

+ 3
- 3
Vagrantfile 查看文件

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

+ 0
- 7
roles/common/tasks/main.yml 查看文件

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

+ 0
- 1
roles/common/tasks/ssl.yml 查看文件

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

+ 0
- 5
roles/common/templates/apt_sources.list.j2 查看文件

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

+ 0
- 4
roles/common/templates/etc_fail2ban_jail.local.j2 查看文件

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

+ 2
- 9
roles/mailserver/tasks/dovecot.yml 查看文件

@@ -10,15 +10,8 @@
10 10
   tags:
11 11
     - dependencies
12 12
 
13
-- name: Install Postgres 9.3 for Dovecot on Ubuntu Trusty
14
-  apt: pkg=postgresql-9.3 state=present
15
-  when: ansible_distribution_release == 'trusty'
16
-  tags:
17
-    - dependencies
18
-
19
-- name: Install Postgres 9.4 for Dovecot on Debian Jessie
20
-  apt: pkg=postgresql-9.4 state=present
21
-  when: ansible_distribution_release == 'jessie'
13
+- name: Install Postgres for Dovecot
14
+  apt: pkg=postgresql state=present
22 15
   tags:
23 16
     - dependencies
24 17
 

+ 2
- 9
roles/mailserver/tasks/postfix.yml 查看文件

@@ -1,12 +1,5 @@
1
-- name: Install Postgres 9.3 on Ubuntu Trusty
2
-  apt: pkg=postgresql-9.3 state=present
3
-  when: ansible_distribution_release == 'trusty'
4
-  tags:
5
-    - dependencies
6
-
7
-- name: Install Postgres 9.4 on Debian Jessie
8
-  apt: pkg=postgresql-9.4 state=present
9
-  when: ansible_distribution_release == 'jessie'
1
+- name: Install Postgres
2
+  apt: pkg=postgresql state=present
10 3
   tags:
11 4
     - dependencies
12 5
 

+ 2
- 12
roles/mailserver/tasks/z-push.yml 查看文件

@@ -41,22 +41,12 @@
41 41
 - name: Copy z-push's config.php into place
42 42
   template: src=usr_share_z-push_config.php.j2 dest=/usr/share/z-push/config.php
43 43
 
44
-- name: Configure z-push apache alias and php settings
45
-  copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf.d/z-push.conf
46
-  notify: restart apache
47
-  when: ansible_distribution_release != 'trusty' and ansible_distribution_release != 'jessie'
48
-
49
-
50
-- name: Create z-push apache alias and php configuration file for Ubuntu Trusty / jessie
44
+- name: Create z-push apache alias and php configuration file
51 45
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf-available/z-push.conf
52
-  when: ansible_distribution_release == 'trusty' or ansible_distribution_release == 'jessie'
53 46
 
54
-
55
-- name: Enable z-push Apache alias and PHP configuration file for Ubuntu Trusty / jessie
47
+- name: Enable z-push Apache alias and PHP configuration file
56 48
   command: a2enconf z-push creates=/etc/apache2/conf-enabled/z-push.conf
57 49
   notify: restart apache
58
-  when: ansible_distribution_release == 'trusty' or ansible_distribution_release == 'jessie'
59
-
60 50
 
61 51
 - name: Configure z-push logrotate
62 52
   copy: src=etc_logrotate_z-push dest=/etc/logrotate.d/z-push owner=root group=root mode=0644

+ 2
- 16
roles/owncloud/tasks/owncloud.yml 查看文件

@@ -20,27 +20,13 @@
20 20
 - name: Create database for ownCloud
21 21
   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 }}
22 22
 
23
-- name: Ensure repository key for ownCloud is in place for Debian Jesse
23
+- name: Ensure repository key for ownCloud is in place
24 24
   apt_key: url=http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_8.0/Release.key state=present
25
-  when: ansible_distribution_release == 'jessie'
26 25
   tags:
27 26
     - dependencies
28 27
 
29
-- name: Add ownCloud OpenSuSE repository for Debian Jessie
28
+- name: Add ownCloud OpenSuSE repository
30 29
   apt_repository: repo='deb http://download.opensuse.org/repositories/isv:/ownCloud:/community/Debian_8.0/ /'
31
-  when: ansible_distribution_release == 'jessie'
32
-  tags:
33
-    - dependencies
34
-
35
-- name: Ensure repository key for ownCloud is in place for Ubuntu Trusty
36
-  apt_key: url=http://download.opensuse.org/repositories/isv:ownCloud:community/xUbuntu_14.04/Release.key state=present
37
-  when: ansible_distribution_release == 'trusty'
38
-  tags:
39
-    - dependencies
40
-
41
-- name: Add ownCloud OpenSuSE repository for Ubuntu Trusty
42
-  apt_repository: repo='deb http://download.opensuse.org/repositories/isv:ownCloud:community/xUbuntu_14.04/ /'
43
-  when: ansible_distribution_release == 'trusty'
44 30
   tags:
45 31
     - dependencies
46 32
 

+ 0
- 1
roles/webmail/tasks/main.yml 查看文件

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

正在加载...
取消
保存