main.cf files need to be moved before we claim they are templates
Revert "postfix: install main.cf as template"
This reverts commit 57f75cbcab
.
This commit is contained in:
parent
57f75cbcab
commit
bee7b64fe5
|
@ -1,5 +1,7 @@
|
|||
# Put here configuration for all copr instances (production, devel, ...)
|
||||
---
|
||||
|
||||
# TODO: tamplatize main.cf
|
||||
smtp_auth_relay_host: smtp-auth-cc-rdu01.fedoraproject.org
|
||||
smtp_auth_relay_user: copr@fedoraproject.org
|
||||
smtp_auth_relay_password: "{{ copr_smtp_password }}"
|
||||
|
|
|
@ -314,7 +314,9 @@ unknown_local_recipient_reject_code = 550
|
|||
#relayhost = uucphost
|
||||
#relayhost = [an.ip.add.ress]
|
||||
|
||||
relayhost = {{ smtp_auth_relay_host }}
|
||||
# TODO: tamplatize
|
||||
#relayhost = {{ smtp_auth_relay_host }}
|
||||
relayhost = smtp-auth-cc-rdu01.fedoraproject.org
|
||||
|
||||
smtp_use_tls = yes
|
||||
smtp_sasl_auth_enable = yes
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- name: /etc/postfix/main.cf
|
||||
template: src={{ item }} dest=/etc/postfix/main.cf
|
||||
copy: src={{ item }} dest=/etc/postfix/main.cf
|
||||
with_first_found:
|
||||
- "{{ postfix_maincf }}"
|
||||
- "postfix/main.cf/main.cf.{{ ansible_fqdn }}"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
- name: create the password file
|
||||
copy:
|
||||
dest: /etc/postfix/sasl_passwd
|
||||
content: "{{ smtp_auth_relay_host }} {{ smtp_auth_relay_user }}:{{ smtp_auth_relay_password }}"
|
||||
content: "{{ smtp_auth_relay_host }} {{ smtp_auth_relay_user }}:{{ smtp_auth_relay_password }}"
|
||||
mode: 0600
|
||||
register: smtp_relay_password_file
|
||||
tags:
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
- packages
|
||||
|
||||
- name: /etc/postfix/main.cf
|
||||
template: src={{ item }} dest=/etc/postfix/main.cf
|
||||
copy: src={{ item }} dest=/etc/postfix/main.cf
|
||||
with_first_found:
|
||||
- "{{ postfix_maincf }}"
|
||||
- "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ ansible_fqdn }}"
|
||||
|
|
Loading…
Reference in New Issue