From 82711182e5eb23f18375e9ecedc401935795294e Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Wed, 14 Jan 2015 08:45:57 +0000 Subject: [PATCH 01/10] downcase travis link --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5dff8ba..4338f11 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/WillsherSystems/ansible-sshd.svg?branch=master)](https://travis-ci.org/WillsherSystems/ansible-sshd) [![Ansible Galaxy](http://img.shields.io/badge/galaxy-willshersystems.sshd-660198.svg?style=flat)](https://galaxy.ansible.com/list#/roles/2488) +[![Build Status](https://travis-ci.org/willshersystems/ansible-sshd.svg?branch=master)](https://travis-ci.org/willshersystems/ansible-sshd) [![Ansible Galaxy](http://img.shields.io/badge/galaxy-willshersystems.sshd-660198.svg?style=flat)](https://galaxy.ansible.com/list#/roles/2488) OpenSSH Server ============== @@ -50,7 +50,7 @@ variables. Defaults to *False*. * sshd_allow_reload -If set to False, a reload of sshd wont happen on change. This can help with +If set to False, a reload of sshd wont happen on change. This can help with troubleshooting. You'll need to manually reload sshd if you want to apply the changed configuration. Defaults to *True*. @@ -125,7 +125,7 @@ Example Playbook Results in: -``` +``` # Ansible managed: ... Compression yes GSSAPIAuthentication no From d6a1e98559b882a8d89bdfc5fdd8ea16a860d575 Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Wed, 14 Jan 2015 12:47:25 +0000 Subject: [PATCH 02/10] Add apt role as a dependency --- meta/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 5515780..690aaea 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -24,4 +24,6 @@ galaxy_info: categories: - networking - system -dependencies: [] +dependencies: + - role: willshersystems.apt + when: ansible_pkg_mgr == 'apt' From 2e4e19d742401f59208530159243533d2c058d94 Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Wed, 14 Jan 2015 12:51:05 +0000 Subject: [PATCH 03/10] Add apt role to travis env --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3c9cae6..505b507 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ install: # Add ansible.cfg to pick up roles path. - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg" + - "ansible-galaxy install willshersystems.apt" script: # Check the roles syntax From 374880220a302b1ce168b9a4d7daa2fde1f4770e Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Wed, 14 Jan 2015 12:53:16 +0000 Subject: [PATCH 04/10] Add dependencies --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 4338f11..2fc80ef 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,11 @@ A list of dicts for a match section. See the example playbook. A list of dicts or just a dict for a Match section. +Dependencies +------------ + +- willshersystems.apt + Example Playbook ---------------- From e9003d33e33ea079b9a792df803c8a43232c5dff Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Wed, 14 Jan 2015 12:54:14 +0000 Subject: [PATCH 05/10] Add © symbol --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fc80ef..04475ae 100644 --- a/README.md +++ b/README.md @@ -152,4 +152,4 @@ Author Matt Willsher -Copyright 2014,2015 Willsher Systems +© 2014,2015 Willsher Systems From a9c307a3d6e070d40794f3cbc7bfae3b3deeb1f1 Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Wed, 14 Jan 2015 19:44:17 +0000 Subject: [PATCH 06/10] Register fact when this role has run --- tasks/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index b4d6268..85e47ba 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -40,3 +40,7 @@ state: running tags: - sshd + +- name: Register that this role has run + set_fact: sshd_has_run=true + when: sshd_has_run is not defined From f1c159854dc23b7e74a9d79db958ba9e24d54e5b Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Wed, 14 Jan 2015 19:44:31 +0000 Subject: [PATCH 07/10] only run apt role if it has not already run --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 690aaea..edbe736 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -26,4 +26,4 @@ galaxy_info: - system dependencies: - role: willshersystems.apt - when: ansible_pkg_mgr == 'apt' + when: ansible_pkg_mgr == 'apt' and apt_has_run is not defined From 9b2beed5135a1acd16a21afd066e2f07f89303c3 Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Thu, 15 Jan 2015 10:06:52 +0000 Subject: [PATCH 08/10] Speed up Travis --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 505b507..3e7788b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,12 @@ --- -language: python -python: "2.7" +language: c before_install: - # Make sure everything's up to date. + - sudo add-apt-repository -y ppa:ansible/ansible - sudo apt-get update -qq + - sudo apt-get -qq install ansible install: - # Install Ansible. - - pip install ansible - # Add ansible.cfg to pick up roles path. - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg" From f2648cc29553b1683f8ad4109bd35e9eea8a2a86 Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Thu, 15 Jan 2015 10:26:40 +0000 Subject: [PATCH 09/10] Add defaults.yml back in to stop failure on var import --- tasks/main.yml | 1 + vars/default.yml | 1 + 2 files changed, 2 insertions(+) create mode 100644 vars/default.yml diff --git a/tasks/main.yml b/tasks/main.yml index 85e47ba..85eaf87 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -6,6 +6,7 @@ - "{{ ansible_distribution }}.yml" - "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml" - "{{ ansible_os_family }}.yml" + - default.yml tags: - sshd diff --git a/vars/default.yml b/vars/default.yml new file mode 100644 index 0000000..ed97d53 --- /dev/null +++ b/vars/default.yml @@ -0,0 +1 @@ +--- From 859b988da19a814c1aacff480718354f89a694c1 Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Fri, 23 Jan 2015 10:44:03 +0000 Subject: [PATCH 10/10] Release 0.2.5 changes --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 1a758a7..b005f05 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +0.2.5 23 January 2014 Matt Willsher +- Fix for sftp-server install on Debian removing openssh-sftp-server. Thanks to @ricbra +- Reinstate defaults.yml as fall through 0.2.4 13 January 2014 Matt Willsher - Allow reload to be skipped - Test for OS support