Skip to content

Commit

Permalink
Make 2.2 the default version
Browse files Browse the repository at this point in the history
  • Loading branch information
tersmitten committed Jan 15, 2019
1 parent 867a5c9 commit 3021684
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
skip_list:
- '405'
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ script:
&& (echo 'Idempotence test: pass' && exit 0)
|| (echo 'Idempotence test: fail' && exit 1)
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml || true; fi
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml; fi

notifications:
email: false
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Set up [duply](http://duply.net/), a shell front-end for the mighty [duplicity](

#### Variables

* `duply_version`: [default: `2.0.3`]: Duply [version](https://github.com/Oefenweb/duply/releases) to install
* `duply_version`: [default: `2.2`]: Duply [version](https://github.com/Oefenweb/duply/releases) to install
* `duply_install`: [default: `[]`]: Additional packages to install (e.g. `duplicity`)
* `duply_install_dir` [default: `/usr/local/bin`]: Install directory

Expand Down
13 changes: 10 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,31 @@ boxes = [
:cpu => "50",
:ram => "256"
},
{
:name => "ubuntu-1804",
:box => "bento/ubuntu-18.04",
:ip => '10.0.0.14',
:cpu => "50",
:ram => "256"
},
{
:name => "debian-7",
:box => "bento/debian-7",
:ip => '10.0.0.14',
:ip => '10.0.0.15',
:cpu => "50",
:ram => "256"
},
{
:name => "debian-8",
:box => "bento/debian-8",
:ip => '10.0.0.15',
:ip => '10.0.0.16',
:cpu => "50",
:ram => "256"
},
{
:name => "debian-9",
:box => "bento/debian-9",
:ip => '10.0.0.16',
:ip => '10.0.0.17',
:cpu => "50",
:ram => "256"
},
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# defaults file for duply
---
duply_version: 2.0.3
duply_version: 2.2
duply_install: []
duply_install_dir: /usr/local/bin
2 changes: 2 additions & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# meta file for duply
---
galaxy_info:
role_name: duply
author: Mischa ter Smitten
company: Oefenweb.nl B.V.
description: Set up duply, a shell front-end for the mighty duplicity
Expand All @@ -12,6 +13,7 @@ galaxy_info:
- precise
- trusty
- xenial
- bionic
- name: Debian
versions:
- wheezy
Expand Down
3 changes: 1 addition & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
---
- name: install
apt:
name: "{{ item }}"
name: "{{ duply_install }}"
state: "{{ apt_install_state | default('latest') }}"
update_cache: true
cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
with_items: "{{ duply_install }}"
tags:
- configuration
- duply
Expand Down

0 comments on commit 3021684

Please sign in to comment.