diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index ba65ca1758..c48bed2e0c 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -10,8 +10,8 @@ _forward_src: "forward_dev" # don't forget to update ip in ./copr-keygen-stg, due to custom firewall rules # eth0, eth1 -copr_backend_ips: ["107.20.83.139", "172.30.2.207"] -keygen_host: "34.230.33.105" +copr_backend_ips: ["18.208.10.131", "172.30.2.207"] +keygen_host: "54.225.23.248" backend_base_url: "https://download.copr-dev.fedorainfracloud.org" postfix_group: copr diff --git a/inventory/group_vars/copr_keygen_dev_aws b/inventory/group_vars/copr_keygen_dev_aws index 78bd80b83f..4600279980 100644 --- a/inventory/group_vars/copr_keygen_dev_aws +++ b/inventory/group_vars/copr_keygen_dev_aws @@ -4,8 +4,8 @@ copr_hostbase: copr-keygen-dev tcp_ports: [22] # http + signd dest ports -custom_rules: [ '-A INPUT -p tcp -m tcp -s 107.20.83.139 --dport 80 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 107.20.83.139 --dport 5167 -j ACCEPT', +custom_rules: [ '-A INPUT -p tcp -m tcp -s 18.208.10.131 --dport 80 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 18.208.10.131 --dport 5167 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 172.30.2.207 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 172.30.2.207 --dport 5167 -j ACCEPT'] diff --git a/inventory/host_vars/copr-be-dev.aws.fedoraproject.org b/inventory/host_vars/copr-be-dev.aws.fedoraproject.org index c2e5b688cc..73da7274c1 100644 --- a/inventory/host_vars/copr-be-dev.aws.fedoraproject.org +++ b/inventory/host_vars/copr-be-dev.aws.fedoraproject.org @@ -2,7 +2,7 @@ swap_file_size_mb: 8192 swap_file_path: /swap hostbase: copr-be-dev- -public_ip: 107.20.83.139 +public_ip: 18.208.10.131 nagios_Check_Services: mail: false diff --git a/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org b/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org index 4a4be999e7..a0ff7a1ae0 100644 --- a/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org +++ b/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org @@ -15,7 +15,7 @@ swap_file_path: /swap #image: "{{ fedora31_x86_64 }}" #keypair: fedora-admin-20130801 hostbase: copr-dist-git-dev- -public_ip: 18.232.82.216 +public_ip: 54.243.51.13 root_auth_users: msuchy frostyx praiskup schlupov description: copr dist git - dev instance diff --git a/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org b/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org index 8527f629d7..0e7448ccae 100644 --- a/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org +++ b/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org @@ -10,7 +10,7 @@ swap_file_size_mb: 4096 swap_file_path: /swap hostbase: copr-fe-dev- -public_ip: 54.162.233.242 +public_ip: 18.208.24.211 root_auth_users: msuchy frostyx praiskup schlupov description: copr frontend - dev instance diff --git a/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org b/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org index 0bdb0fe660..fc9efa2342 100644 --- a/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org +++ b/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org @@ -12,7 +12,7 @@ ansible_ifcfg_blocklist: True #image: "{{ fedora31_x86_64 }}" #keypair: fedora-admin-20130801 hostbase: copr-keygen-dev- -public_ip: 34.230.33.105 +public_ip: 54.225.23.248 root_auth_users: msuchy frostyx praiskup schlupov #volumes: [ {volume_id: '9e2b4c55-9ec3-4508-af46-a40f3a5bd982', device: '/dev/vdc'} ] description: copr key gen and sign host - dev instance diff --git a/roles/base/files/postfix/main.cf/main.cf.gateway b/roles/base/files/postfix/main.cf/main.cf.gateway index 539c55b286..a4b2a164b5 100644 --- a/roles/base/files/postfix/main.cf/main.cf.gateway +++ b/roles/base/files/postfix/main.cf/main.cf.gateway @@ -296,7 +296,7 @@ unknown_local_recipient_reject_code = 550 #mynetworks = $config_directory/mynetworks #mynetworks = hash:/etc/postfix/network_table -mynetworks = localhost.localdomain, localhost, 127.0.0.1, 10.3.160.0/19, 192.168.0.0/16, 54.162.233.242, 3.225.109.36 +mynetworks = localhost.localdomain, localhost, 127.0.0.1, 10.3.160.0/19, 192.168.0.0/16, 18.208.24.211, 3.225.109.36 # The relay_domains parameter restricts what destinations this system will # relay mail to. See the smtpd_recipient_restrictions description in diff --git a/roles/opendkim/files/TrustedHosts b/roles/opendkim/files/TrustedHosts index eaa51aa98f..d5442a41c1 100644 --- a/roles/opendkim/files/TrustedHosts +++ b/roles/opendkim/files/TrustedHosts @@ -8,7 +8,7 @@ 10.3.160.0/19 192.168.0.0/16 3.225.109.36 -54.162.233.242 +18.208.24.211 #host.example.com #192.168.1.0/24