infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

fix some entries pointing to bastion02 to bastion-iad

Browse source
This commit is contained in:
Stephen Smoogen 2020-06-11 14:09:54 -04:00
parent 9dccde7482
commit 32552ec77e
7 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/run_fasClient.yml
View file

@ -4,7 +4,7 @@
#
- name: run fasClient -a to make email aliases on bastion
hosts: bastion01.phx2.fedoraproject.org:bastion02.phx2.fedoraproject.org
hosts: bastion01.phx2.fedoraproject.org:bastion02.phx2.fedoraproject.org:bastion01.iad2.fedoraproject.org:bastion02.iad2.fedoraproject.org
user: root
gather_facts: False

2
playbooks/run_fasClient_simple.yml
View file

@ -3,7 +3,7 @@
#
- name: run fasClient -a to make email aliases on bastion
hosts: bastion01.phx2.fedoraproject.org:bastion02.phx2.fedoraproject.org
hosts: bastion01.phx2.fedoraproject.org:bastion02.phx2.fedoraproject.org:bastion01.iad2.fedoraproject.org:bastion02.iad2.fedoraproject.org
user: root
gather_facts: False

8
roles/opendkim/files/SigningTable
View file

@ -12,10 +12,10 @@
# "refile:/etc/opendkim/SigningTable" is included in /etc/opendkim.conf.
# Create additional lines for additional domains.
*@fedoraproject.org bastion._domainkey.fedoraproject.org
*@lists.fedoraproject.org bastion._domainkey.fedoraproject.org
*@stg.fedoraproject.org bastion._domainkey.fedoraproject.org
pagure@pagure.io bastion._domainkey.pagure.io
*@fedoraproject.org bastion-iad._domainkey.fedoraproject.org
*@lists.fedoraproject.org bastion-iad._domainkey.fedoraproject.org
*@stg.fedoraproject.org bastion-iad._domainkey.fedoraproject.org
pagure@pagure.io bastion-iad._domainkey.pagure.io
# NON-WILDCARD EXAMPLE
# If "file:" (instead of "refile:") is specified in /etc/opendkim.conf, then

4
roles/opendkim/files/opendkim.conf
View file

@ -88,14 +88,14 @@ Canonicalization relaxed/relaxed
# Domain fedoraproject.org
## Defines the name of the selector to be used when signing messages.
Selector bastion
Selector bastion-iad
## Specifies the minimum number of key bits for acceptable keys and signatures.
MinimumKeyBits 1024
## Gives the location of a private key to be used for signing ALL messages. This
## directive is ignored if KeyTable is enabled.
KeyFile /etc/opendkim/keys/bastion.key
KeyFile /etc/opendkim/keys/bastion-iad.key
## Gives the location of a file mapping key names to signing keys. In simple terms,
## this tells OpenDKIM where to find your keys. If present, overrides any KeyFile

7
roles/opendkim/tasks/main.yml
View file

@ -39,6 +39,13 @@
- config
- base
- name: install bastion-iad opendkim key from private
copy: src={{ private }}/files/opendkim/bastion-iad.key dest=/etc/opendkim/keys/bastion-iad.key mode=0600 owner=opendkim group=opendkim
tags:
- opendkim
- config
- base
- name: install pagure opendkim key from private
copy: src={{ private }}/files/opendkim/pagure.key dest=/etc/opendkim/keys/pagure.key mode=0600 owner=opendkim group=opendkim
tags:

1
roles/openvpn/client/files/client.conf
View file

@ -7,6 +7,7 @@ proto udp
# Specify multiple vpn servers here
remote gateway
remote bastion02
remote bastion-iad01
resolv-retry infinite

1
roles/openvpn/client/templates/client.conf
View file

@ -12,6 +12,7 @@ proto udp
# Specify multiple vpn servers here
remote gateway
remote bastion02
remote bastion-iad01
resolv-retry infinite