cybercinch/ansible-role-common
1
0
Fork 0
Code Issues Pull Requests Actions Releases 10 Activity

yamllint fixes

Browse Source
This commit is contained in:
Aaron Guise
2022-04-03 13:20:47 +12:00
parent 4b41ea1a10
commit 8925c556d6
8 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
handlers/main.yml
View File

@@ -1,23 +1,23 @@
---
# handlers file for guisea.common
- name: Restart Postfix
service:
service:
name: postfix
state: reloaded
- name: Restart SSH
service:
name: sshd
state: restarted
- name: Restart NTPD
service:
name: ntpd
state: restarted
- name: reboot windows
win_reboot:
- name: restart NetworkManager
service:
name: NetworkManager
@@ -27,7 +27,7 @@
stat:
path: /boot/grub2/grub.cfg
register: grub_cfg
- name: Update GRUB
command: /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg
when: grub_cfg.stat.exists

12
meta/main.yml
View File

@@ -1,17 +1,17 @@
---
galaxy_info:
author: guisea <aaron@guise.net.nz>
role_name: common # if absent directory name hosting role is used instead
namespace: cybercinch # if absent, author is used instead
role_name: common # if absent directory name hosting role is used instead
namespace: cybercinch # if absent, author is used instead
description: Commonplace system setup
company: CyberCinch
license: MIT
min_ansible_version: "2.9"
platforms:
- name: EL
versions:
- all
- name: EL
versions:
- all
galaxy_tags: []
dependencies: []

6
tasks/Windows.yml
View File

@@ -11,14 +11,14 @@
state: present
update_password: always
changed_when: false
- name: Ensure System Culture Set
win_region:
location: 183
format: en-NZ
unicode_language: en-NZ
copy_settings: true
- name: Ensure DNS is set
win_dns_client:
adapter_names: "*"
@@ -40,7 +40,7 @@
with_items:
- 'C:\Temp'
- 'C:\Tools'
#- name: Ensure Profile Tool Present
# win_copy:
# src: Defprof.exe

2
tasks/common.yml
View File

@@ -2,4 +2,4 @@
- include_tasks: networking.yml
- include_tasks: communication.yml
- include_tasks: grub.yml
- include_tasks: motd.yml
- include_tasks: motd.yml

17
tasks/communication.yml
View File

@@ -10,22 +10,25 @@
notify: Restart Postfix
when: "'SMTP0' not in inventory_hostname"
with_items:
- { dest: /etc/postfix/main.cf,
- {
dest: /etc/postfix/main.cf,
regexp: "^.?inet_protocols =",
line: "inet_protocols = ipv4"
line: "inet_protocols = ipv4",
}
- { dest: /etc/postfix/main.cf,
- {
dest: /etc/postfix/main.cf,
regexp: "^.?inet_interfaces =",
line: "inet_interfaces = all"
line: "inet_interfaces = all",
}
- { dest: /etc/postfix/main.cf,
- {
dest: /etc/postfix/main.cf,
regexp: "^.?relayhost =",
line: "relayhost = {{ relayhost }}"
line: "relayhost = {{ relayhost }}",
}
- {
dest: /etc/postfix/main.cf,
regexp: "^.?smtp_randomize_addresses =",
line: "smtp_randomize_addresses = no"
line: "smtp_randomize_addresses = no",
}
- name: postfix | Ensure Postfix is Started/Enabled

6
tasks/main.yml
View File

@@ -1,9 +1,9 @@
---
- name: Include tasks only if one of the files exist, otherwise skip the task
include_tasks: '{{ item }}'
include_tasks: "{{ item }}"
vars:
params:
files:
- '{{ ansible_os_family }}.yml'
- 'common.yml'
- "{{ ansible_os_family }}.yml"
- "common.yml"
loop: "{{ q('first_found', params, errors='ignore') }}"

2
tasks/motd.yml
View File

@@ -16,4 +16,4 @@
dest: /etc/profile.d/motd.sh
regexp: "^/usr/local/bin/dynmotd"
line: "/usr/local/bin/dynmotd"
create: yes
create: yes

43
tasks/networking.yml
View File

@@ -6,14 +6,13 @@
mode: "{{ item.mode }}"
backup: yes
with_items:
- { src: etc.sysconfig.network.j2,
- {
src: etc.sysconfig.network.j2,
dest: /etc/sysconfig/network,
mode: u+rw, a+r
}
- { src: etc.resolv.conf.j2,
dest: /etc/resolv.conf,
mode: u+rw, a+r
mode: u+rw,
a+r,
}
- { src: etc.resolv.conf.j2, dest: /etc/resolv.conf, mode: u+rw, a+r }
when: ansible_virtualization_type != "docker"
tags: dns
@@ -25,23 +24,29 @@
backrefs: yes
backup: yes
with_items:
- {regexp: "^127.0.0.1.+localdomain4$",
line: "127.0.0.1 localhost {{ inventory_hostname }}"
- {
regexp: "^127.0.0.1.+localdomain4$",
line: "127.0.0.1 localhost {{ inventory_hostname }}",
}
- {regexp: "^::1.+localdomain6$",
line: "::1 localhost {{ inventory_hostname }}"
- {
regexp: "^::1.+localdomain6$",
line: "::1 localhost {{ inventory_hostname }}",
}
- {regexp: "^{{ ansible_default_ipv4.address }}.*{{ ansible_default_ipv4.address.split('.')[-1] }}$",
line: "{{ ansible_default_ipv4.address }} {{ inventory_hostname }}.{{ domain }} {{ inventory_hostname }}"
- {
regexp: "^{{ ansible_default_ipv4.address }}.*{{ ansible_default_ipv4.address.split('.')[-1] }}$",
line: "{{ ansible_default_ipv4.address }} {{ inventory_hostname }}.{{ domain }} {{ inventory_hostname }}",
}
- {regexp: "^127.0.0.1.+{{ ansible_nodename.split('.')[0] }}$",
line: "127.0.0.1 localhost {{ inventory_hostname }}"
- {
regexp: "^127.0.0.1.+{{ ansible_nodename.split('.')[0] }}$",
line: "127.0.0.1 localhost {{ inventory_hostname }}",
}
- {regexp: "^::1.+{{ ansible_nodename.split('.')[0] }}$",
line: "::1 localhost {{ inventory_hostname }}"
- {
regexp: "^::1.+{{ ansible_nodename.split('.')[0] }}$",
line: "::1 localhost {{ inventory_hostname }}",
}
- {regexp: "^{{ ansible_default_ipv4.address }}.*{{ ansible_nodename.split('.')[0] }}$",
line: "{{ ansible_default_ipv4.address }} {{ inventory_hostname }}.{{ domain }} {{ inventory_hostname }}"
- {
regexp: "^{{ ansible_default_ipv4.address }}.*{{ ansible_nodename.split('.')[0] }}$",
line: "{{ ansible_default_ipv4.address }} {{ inventory_hostname }}.{{ domain }} {{ inventory_hostname }}",
}
when: ansible_virtualization_type != "docker"
@@ -66,4 +71,4 @@
- /etc/resolv.conf
- /etc/hosts
changed_when: false
tags: dns
tags: dns