From f41baf6f21d4ce1fe8f089fd69e126e0bd1f4740 Mon Sep 17 00:00:00 2001 From: Jiri Kyjovsky Date: Mon, 19 Sep 2022 13:54:00 +0200 Subject: [PATCH] copr: configure list of root users just on one place --- inventory/group_vars/copr_aws | 1 + inventory/group_vars/copr_back_aws | 1 - inventory/group_vars/copr_back_dev_aws | 1 - inventory/group_vars/copr_dev_aws | 1 + inventory/host_vars/copr-be-dev.cloud.fedoraproject.org | 1 - inventory/host_vars/copr-be-stg.fedorainfracloud.org | 1 - inventory/host_vars/copr-be.cloud.fedoraproject.org | 1 - inventory/host_vars/copr-db-stg.aws.fedoraproject.org | 1 - inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org | 1 - inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org | 1 - inventory/host_vars/copr-dist-git-stg.fedorainfracloud.org | 1 - inventory/host_vars/copr-dist-git.aws.fedoraproject.org | 1 - inventory/host_vars/copr-dist-git.fedorainfracloud.org | 1 - inventory/host_vars/copr-fe-dev.aws.fedoraproject.org | 1 - inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org | 1 - inventory/host_vars/copr-fe.aws.fedoraproject.org | 1 - inventory/host_vars/copr-fe.cloud.fedoraproject.org | 1 - inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org | 1 - inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org | 1 - inventory/host_vars/copr-keygen-stg.fedorainfracloud.org | 1 - inventory/host_vars/copr-keygen.aws.fedoraproject.org | 1 - inventory/host_vars/copr-keygen.cloud.fedoraproject.org | 1 - 22 files changed, 2 insertions(+), 20 deletions(-) diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws index fe4bebcdda..f647de8d3a 100644 --- a/inventory/group_vars/copr_aws +++ b/inventory/group_vars/copr_aws @@ -70,5 +70,6 @@ keygen_host: "54.83.48.73" postfix_group: copr rpm_vendor_copr_name: Fedora Copr services_disabled: false +root_auth_users: msuchy frostyx praiskup aws_cloudfront_distribution: E2PUZIRCXCOXTG diff --git a/inventory/group_vars/copr_back_aws b/inventory/group_vars/copr_back_aws index 1a80c9c022..2e12dd75b1 100644 --- a/inventory/group_vars/copr_back_aws +++ b/inventory/group_vars/copr_back_aws @@ -49,7 +49,6 @@ messaging: sent_topics: ^org\.fedoraproject\.{{ env_short }}\.copr\..* nrpe_procs_crit: 2500 nrpe_procs_warn: 2200 -root_auth_users: msuchy pingou frostyx praiskup spawn_in_advance: "true" tcp_ports: [ 22, 80, 443, diff --git a/inventory/group_vars/copr_back_dev_aws b/inventory/group_vars/copr_back_dev_aws index faf8c54c4a..101ddc3262 100644 --- a/inventory/group_vars/copr_back_dev_aws +++ b/inventory/group_vars/copr_back_dev_aws @@ -41,7 +41,6 @@ messaging: key: copr username: copr sent_topics: ^org\.fedoraproject\.{{ env_short }}\.copr\..* -root_auth_users: msuchy pingou frostyx praiskup spawn_in_advance: "false" tcp_ports: [ 22, 80, 443, diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index 0335a692a5..c79e091e4e 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -69,5 +69,6 @@ keygen_host: "54.225.23.248" postfix_group: copr rpm_vendor_copr_name: Fedora Copr (devel) services_disabled: false +root_auth_users: msuchy frostyx praiskup aws_cloudfront_distribution: EX55ITR8LVMOH diff --git a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org index 7c8d88ede9..9602c9a843 100644 --- a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org @@ -34,7 +34,6 @@ nagios_Check_Services: sshd: false swap: false public_ip: 209.132.184.53 -root_auth_users: msuchy pingou frostyx praiskup security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,allow-nagios-persistent,fedmsg-relay-persistent,node-exporter-persistent tcp_ports: ['22', '80', '443', '2003', '4001', # this port is used by node_exporter whose metrics are used by prometheus diff --git a/inventory/host_vars/copr-be-stg.fedorainfracloud.org b/inventory/host_vars/copr-be-stg.fedorainfracloud.org index f7c92d589e..7f69a7036b 100644 --- a/inventory/host_vars/copr-be-stg.fedorainfracloud.org +++ b/inventory/host_vars/copr-be-stg.fedorainfracloud.org @@ -26,7 +26,6 @@ nagios_Check_Services: sshd: false swap: false public_ip: 209.132.184.44 -root_auth_users: msuchy pingou frostyx praiskup security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,allow-nagios-persistent,fedmsg-relay-persistent tcp_ports: ['22', '80', '443', '2003', '4001'] # volumes: copr-be-stg-data diff --git a/inventory/host_vars/copr-be.cloud.fedoraproject.org b/inventory/host_vars/copr-be.cloud.fedoraproject.org index 14577de076..d16c3123b7 100644 --- a/inventory/host_vars/copr-be.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org @@ -35,7 +35,6 @@ nagios_Check_Services: # There is no python2 on F30 public_ip: 209.132.184.48 -root_auth_users: msuchy frostyx praiskup security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,allow-nagios-persistent,node-exporter-persistent tcp_ports: [22, 80, 443, # These 8 ports are used by fedmsg. One for each wsgi thread. diff --git a/inventory/host_vars/copr-db-stg.aws.fedoraproject.org b/inventory/host_vars/copr-db-stg.aws.fedoraproject.org index e09f6e3a77..e48ca98ff2 100644 --- a/inventory/host_vars/copr-db-stg.aws.fedoraproject.org +++ b/inventory/host_vars/copr-db-stg.aws.fedoraproject.org @@ -33,6 +33,5 @@ nagios_Check_Services: sshd: false swap: false public_ip: 52.200.82.86 -root_auth_users: msuchy frostyx praiskup swap_file_path: /swap swap_file_size_mb: 4096 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 53ba20d4a7..10e1324b5c 100644 --- a/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org +++ b/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org @@ -23,6 +23,5 @@ nagios_Check_Services: sshd: false swap: false public_ip: 54.243.51.13 -root_auth_users: msuchy frostyx praiskup swap_file_path: /swap swap_file_size_mb: 2048 diff --git a/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org b/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org index 23f62c2181..73de44db74 100644 --- a/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org +++ b/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org @@ -24,7 +24,6 @@ nagios_Check_Services: sshd: false swap: false public_ip: 209.132.184.179 -root_auth_users: ryanlerch pingou msuchy frostyx praiskup security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,all-icmp-persistent tcp_ports: [22, 80, 443, # node_exporter/prometheus diff --git a/inventory/host_vars/copr-dist-git-stg.fedorainfracloud.org b/inventory/host_vars/copr-dist-git-stg.fedorainfracloud.org index e6ffd942ec..98a2aa1710 100644 --- a/inventory/host_vars/copr-dist-git-stg.fedorainfracloud.org +++ b/inventory/host_vars/copr-dist-git-stg.fedorainfracloud.org @@ -23,7 +23,6 @@ nagios_Check_Services: sshd: false swap: false public_ip: 209.132.184.57 -root_auth_users: ryanlerch pingou msuchy frostyx frostyx praiskup security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,all-icmp-persistent tcp_ports: [22, 80, 443] # volumes: copr-dist-git-stg diff --git a/inventory/host_vars/copr-dist-git.aws.fedoraproject.org b/inventory/host_vars/copr-dist-git.aws.fedoraproject.org index 3da562fe03..76b14a5ddd 100644 --- a/inventory/host_vars/copr-dist-git.aws.fedoraproject.org +++ b/inventory/host_vars/copr-dist-git.aws.fedoraproject.org @@ -26,4 +26,3 @@ nagios_Check_Services: sshd: false swap: false public_ip: 3.89.184.181 -root_auth_users: msuchy frostyx praiskup diff --git a/inventory/host_vars/copr-dist-git.fedorainfracloud.org b/inventory/host_vars/copr-dist-git.fedorainfracloud.org index 8001e2ba46..c8720f29e0 100644 --- a/inventory/host_vars/copr-dist-git.fedorainfracloud.org +++ b/inventory/host_vars/copr-dist-git.fedorainfracloud.org @@ -26,7 +26,6 @@ nagios_Check_Services: # There is no python2 on F30 public_ip: 209.132.184.163 -root_auth_users: msuchy frostyx praiskup security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,all-icmp-persistent tcp_ports: [22, 80, 443, # node_exporter/prometheus diff --git a/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org b/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org index e8a90add65..a813fab27d 100644 --- a/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org +++ b/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org @@ -18,6 +18,5 @@ nagios_Check_Services: swap: false principal_alias: "HTTP/copr.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG" public_ip: 18.208.24.211 -root_auth_users: msuchy frostyx praiskup ttomecek swap_file_path: /swap swap_file_size_mb: 4096 diff --git a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org index 08c6b56e03..fe82fe5893 100644 --- a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org @@ -24,7 +24,6 @@ nagios_Check_Services: sshd: false swap: false public_ip: 209.132.184.55 -root_auth_users: ryanlerch pingou msuchy frostyx praiskup security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,all-icmp-persistent tcp_ports: [22, 80, 443, # node_exporter/prometheus diff --git a/inventory/host_vars/copr-fe.aws.fedoraproject.org b/inventory/host_vars/copr-fe.aws.fedoraproject.org index d11f72e1f2..631aabcb41 100644 --- a/inventory/host_vars/copr-fe.aws.fedoraproject.org +++ b/inventory/host_vars/copr-fe.aws.fedoraproject.org @@ -23,7 +23,6 @@ nagios_Check_Services: sshd: false swap: false public_ip: 3.225.109.36 -root_auth_users: msuchy frostyx praiskup ttomecek sar_output_file: copr.json # GDPR SAR variables sar_script: /usr/share/copr/coprs_frontend/run/copr-gdpr-sar.sh diff --git a/inventory/host_vars/copr-fe.cloud.fedoraproject.org b/inventory/host_vars/copr-fe.cloud.fedoraproject.org index ce3eb66617..1e41781e35 100644 --- a/inventory/host_vars/copr-fe.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-fe.cloud.fedoraproject.org @@ -30,7 +30,6 @@ nagios_Check_Services: # There is no python2 on F30 public_ip: 209.132.184.54 -root_auth_users: msuchy frostyx praiskup sar_output_file: copr.json # GDPR SAR variables sar_script: /usr/share/copr/coprs_frontend/run/copr-gdpr-sar.sh diff --git a/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org b/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org index 12ed45aad6..76ae870431 100644 --- a/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org +++ b/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org @@ -22,4 +22,3 @@ nagios_Check_Services: sshd: false swap: false public_ip: 54.225.23.248 -root_auth_users: msuchy frostyx praiskup diff --git a/inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org index bbba9cc60d..267670c84b 100644 --- a/inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org @@ -24,7 +24,6 @@ nagios_Check_Services: sshd: false swap: false public_ip: 209.132.184.46 -root_auth_users: msuchy frostyx praiskup # todo: remove some security groups ? security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,all-icmp-persistent tcp_ports: [ diff --git a/inventory/host_vars/copr-keygen-stg.fedorainfracloud.org b/inventory/host_vars/copr-keygen-stg.fedorainfracloud.org index bf88efdadb..ee6d182610 100644 --- a/inventory/host_vars/copr-keygen-stg.fedorainfracloud.org +++ b/inventory/host_vars/copr-keygen-stg.fedorainfracloud.org @@ -23,7 +23,6 @@ nagios_Check_Services: sshd: false swap: false public_ip: 209.132.184.56 -root_auth_users: msuchy frostyx praiskup # todo: remove some security groups ? security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,all-icmp-persistent volumes: [{device: '/dev/vdc', volume_id: '5424ff3c-b1c6-4291-a0ed-2d30924f4f88'}] diff --git a/inventory/host_vars/copr-keygen.aws.fedoraproject.org b/inventory/host_vars/copr-keygen.aws.fedoraproject.org index 387782eeb1..1c60e75064 100644 --- a/inventory/host_vars/copr-keygen.aws.fedoraproject.org +++ b/inventory/host_vars/copr-keygen.aws.fedoraproject.org @@ -22,4 +22,3 @@ nagios_Check_Services: sshd: true swap: false public_ip: 54.83.48.73 -root_auth_users: msuchy frostyx praiskup diff --git a/inventory/host_vars/copr-keygen.cloud.fedoraproject.org b/inventory/host_vars/copr-keygen.cloud.fedoraproject.org index 7854865d13..658d1beaff 100644 --- a/inventory/host_vars/copr-keygen.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-keygen.cloud.fedoraproject.org @@ -25,7 +25,6 @@ nagios_Check_Services: sshd: true swap: false public_ip: 209.132.184.49 -root_auth_users: msuchy frostyx praiskup # security_group: default security_group: web-80-anywhere-persistent,ssh-anywhere-persistent,default,allow-nagios-persistent,keygen-persistent tcp_ports: [