Migrate to common_ prefixed vars

This commit is contained in:
2021-09-30 22:57:47 +13:00
parent e42d3c8214
commit b84bcaa7c7
3 changed files with 39 additions and 4 deletions

2
.ansible-lint Normal file
View File

@@ -0,0 +1,2 @@
skip_list:
- role-name

33
.yamllint Normal file
View File

@@ -0,0 +1,33 @@
---
# Based on ansible-lint config
extends: default
rules:
braces:
max-spaces-inside: 1
level: error
brackets:
max-spaces-inside: 1
level: error
colons:
max-spaces-after: -1
level: error
commas:
max-spaces-after: -1
level: error
comments: disable
comments-indentation: disable
document-start: disable
empty-lines:
max: 3
level: error
hyphens:
level: error
indentation: disable
key-duplicates: enable
line-length: disable
new-line-at-end-of-file: disable
new-lines:
type: unix
trailing-spaces: disable
truthy: disable

View File

@@ -20,7 +20,7 @@
}
- { dest: /etc/postfix/main.cf,
regexp: "^.?relayhost =",
line: "relayhost = {{ relayhost }}"
line: "relayhost = {{ common_postfix_relayhost }}"
}
- {
dest: /etc/postfix/main.cf,
@@ -33,11 +33,11 @@
name: postfix
state: started
enabled: yes
when: postfix_configure
when: common_postfix_configure
- name: Ensure root forwarding address is set
lineinfile:
dest: ~/.forward
regexp: "{{ root_email }}"
line: "{{ root_email }}"
regexp: "{{ common_root_email }}"
line: "{{ common_root_email }}"
create: yes