summaryrefslogtreecommitdiff
path: root/roles/base
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2017-12-07 17:59:15 +0100
committerChristian Pointner <equinox@spreadspace.org>2017-12-07 17:59:15 +0100
commit4bce4e54c4e97d0fa4128dee67f57ba33ef6a2b0 (patch)
tree075209f7a8267637f0a7f6f285244a62eec75727 /roles/base
parentcleaned upgrade role (diff)
harmonized yaml syntax
Diffstat (limited to 'roles/base')
-rw-r--r--roles/base/defaults/main.yaml22
-rw-r--r--roles/base/tasks/main.yaml48
2 files changed, 44 insertions, 26 deletions
diff --git a/roles/base/defaults/main.yaml b/roles/base/defaults/main.yaml
index 282c4fd7..22599b1c 100644
--- a/roles/base/defaults/main.yaml
+++ b/roles/base/defaults/main.yaml
@@ -2,6 +2,22 @@
sysctl_config_user: {}
modules_blacklist:
- net: [dccp, sctp, rds, tipc]
- fs: [cramfs, freevxfs, hfs, hfsplus, jffs2]
- misc: [bluetooth, firewire-core, n_hdlc, net-pf-31, soundcore, thunderbolt, usb-midi]
+ net:
+ - dccp
+ - sctp
+ - rds
+ - tipc
+ fs:
+ - cramfs
+ - freevxfs
+ - hfs
+ - hfsplus
+ - jffs2
+ misc:
+ - bluetooth
+ - firewire-core
+ - n_hdlc
+ - net-pf-31
+ - soundcore
+ - thunderbolt
+ - usb-midi
diff --git a/roles/base/tasks/main.yaml b/roles/base/tasks/main.yaml
index 91349e50..2828a2e0 100644
--- a/roles/base/tasks/main.yaml
+++ b/roles/base/tasks/main.yaml
@@ -1,25 +1,27 @@
---
- name: apt - Install base system tools
- apt: name={{ item }} state=present
+ apt:
+ name: "{{ item }}"
+ state: present
with_items:
- - htop
- - dstat
- - lsof
- - gawk
- - psmisc
- - less
- - debian-goodies
- - screen
- - mtr-tiny
- - tcpdump
- - unp
- - sudo
- - haveged
- - dbus
- - libpam-systemd
- - aptitude
- - ca-certificates
- - file
+ - htop
+ - dstat
+ - lsof
+ - gawk
+ - psmisc
+ - less
+ - debian-goodies
+ - screen
+ - mtr-tiny
+ - tcpdump
+ - unp
+ - sudo
+ - haveged
+ - dbus
+ - libpam-systemd
+ - aptitude
+ - ca-certificates
+ - file
- name: Remove startup message from screen
lineinfile:
@@ -28,7 +30,7 @@
dest: /etc/screenrc
mode: 0644
tags:
- - screen
+ - screen
- name: Ensure /root is not world accessible
file:
@@ -50,10 +52,10 @@
- name: Change various sysctl-settings, look at the sysctl-vars file for documentation
sysctl:
- name: '{{ item.key }}'
- value: '{{ item.value }}'
+ name: "{{ item.key }}"
+ value: "{{ item.value }}"
sysctl_set: yes
state: present
reload: yes
ignoreerrors: yes
- with_dict: '{{ sysctl_config | combine(sysctl_config_user) }}'
+ with_dict: "{{ sysctl_config | combine(sysctl_config_user) }}"