Merge branch 'release/0.2.5'

This commit is contained in:
Matt Willsher 2015-01-23 10:45:03 +00:00
commit 6c4a2d6dc8
6 changed files with 25 additions and 11 deletions

View file

@ -1,18 +1,16 @@
---
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"
- "ansible-galaxy install willshersystems.apt"
script:
# Check the roles syntax

View file

@ -1,3 +1,6 @@
0.2.5 23 January 2014 Matt Willsher <matt@willsher.systems>
- 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 <matt@willsher.systems>
- Allow reload to be skipped
- Test for OS support

View file

@ -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*.
@ -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
----------------
@ -125,7 +130,7 @@ Example Playbook
Results in:
```
```
# Ansible managed: ...
Compression yes
GSSAPIAuthentication no
@ -147,4 +152,4 @@ Author
Matt Willsher <matt@willsher.systems>
Copyright 2014,2015 Willsher Systems
&copy; 2014,2015 Willsher Systems

View file

@ -24,4 +24,6 @@ galaxy_info:
categories:
- networking
- system
dependencies: []
dependencies:
- role: willshersystems.apt
when: ansible_pkg_mgr == 'apt' and apt_has_run is not defined

View file

@ -6,6 +6,7 @@
- "{{ ansible_distribution }}.yml"
- "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_os_family }}.yml"
- default.yml
tags:
- sshd
@ -40,3 +41,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

1
vars/default.yml Normal file
View file

@ -0,0 +1 @@
---