Skip to content

Commit 63bf460

Browse files
authored
Merge pull request #4 from hellofresh/ansible-2.3
Ansible 2.3
2 parents 39ba137 + ca37ad4 commit 63bf460

File tree

10 files changed

+26
-14
lines changed

10 files changed

+26
-14
lines changed

.pullapprove.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
extends: hellofresh
1+
---
2+
extends: hellofresh

.travis.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
language: python
3+
services:
4+
- docker
5+
install:
6+
- pip install molecule
7+
- pip install docker
8+
script:
9+
- molecule test

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
sssd_ldap
1+
sssd-ldap
22
=========
33

4+
[![Build Status](https://travis-ci.org/antonu17/ansible-sssd-ldap.svg?branch=master)](https://travis-ci.org/antonu17/ansible-sssd-ldap)
5+
46
Install and configure sssd, nsswitch, pam and sshd to get user accounts from LDAP
57

68
Requirements
@@ -32,7 +34,7 @@ Including an example of how to use your role (for instance, with variables passe
3234

3335
- hosts: servers
3436
roles:
35-
- { role: sssd_ldap }
37+
- { role: sssd-ldap }
3638

3739
License
3840
-------

molecule/default/playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
- name: Converge
33
hosts: all
44
roles:
5-
- role: ansible-role-sssd_ldap
5+
- role: ansible-sssd-ldap

tasks/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
- defaults.yml
1111
tags: vars
1212

13-
- import_tasks: packages.yml
13+
- include: packages.yml
1414

15-
- import_tasks: sssd.yml
15+
- include: sssd.yml
1616

17-
- import_tasks: nsswitch.yml
17+
- include: nsswitch.yml
1818

19-
- import_tasks: pamd.yml
19+
- include: pamd.yml
2020

21-
- import_tasks: sshd.yml
21+
- include: sshd.yml

tasks/nsswitch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: sssd_ldap | nsswitch | enable sss
2+
- name: nsswitch | enable sss
33
replace:
44
dest: /etc/nsswitch.conf
55
regexp: '^({{ item }}(?!.*\bsss\b).*)$'

tasks/packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: sssd_ldap | packages | install packages
2+
- name: packages | install packages
33
package:
44
name: "{{ item }}"
55
state: present

tasks/pamd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: sssd_ldap | pamd | add pam_mkhomedir for Debian machines
2+
- name: pamd | add pam_mkhomedir for Debian machines
33
copy:
44
src: pam_mkhomedir
55
dest: /usr/share/pam-configs/sssd_mkhomedir

tasks/sshd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: sssd_ldap | sshd | enable authorized keys lookup script
2+
- name: sshd | enable authorized keys lookup script
33
lineinfile:
44
path: /etc/ssh/sshd_config
55
line: 'AuthorizedKeysCommand /usr/bin/sss_ssh_authorizedkeys'

tasks/sssd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: sssd_ldap | configure sssd
2+
- name: configure sssd
33
template:
44
src: sssd.conf.j2
55
dest: /etc/sssd/sssd.conf

0 commit comments

Comments
 (0)