Browse Source

Clean up merge

Clean up some artifacts from the merge to match the `jessie` branch.
Keep the changes on master made with commits bfe6fe84 and e229c551.
Mike Ashley 8 years ago
parent
commit
fc023dfc31

+ 0
- 1
group_vars/testing View File

@@ -8,7 +8,6 @@
8 8
 ###############################################################################
9 9
 
10 10
 # common
11
-common_timezone: 'Etc/UTC'
12 11
 domain: sovereign.local
13 12
 main_user_name: sovereign
14 13
 friendly_networks:

+ 0
- 1
roles/common/files/etc_apache2_conf-available_ssl-stapling-cache.conf View File

@@ -1 +0,0 @@
1
-SSLStaplingCache shmcb:${APACHE_RUN_DIR}/stapling_cache(128000)

+ 1
- 1
roles/mailserver/tasks/opendmarc.yml View File

@@ -1,5 +1,5 @@
1 1
 - name: Install OpenDMARC milter and related packages
2
-  apt: pkg={{ item }} state=installed update_cache=yes cache_valid_time=3600
2
+  apt: pkg={{ item }} state=installed update_cache=yes
3 3
   with_items:
4 4
     - mysql-server
5 5
     - python-mysqldb

+ 0
- 4
roles/mailserver/tasks/z-push.yml View File

@@ -8,10 +8,6 @@
8 8
   tags:
9 9
     - dependencies
10 10
 
11
-- name: Enable imap module on Trusty
12
-  command: php5enmod imap
13
-  when: ansible_distribution_release == 'trusty'
14
-
15 11
 - name: Download z-push release
16 12
   get_url:
17 13
     url=http://download.z-push.org/final/2.1/z-push-{{ zpush_version }}.tar.gz

Loading…
Cancel
Save