bofh/ansible-role-common
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix apt, hostname

Browse Source
This commit is contained in:
Daniel A. Maierhofer
2018-02-09 17:52:32 +01:00
parent bd71869e2b
commit 5d81b09172
4 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tasks/apt.yml
View File

@@ -3,6 +3,12 @@
apt_key: id="{{ item.id }}" url="{{ item.url }}" file="{{ item.file }}" state="{{ item.state }}" apt_key: id="{{ item.id }}" url="{{ item.url }}" file="{{ item.file }}" state="{{ item.state }}"
with_items: "{{ common_apt_keys }}" with_items: "{{ common_apt_keys }}"
- name: apt - remove /etc/apt/sources.list.d/*
file: path=/etc/apt/sources.list.d/* state=absent
- name: apt - add /etc/apt/sources.list.d/
file: path=/etc/apt/sources.list.d/ state=directory owner=root group=root mode=0755
- name: apt - add repositories - name: apt - add repositories
apt_repository: repo="{{ item }}" update_cache=yes apt_repository: repo="{{ item }}" update_cache=yes
with_items: "{{ common_apt_repositories }}" with_items: "{{ common_apt_repositories }}"

1
tasks/hostname.yml
View File

@@ -12,7 +12,6 @@
group: root group: root
mode: 0644 mode: 0644
backup: yes backup: yes
state: file
- name: /etc/hosts - name: /etc/hosts
template: template:

3
tasks/openssh.yml
View File

@@ -20,3 +20,6 @@
authorized_key: user="root" key="{{ common_openssh_keys_root | join("\n") }}" exclusive=yes authorized_key: user="root" key="{{ common_openssh_keys_root | join("\n") }}" exclusive=yes
when: common_openssh_keys_root when: common_openssh_keys_root
tags: 'ssh-keys' tags: 'ssh-keys'
- name: openssh - truncate /etc/motd
copy: dest=/etc/motd content='' force=yes

63
templates/postfix/master.cf.j2
View File

@@ -1,20 +1,21 @@
# {{ansible_managed}} # {{ansible_managed}}
# #
# Postfix master process configuration file. For details on the format # Postfix master process configuration file. For details on the format
# of the file, see the master(5) manual page (command: "man 5 master"). # of the file, see the master(5) manual page (command: "man 5 master" or
# on-line: http://www.postfix.org/master.5.html).
# #
# Do not forget to execute "postfix reload" after editing this file. # Do not forget to execute "postfix reload" after editing this file.
# #
# ========================================================================== # ==========================================================================
# service type private unpriv chroot wakeup maxproc command + args # service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100) # (yes) (yes) (no) (never) (100)
# ========================================================================== # ==========================================================================
smtp inet n - - - - smtpd smtp inet n - y - - smtpd
#smtp inet n - - - 1 postscreen #smtp inet n - y - 1 postscreen
#smtpd pass - - - - - smtpd #smtpd pass - - y - - smtpd
#dnsblog unix - - - - 0 dnsblog #dnsblog unix - - y - 0 dnsblog
#tlsproxy unix - - - - 0 tlsproxy #tlsproxy unix - - y - 0 tlsproxy
#submission inet n - - - - smtpd #submission inet n - y - - smtpd
# -o syslog_name=postfix/submission # -o syslog_name=postfix/submission
# -o smtpd_tls_security_level=encrypt # -o smtpd_tls_security_level=encrypt
# -o smtpd_sasl_auth_enable=yes # -o smtpd_sasl_auth_enable=yes
@@ -22,9 +23,10 @@ smtp inet n - - - - smtpd
# -o smtpd_client_restrictions=$mua_client_restrictions # -o smtpd_client_restrictions=$mua_client_restrictions
# -o smtpd_helo_restrictions=$mua_helo_restrictions # -o smtpd_helo_restrictions=$mua_helo_restrictions
# -o smtpd_sender_restrictions=$mua_sender_restrictions # -o smtpd_sender_restrictions=$mua_sender_restrictions
# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject # -o smtpd_recipient_restrictions=
# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
# -o milter_macro_daemon_name=ORIGINATING # -o milter_macro_daemon_name=ORIGINATING
#smtps inet n - - - - smtpd #smtps inet n - y - - smtpd
# -o syslog_name=postfix/smtps # -o syslog_name=postfix/smtps
# -o smtpd_tls_wrappermode=yes # -o smtpd_tls_wrappermode=yes
# -o smtpd_sasl_auth_enable=yes # -o smtpd_sasl_auth_enable=yes
@@ -32,34 +34,35 @@ smtp inet n - - - - smtpd
# -o smtpd_client_restrictions=$mua_client_restrictions # -o smtpd_client_restrictions=$mua_client_restrictions
# -o smtpd_helo_restrictions=$mua_helo_restrictions # -o smtpd_helo_restrictions=$mua_helo_restrictions
# -o smtpd_sender_restrictions=$mua_sender_restrictions # -o smtpd_sender_restrictions=$mua_sender_restrictions
# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject # -o smtpd_recipient_restrictions=
# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
# -o milter_macro_daemon_name=ORIGINATING # -o milter_macro_daemon_name=ORIGINATING
#628 inet n - - - - qmqpd #628 inet n - y - - qmqpd
pickup unix n - - 60 1 pickup pickup unix n - y 60 1 pickup
cleanup unix n - - - 0 cleanup cleanup unix n - y - 0 cleanup
qmgr unix n - n 300 1 qmgr qmgr unix n - n 300 1 qmgr
#qmgr unix n - n 300 1 oqmgr #qmgr unix n - n 300 1 oqmgr
tlsmgr unix - - - 1000? 1 tlsmgr tlsmgr unix - - y 1000? 1 tlsmgr
rewrite unix - - - - - trivial-rewrite rewrite unix - - y - - trivial-rewrite
bounce unix - - - - 0 bounce bounce unix - - y - 0 bounce
defer unix - - - - 0 bounce defer unix - - y - 0 bounce
trace unix - - - - 0 bounce trace unix - - y - 0 bounce
verify unix - - - - 1 verify verify unix - - y - 1 verify
flush unix n - - 1000? 0 flush flush unix n - y 1000? 0 flush
proxymap unix - - n - - proxymap proxymap unix - - n - - proxymap
proxywrite unix - - n - 1 proxymap proxywrite unix - - n - 1 proxymap
smtp unix - - - - - smtp smtp unix - - y - - smtp
relay unix - - - - - smtp relay unix - - y - - smtp
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
showq unix n - - - - showq showq unix n - y - - showq
error unix - - - - - error error unix - - y - - error
retry unix - - - - - error retry unix - - y - - error
discard unix - - - - - discard discard unix - - y - - discard
local unix - n n - - local local unix - n n - - local
virtual unix - n n - - virtual virtual unix - n n - - virtual
lmtp unix - - - - - lmtp lmtp unix - - y - - lmtp
anvil unix - - - - 1 anvil anvil unix - - y - 1 anvil
scache unix - - - - 1 scache scache unix - - y - 1 scache
# #
# ==================================================================== # ====================================================================
# Interfaces to non-Postfix software. Be sure to examine the manual # Interfaces to non-Postfix software. Be sure to examine the manual