Skip to content

Commit 2601e87

Browse files
zuazozuazo
committed
Update onddo-spamassassin cookbook from 1 to 2.
1 parent 4392dc4 commit 2601e87

File tree

4 files changed

+5
-28
lines changed

4 files changed

+5
-28
lines changed

‎.kitchen.docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ driver:
77
platforms:
88
- name: centos-6
99
- name: centos-7
10+
driver_config:
11+
privileged: true
12+
run_command: /sbin/init
1013
- name: debian-7
1114
run_list: recipe[apt]
1215
- name: debian-8
@@ -29,9 +32,6 @@ platforms:
2932
driver_config:
3033
privileged: true
3134
run_command: /sbin/init
32-
- name: fedora-23
33-
- name: fedora-24
34-
- name: fedora-25
3535

3636
# Non-official images with systemd
3737
- name: scientific-6.6

‎.travis.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ env:
1717
- TESTS="integration[mysql-ubuntu-1404,verify]"
1818
- TESTS="integration[mysql-ubuntu-1604,verify]"
1919
- TESTS="integration[mysql-ubuntu-1610,verify]"
20-
- TESTS="integration[mysql-fedora-23,verify]"
21-
- TESTS="integration[mysql-fedora-24,verify]"
22-
- TESTS="integration[mysql-fedora-25,verify]"
2320
- TESTS="integration[mysql-scientific-66,verify]"
2421
- TESTS="integration[postgresql-centos-6,verify]"
2522
- TESTS="integration[postgresql-centos-7,verify]"
@@ -29,18 +26,13 @@ env:
2926
- TESTS="integration[postgresql-ubuntu-1404,verify]"
3027
- TESTS="integration[postgresql-ubuntu-1604,verify]"
3128
- TESTS="integration[postgresql-ubuntu-1610,verify]"
32-
- TESTS="integration[postgresql-fedora-23,verify]"
33-
- TESTS="integration[postgresql-fedora-24,verify]"
34-
- TESTS="integration[postgresql-fedora-25,verify]"
3529
- TESTS="integration[postgresql-scientific-66,verify]"
3630
- TESTS="integration[postfixpgsql-debian-7,verify]"
3731
- TESTS="integration[postfixpgsql-debian-8,verify]"
3832
- TESTS="integration[postfixpgsql-ubuntu-1204,verify]"
3933
- TESTS="integration[postfixpgsql-ubuntu-1404,verify]"
4034
- TESTS="integration[postfixpgsql-ubuntu-1604,verify]"
4135
- TESTS="integration[postfixpgsql-ubuntu-1610,verify]"
42-
- TESTS="integration[postfixpgsql-fedora-24,verify]"
43-
- TESTS="integration[postfixpgsql-fedora-25,verify]"
4436
- TESTS="integration[postfixpgsql-scientific-66,verify]"
4537

4638
matrix:
@@ -61,12 +53,6 @@ matrix:
6153
env: TESTS="integration[mysql-ubuntu-1604,verify]"
6254
- rvm: 2.2
6355
env: TESTS="integration[mysql-ubuntu-1610,verify]"
64-
- rvm: 2.2
65-
env: TESTS="integration[mysql-fedora-23,verify]"
66-
- rvm: 2.2
67-
env: TESTS="integration[mysql-fedora-24,verify]"
68-
- rvm: 2.2
69-
env: TESTS="integration[mysql-fedora-25,verify]"
7056
- rvm: 2.2
7157
env: TESTS="integration[mysql-scientific-66,verify]"
7258
- rvm: 2.2
@@ -85,12 +71,6 @@ matrix:
8571
env: TESTS="integration[postgresql-ubuntu-1604,verify]"
8672
- rvm: 2.2
8773
env: TESTS="integration[postgresql-ubuntu-1610,verify]"
88-
- rvm: 2.2
89-
env: TESTS="integration[postgresql-fedora-23,verify]"
90-
- rvm: 2.2
91-
env: TESTS="integration[postgresql-fedora-24,verify]"
92-
- rvm: 2.2
93-
env: TESTS="integration[postgresql-fedora-25,verify]"
9474
- rvm: 2.2
9575
env: TESTS="integration[postgresql-scientific-66,verify]"
9676
- rvm: 2.2
@@ -105,10 +85,6 @@ matrix:
10585
env: TESTS="integration[postfixpgsql-ubuntu-1604,verify]"
10686
- rvm: 2.2
10787
env: TESTS="integration[postfixpgsql-ubuntu-1610,verify]"
108-
- rvm: 2.2
109-
env: TESTS="integration[postfixpgsql-fedora-24,verify]"
110-
- rvm: 2.2
111-
env: TESTS="integration[postfixpgsql-fedora-25,verify]"
11288
- rvm: 2.2
11389
env: TESTS="integration[postfixpgsql-scientific-66,verify]"
11490

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
1414
- `dovecot` from `2` to `3`.
1515
- `postfixadmin` from `2` to `3` (fixes [issue #7](https://github.com/zuazo/postfix-dovecot-cookbook/issues/7), thanks [Arunderwood](https://github.com/arunderwood) for reporting).
1616
- `ssl_certificate` from `1` to `2`.
17+
- `onddo-spamassassin` from `1` to `2`.
1718
- `yum` from `3` to `5`.
1819
- Dovecot: enable SSL explicitly.
1920
- Update RuboCop to version `0.40` and fix new offenses.

‎metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
depends 'chef-vault', '~> 2.0'
5757
depends 'build-essential', '~> 8.0'
5858
depends 'dovecot', '~> 3.0'
59-
depends 'onddo-spamassassin', '~> 1.0'
59+
depends 'onddo-spamassassin', '~> 2.0'
6060
depends 'postfixadmin', '~> 3.0'
6161
depends 'postfix-full', '~> 0.1'
6262
depends 'ssl_certificate', '~> 2.0'

0 commit comments

Comments
 (0)