diff --git a/inventory/group_vars/ci b/inventory/group_vars/ci deleted file mode 100644 index 573c21c58e..0000000000 --- a/inventory/group_vars/ci +++ /dev/null @@ -1,88 +0,0 @@ ---- -############################################################ -# general information -############################################################ -# common items for the releng-* boxes -lvm_size: 50000 -mem_size: 4096 -num_cpus: 4 -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - -tcp_ports: [ 80, 443, "{{ resultsdb_db_port }}" ] -fas_client_groups: sysadmin-qa,sysadmin-noc,sysadmin-web,sysadmin-veteran,sysadmin-ci -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 - -external_hostname: resultsdb.ci.centos.org -deployment_type: prod - -sudoers: "{{ private }}/files/sudo/ci-sudoers" -freezes: false - -# -# PostgreSQL configuration -# - -shared_buffers: "32MB" -effective_cache_size: "512MB" - - -############################################################ -# resultsdb details -############################################################ - -# the db_host_machine bits are so that delegation continues to work, even if -# that db is localhost relative to resultsdb - -resultsdb_db_host_machine: ci-cc-rdu01.fedoraproject.org -resultsdb_db_host: "{{ resultsdb_db_host_machine }}" -resultsdb_db_port: 5432 -resultsdb_endpoint: 'resultsdb_api' -resultsdb_db_name: resultsdb -resultsdb_db_user: "{{ ci_resultsdb_db_user }}" -resultsdb_db_password: "{{ ci_resultsdb_db_password }}" -resultsdb_secret_key: "{{ ci_resultsdb_secret_key }}" - -allowed_hosts: - - 10.5.124 - - 10.5.131 - - -############################################################ -# resultsdb-frontend details -############################################################ -resultsdb_fe_endpoint: "resultsdb" -resultsdb_frontend_secret_key: "{{ ci_resultsdb_frontend_secret_key }}" - - -########################################################### -# execdb details -########################################################### -execdb_db_host_machine: ci-cc-rdu01.fedoraproject.org -execdb_db_host: "{{ execdb_db_host_machine }}" -execdb_db_port: 5432 -execdb_endpoint: 'execdb' -execdb_db_name: execdb -execdb_db_user: "{{ ci_execdb_db_user }}" -execdb_db_password: "{{ ci_execdb_db_password }}" -execdb_secret_key: "{{ ci_execdb_secret_key }}" - - -############################################################ -# fedmsg details -############################################################ -fedmsg_active: False -fedmsg_cert_prefix: ci.resultsdb - -fedmsg_certs: -- service: shell - owner: root - group: sysadmin - can_send: - - logger.log -- service: resultsdb - owner: root - group: apache - can_send: - - taskotron.result.new diff --git a/roles/rkhunter/templates/rkhunter.conf.j2 b/roles/rkhunter/templates/rkhunter.conf.j2 index 9d568ddfdf..b3e3964c1f 100644 --- a/roles/rkhunter/templates/rkhunter.conf.j2 +++ b/roles/rkhunter/templates/rkhunter.conf.j2 @@ -408,7 +408,7 @@ ALLOWDEVFILE=/dev/shm/sem.slapd*.stats {% if inventory_hostname in groups['proxies'] or inventory_hostname in groups['proxies_stg'] %} ALLOWDEVFILE=/dev/shm/libpod_rootless_lock_441 {% endif %} -{% if inventory_hostname in groups['pgbdr'] or inventory_hostname in groups['pgbdr_stg'] or inventory_hostname == 'ci-cc-rdu01.fedoraproject.org' or inventory_hostname == 'hubs01.stg.phx2.fedoraproject.org' or inventory_hostname == 'db-koji01.stg.phx2.fedoraproject.org' or inventory_hostname == 'db-qa03.qa.fedoraproject.org' %} +{% if inventory_hostname in groups['pgbdr'] or inventory_hostname in groups['pgbdr_stg'] or inventory_hostname == 'hubs01.stg.phx2.fedoraproject.org' or inventory_hostname == 'db-koji01.stg.phx2.fedoraproject.org' or inventory_hostname == 'db-qa03.qa.fedoraproject.org' %} ALLOWDEVFILE=/dev/shm/PostgreSQL* {% endif %}