projects
/
noc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #20 from realraum/vm-improvements
[noc.git]
/
ansible
/
roles
/
base
/
tasks
/
main.yml
diff --git
a/ansible/roles/base/tasks/main.yml
b/ansible/roles/base/tasks/main.yml
index
92218ba
..
919b2aa
100644
(file)
--- a/
ansible/roles/base/tasks/main.yml
+++ b/
ansible/roles/base/tasks/main.yml
@@
-139,10
+139,9
@@
shell: /bin/zsh
- name: set default shell for adduser
shell: /bin/zsh
- name: set default shell for adduser
- with_items:
- - regexp: "^DSHELL"
- line: "DSHELL=/bin/zsh"
+ with_dict:
+ DSHELL: /bin/zsh
lineinfile:
dest: /etc/adduser.conf
lineinfile:
dest: /etc/adduser.conf
- regexp: "{{ item.regexp }}"
- line: "{{ item.line }}"
+ regexp: "^#?{{ item.key }}="
+ line: "{{ item.key }}={{ item.value }}"