From 6a3816dfdc5f543ff250b3e1d641bf56768f1507 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Wed, 18 Dec 2024 08:23:28 +1000 Subject: [PATCH] ansiblelint fixes-- fqcn[action-core] - copy to ansible.builtin.copy Replaces many references to 'copy' with ansible.builtin.copy Signed-off-by: Ryan Lerch --- playbooks/groups/buildhw.yml | 4 +- playbooks/groups/buildvm.yml | 2 +- playbooks/groups/copr-pulp.yml | 2 +- playbooks/groups/debuginfod.yml | 4 +- playbooks/groups/download.yml | 18 +++--- playbooks/groups/logserver.yml | 2 +- playbooks/groups/maintainer-test.yml | 2 +- playbooks/groups/os-control.yml | 4 +- playbooks/groups/os-proxies.yml | 2 +- playbooks/groups/pkgs.yml | 2 +- playbooks/groups/proxies.yml | 4 +- playbooks/groups/releng-compose.yml | 8 +-- playbooks/groups/secondary.yml | 6 +- playbooks/groups/virthost.yml | 4 +- playbooks/include/proxies-fedorahosted.yml | 4 +- playbooks/manual/gdpr/sar.yml | 2 +- playbooks/manual/gdpr/sar_openshift.yml | 2 +- .../manual/import-irc-cookies-to-matrix.yml | 4 +- .../fix-home-fedora-ownerships.yml | 2 +- playbooks/manual/ocp4-place-ignitionfiles.yml | 2 +- playbooks/manual/rebuild/hotspot.yml | 4 +- playbooks/manual/remote_delldrive.yml | 2 +- playbooks/manual/sign-and-import.yml | 6 +- playbooks/manual/staging-sync/bodhi.yml | 6 +- playbooks/manual/staging-sync/db-sync.yml | 2 +- playbooks/manual/staging-sync/mailman.yml | 20 +++--- playbooks/manual/sync-hosts.yml | 2 +- playbooks/manual/update-firmware.yml | 2 +- playbooks/update_ticketkey.yml | 2 +- roles/abrt/faf-pre/tasks/main.yml | 2 +- roles/abrt/faf/tasks/check.yml | 2 +- roles/abrt/faf/tasks/install.yml | 4 +- roles/ansible-server/tasks/main.yml | 2 +- roles/apache/tasks/main.yml | 6 +- roles/apps-fp-o/tasks/main.yml | 4 +- roles/base/tasks/keytab.yml | 2 +- roles/base/tasks/main.yml | 36 +++++------ roles/base/tasks/postfix.yml | 14 ++-- roles/base/tasks/watchdog.yml | 2 +- roles/basessh/tasks/main.yml | 2 +- roles/batcave/tasks/main.yml | 64 +++++++++---------- roles/bkernel/tasks/main.yml | 4 +- roles/blockerbugs/tasks/main.yml | 6 +- roles/bodhi2/backend/tasks/main.yml | 30 ++++----- roles/bugzilla2fedmsg/tasks/main.yml | 4 +- roles/bz_review_report/tasks/main.yml | 4 +- roles/cgit/base/tasks/main.yml | 8 +-- roles/cgit/clean_lock_cron/tasks/main.yml | 2 +- roles/cgit/make_pkgs_list/tasks/main.yml | 8 +-- roles/check-compose/tasks/main.yml | 4 +- roles/clamav/tasks/main.yml | 6 +- roles/cloudstats/tasks/main.yml | 4 +- roles/collectd/base/tasks/main.yml | 10 +-- roles/collectd/bind/tasks/main.yml | 2 +- roles/collectd/fcomm-queue/tasks/main.yml | 6 +- .../collectd/fedmsg-activation/tasks/main.yml | 4 +- roles/collectd/memcached/tasks/main.yml | 2 +- roles/collectd/server/tasks/main.yml | 12 ++-- .../files/provision/create_swap_file.yml | 4 +- ...ybook-prepare-builder-to-create-images.yml | 6 +- .../provision/provision_builder_tasks.yml | 12 ++-- roles/copr/backend/tasks/copr-ping.yml | 2 +- .../copr/backend/tasks/install_cloud_cert.yml | 2 +- roles/copr/backend/tasks/main.yml | 26 ++++---- roles/copr/backend/tasks/mount_fs.yml | 2 +- roles/copr/backend/tasks/network.yml | 2 +- roles/copr/backend/tasks/pulp.yml | 2 +- roles/copr/backend/tasks/resalloc.yml | 8 +-- roles/copr/base/tasks/main.yml | 8 +-- roles/copr/dist_git/tasks/main.yml | 22 +++---- roles/copr/frontend/tasks/main.yml | 22 +++---- roles/copr/frontend/tasks/psql_setup.yml | 8 +-- roles/copr/hypervisor/tasks/main.yml | 14 ++-- roles/copr/keygen/tasks/main.yml | 4 +- roles/copr/keygen/tasks/setup_backup.yml | 9 ++- roles/developer/build/tasks/main.yml | 8 +-- roles/developer/website/tasks/main.yml | 4 +- roles/dhcp_server/tasks/main.yml | 2 +- roles/distgit/pagure/tasks/main.yml | 12 ++-- roles/distgit/tasks/main.yml | 34 +++++----- roles/dns/tasks/main.yml | 16 ++--- roles/docker-distribution/tasks/main.yml | 6 +- roles/download/tasks/main.yml | 12 ++-- roles/easyfix/gather/tasks/main.yml | 6 +- roles/easyfix/proxy/tasks/main.yml | 2 +- roles/fasjson/tasks/main.yml | 4 +- roles/fedmsg/base/tasks/main.yml | 10 +-- roles/fedmsg/crl/tasks/main.yml | 4 +- roles/fedmsg/gateway/slave/tasks/main.yml | 6 +- roles/fedmsg/gateway/tasks/main.yml | 4 +- roles/fedmsg/hub/tasks/main.yml | 2 +- roles/fedora-budget/build/tasks/main.yml | 18 ++++-- roles/fedora-budget/proxy/tasks/main.yml | 6 +- roles/fedora-docs/build/tasks/main.yml | 18 ++++-- roles/fedora-docs/proxy/tasks/main.yml | 12 ++-- roles/fedora-docs/translation/tasks/main.yml | 6 +- roles/fedora-messaging-utils/tasks/main.yml | 2 +- roles/fedora-web/alt/tasks/main.yml | 4 +- roles/fedora-web/build/tasks/main.yml | 2 +- .../candidate-registry/tasks/main.yml | 2 +- roles/fedora-web/codecs/tasks/main.yml | 4 +- roles/fedora-web/community/tasks/main.yml | 4 +- roles/fedora-web/fedora.im/tasks/main.yml | 6 +- roles/fedora-web/flocktofedora/tasks/main.yml | 4 +- roles/fedora-web/getfedora/tasks/main.yml | 4 +- roles/fedora-web/iot/tasks/main.yml | 4 +- roles/fedora-web/labs/tasks/main.yml | 4 +- roles/fedora-web/main/tasks/main.yml | 18 +++--- roles/fedora-web/mirrors/tasks/main.yml | 4 +- roles/fedora-web/ols/tasks/main.yml | 2 +- roles/fedora-web/ostree/tasks/main.yml | 8 +-- roles/fedora-web/registry/tasks/main.yml | 6 +- roles/fedora-web/src/tasks/main.yml | 4 +- roles/fedora-web/start/tasks/main.yml | 4 +- roles/fedora-web/translation/tasks/main.yml | 8 +-- roles/fedora_nightlies/tasks/main.yml | 4 +- roles/fedoraloveskde/build/tasks/main.yml | 6 +- roles/fedoraloveskde/website/tasks/main.yml | 4 +- roles/flatpak-cache/tasks/main.yml | 2 +- roles/freemedia/tasks/main.yml | 10 +-- roles/geoip-city-wsgi/app/tasks/main.yml | 4 +- roles/geoip-city-wsgi/proxy/tasks/main.yml | 2 +- roles/geoip/tasks/main.yml | 6 +- roles/git/checks/tasks/main.yml | 4 +- roles/git/hooks/tasks/main.yml | 4 +- roles/git/make_checkout_seed/tasks/main.yml | 4 +- roles/github2fedmsg/tasks/main.yml | 4 +- roles/grobisplitter/tasks/main.yml | 4 +- roles/haproxy/tasks/main.yml | 8 +-- roles/hosts/tasks/main.yml | 4 +- roles/httpd/certificate/tasks/main.yml | 6 +- roles/httpd/fingerprints/tasks/main.yml | 6 +- roles/httpd/mod_ssl/tasks/main.yml | 2 +- roles/httpd/proxy/tasks/main.yml | 6 +- roles/ipsilon/tasks/main.yml | 8 +-- roles/ipsilon/tasks/patches.yml | 2 +- roles/iscsi_client/tasks/main.yml | 2 +- roles/keepalived/tasks/main.yml | 2 +- roles/keytab/service/tasks/main.yml | 2 +- roles/koji_builder/tasks/main.yml | 14 ++-- roles/koji_hub/tasks/main.yml | 32 +++++----- roles/kojipkgs/tasks/main.yml | 6 +- roles/letsencrypt/tasks/main.yml | 14 ++-- roles/logging/tasks/main.yml | 6 +- roles/mariadb_server/tasks/main.yml | 4 +- roles/mediawiki/tasks/main.yml | 10 +-- roles/memcached/tasks/main.yml | 2 +- roles/messaging/base/tasks/main.yml | 12 ++-- roles/mirror_pagure_ansible/tasks/main.yml | 2 +- .../mirrorlist_proxy/tasks/main.yml | 8 +-- roles/mod_limitipconn/tasks/main.yml | 2 +- roles/mod_wsgi/tasks/main.yml | 2 +- roles/mote/tasks/main.yml | 4 +- roles/nagios_client/tasks/main.yml | 8 +-- roles/nagios_server/tasks/main.yml | 32 +++++----- roles/nfs/client/tasks/main.yml | 2 +- roles/nfs/server/tasks/main.yml | 2 +- roles/opendkim/tasks/main.yml | 14 ++-- roles/openqa/dispatcher/tasks/main.yml | 18 +++--- roles/openqa/server/tasks/main.yml | 10 +-- roles/openqa/worker/tasks/createhdds.yml | 2 +- roles/openqa/worker/tasks/main.yml | 14 ++-- roles/openqa/worker/tasks/tap-setup.yml | 2 +- roles/openshift/object/tasks/main.yml | 2 +- roles/openshift/secret-file/tasks/main.yml | 4 +- roles/openshift/secret-tls/tasks/main.yml | 4 +- roles/openvpn/base/tasks/main.yml | 8 +-- roles/openvpn/client/tasks/main.yml | 4 +- roles/openvpn/server/tasks/main.yml | 2 +- roles/packager_alias/tasks/main.yml | 6 +- roles/packages3/bugz.fp.o/tasks/main.yml | 2 +- roles/packages3/web/tasks/main.yml | 10 +-- roles/pager_server/tasks/main.yml | 4 +- roles/pagure/tasks/main.yml | 20 +++--- roles/people/tasks/main.yml | 22 +++---- roles/pkgdb-proxy/tasks/main.yml | 4 +- roles/planet/tasks/main.yml | 56 ++++++++-------- roles/postfix_logreport/tasks/main.yml | 4 +- roles/postgresql_server/tasks/main.yml | 18 +++--- roles/push-container-registry/tasks/main.yml | 4 +- roles/rabbitmq/tasks/main.yml | 2 +- roles/rabbitmq_cluster/tasks/main.yml | 26 ++++---- .../tasks/vhost-centos-odcs.yml | 2 +- roles/relvalconsumer/tasks/main.yml | 6 +- roles/repo2json/tasks/main.yml | 2 +- roles/review-stats/proxy/tasks/main.yml | 2 +- roles/rkhunter/tasks/main.yml | 2 +- roles/robosignatory/tasks/main.yml | 18 +++--- roles/rsyncd/tasks/main.yml | 6 +- roles/security.txt/tasks/main.yml | 4 +- roles/selinux/module/tasks/main.yml | 2 +- roles/sigul/server/tasks/main.yml | 6 +- roles/smtp-auth-relay/tasks/main.yml | 2 +- roles/spamassassin/tasks/main.yml | 8 +-- roles/sudo/tasks/main.yml | 6 +- roles/supybot/tasks/main.yml | 18 +++--- roles/testcase_stats/tasks/main.yml | 2 +- roles/tftp_server/tasks/main.yml | 4 +- roles/torrent/tasks/main.yml | 2 +- roles/virthost/tasks/main.yml | 6 +- roles/web-data-analysis/tasks/main.yml | 30 ++++----- roles/weblate-backup/tasks/main.yml | 4 +- roles/yubikey/tasks/main.yml | 2 +- roles/zabbix/zabbix_agent/tasks/main.yml | 4 +- roles/zabbix/zabbix_agent/tasks/tools.yml | 2 +- roles/zabbix/zabbix_server/tasks/plugins.yml | 2 +- roles/zanata/tasks/main.yml | 2 +- tasks/cloud_setup_basic.yml | 2 +- tasks/confine_ssh.yml | 2 +- tasks/openvpn_client.yml | 10 +-- tasks/openvpn_client_7.yml | 10 +-- tasks/postfix_basic.yml | 2 +- tasks/rdiff_backup_server.yml | 4 +- tasks/reg-server.yml | 12 ++-- tasks/serialgetty.yml | 2 +- tasks/swap.yml | 2 +- tasks/yumrepos.yml | 18 +++--- 217 files changed, 790 insertions(+), 769 deletions(-) diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 298c13ee9f..3b64b0acf5 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -17,7 +17,7 @@ - import_tasks: "{{ tasks_path }}/yumrepos.yml" - name: override nbde_client-network-flush to work around bug - copy: + ansible.builtin.copy: src: "{{ files }}/common/nbde_client-network-flush" dest: /usr/bin/nbde_client-network-flush owner: root @@ -25,7 +25,7 @@ mode: 755 - name: tell NetworkManager we don't want any auto connections - copy: + ansible.builtin.copy: src: "{{ files }}/common/noautodefault.conf" dest: /etc/NetworkManager/conf.d/noautodefault.conf owner: root diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index a965c81c3b..906e079849 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -114,7 +114,7 @@ tasks: - name: Put sshfs key in place - copy: + ansible.builtin.copy: src="{{ private }}/files/releng/sshkeys/primary-s390x-sshfs{{ '-staging' if env == 'staging' else '' }}" dest="/etc/primary-s390x-sshfs" owner=root group=root mode=0600 diff --git a/playbooks/groups/copr-pulp.yml b/playbooks/groups/copr-pulp.yml index 076ab02e6d..e58c2be5b0 100644 --- a/playbooks/groups/copr-pulp.yml +++ b/playbooks/groups/copr-pulp.yml @@ -50,7 +50,7 @@ become: true - name: Temporarily dump keys so we can add them to bitwarden - copy: + ansible.builtin.copy: content: "{{ copr_dev_pulp_default_admin_password }}" dest: /tmp/pulp_default_admin_password mode: "000" diff --git a/playbooks/groups/debuginfod.yml b/playbooks/groups/debuginfod.yml index 4ffebd847d..8165ed0e3e 100644 --- a/playbooks/groups/debuginfod.yml +++ b/playbooks/groups/debuginfod.yml @@ -54,7 +54,7 @@ tags: debuginfod - name: install debuginfod configuration - copy: src="{{ files }}/debuginfod/sysconfig.debuginfod" dest=/etc/sysconfig/debuginfod owner=root group=root mode=644 + ansible.builtin.copy: src="{{ files }}/debuginfod/sysconfig.debuginfod" dest=/etc/sysconfig/debuginfod owner=root group=root mode=644 tags: debuginfod notify: - restart debuginfod @@ -67,7 +67,7 @@ - name: install debuginfod systemd drop-in tags: debuginfod - copy: src="{{ files }}/debuginfod/debuginfod.service.d" dest=/etc/systemd/system/debuginfod.service.d/override.conf owner=root group=root mode=644 + ansible.builtin.copy: src="{{ files }}/debuginfod/debuginfod.service.d" dest=/etc/systemd/system/debuginfod.service.d/override.conf owner=root group=root mode=644 notify: - restart debuginfod diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 2e8f85a6af..11ae75e9fa 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -53,35 +53,35 @@ - import_tasks: "{{ tasks_path }}/motd.yml" - name: put in script for syncing fedora on download-ib01 - copy: src="{{ files }}/download/sync-up-downloads.sh.ib01" dest=/usr/local/bin/sync-up-downloads owner=root group=root mode=755 + ansible.builtin.copy: src="{{ files }}/download/sync-up-downloads.sh.ib01" dest=/usr/local/bin/sync-up-downloads owner=root group=root mode=755 when: inventory_hostname == 'download-ib01.fedoraproject.org' - name: put in script for syncing fedora-alt on download-ib01 - copy: src="{{ files }}/download/sync-up-other.sh.ib01" dest=/usr/local/bin/sync-up-other owner=root group=root mode=755 + ansible.builtin.copy: src="{{ files }}/download/sync-up-other.sh.ib01" dest=/usr/local/bin/sync-up-other owner=root group=root mode=755 when: inventory_hostname == 'download-ib01.fedoraproject.org' - name: put in script for syncing centos on download-ib01 - copy: src="{{ files }}/download/sync-up-centos.sh.ib01" dest=/usr/local/bin/sync-up-centos owner=root group=root mode=755 + ansible.builtin.copy: src="{{ files }}/download/sync-up-centos.sh.ib01" dest=/usr/local/bin/sync-up-centos owner=root group=root mode=755 when: inventory_hostname == 'download-ib01.fedoraproject.org' - name: put in cron job for syncing - copy: src="{{ files }}/download/download-sync.cron.ib01" dest=/etc/cron.d/download-sync owner=root group=root mode=644 + ansible.builtin.copy: src="{{ files }}/download/download-sync.cron.ib01" dest=/etc/cron.d/download-sync owner=root group=root mode=644 when: inventory_hostname == 'download-ib01.fedoraproject.org' - name: put in last sync scrypt for download-ib01 - copy: src="{{ files}}/download/last-sync" dest=/usr/local/bin/last-sync mode=0755 + ansible.builtin.copy: src="{{ files}}/download/last-sync" dest=/usr/local/bin/last-sync mode=0755 when: inventory_hostname == 'download-ib01.fedoraproject.org' - name: install bc so last-sync works. package: name=bc state=present when: inventory_hostname == 'download-ib01.fedoraproject.org' - name: put in script for syncing on download-cc-rdu01 - copy: src="{{ files }}/download/sync-up-downloads.sh.cc-rdu01" dest=/usr/local/bin/sync-up-downloads owner=root group=root mode=755 + ansible.builtin.copy: src="{{ files }}/download/sync-up-downloads.sh.cc-rdu01" dest=/usr/local/bin/sync-up-downloads owner=root group=root mode=755 when: inventory_hostname == 'download-cc-rdu01.fedoraproject.org' - name: put in script for syncing centos on download-cc-rdu01 - copy: src="{{ files }}/download/sync-up-centos.sh.cc-rdu01" dest=/usr/local/bin/sync-up-centos owner=root group=root mode=755 + ansible.builtin.copy: src="{{ files }}/download/sync-up-centos.sh.cc-rdu01" dest=/usr/local/bin/sync-up-centos owner=root group=root mode=755 when: inventory_hostname == 'download-cc-rdu01.fedoraproject.org' - name: put in cron job for syncing on download-cc-rdu01 - copy: src="{{ files }}/download/download-sync.cron.cc-rdu01" dest=/etc/cron.d/download-sync owner=root group=root mode=644 + ansible.builtin.copy: src="{{ files }}/download/download-sync.cron.cc-rdu01" dest=/etc/cron.d/download-sync owner=root group=root mode=644 when: inventory_hostname == 'download-cc-rdu01.fedoraproject.org' - name: put in last sync scrypt for download-cc-rdu01 - copy: src="{{ files}}/download/last-sync" dest=/usr/local/bin/last-sync mode=0755 + ansible.builtin.copy: src="{{ files}}/download/last-sync" dest=/usr/local/bin/last-sync mode=0755 when: inventory_hostname == 'download-cc-rdu01.fedoraproject.org' - name: make a mnt/koji link diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 217833eb0f..abb13ed9cf 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -50,7 +50,7 @@ # and it takes a long long time to run restorecon over them. # - name: exclude some directories from selinux relabeling on updates - copy: src="{{ files }}/logserver/fixfiles_exclude_dirs" dest=/etc/selinux/fixfiles_exclude_dirs owner=root mode=0644 + ansible.builtin.copy: src="{{ files }}/logserver/fixfiles_exclude_dirs" dest=/etc/selinux/fixfiles_exclude_dirs owner=root mode=0644 handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml index de036a9651..a318367a52 100644 --- a/playbooks/groups/maintainer-test.yml +++ b/playbooks/groups/maintainer-test.yml @@ -35,7 +35,7 @@ - packages - name: Allow packagers to use mock - copy: dest=/etc/pam.d/mock src="{{ files }}/common/mock" + ansible.builtin.copy: dest=/etc/pam.d/mock src="{{ files }}/common/mock" tags: - config diff --git a/playbooks/groups/os-control.yml b/playbooks/groups/os-control.yml index 10d9e4d299..c39764e848 100644 --- a/playbooks/groups/os-control.yml +++ b/playbooks/groups/os-control.yml @@ -34,7 +34,7 @@ mode: "0770" - name: copy oc rpm - copy: + ansible.builtin.copy: src: /srv/web/infra/bigfiles/openshiftboot/oc-client/oc-client.rpm dest: /root/oc-client.rpm @@ -44,7 +44,7 @@ state: installed - name: copy the jobs-summary script - copy: + ansible.builtin.copy: src: "{{ files }}/scripts/jobs-summary" dest: /usr/local/bin/jobs-summary mode: "0755" diff --git a/playbooks/groups/os-proxies.yml b/playbooks/groups/os-proxies.yml index e5e8b5ad4c..d0ff3dbe04 100644 --- a/playbooks/groups/os-proxies.yml +++ b/playbooks/groups/os-proxies.yml @@ -34,7 +34,7 @@ package: name=haproxy state=present - name: install haproxy config - copy: src="{{ files }}/communishift/haproxy.cfg" dest=/etc/haproxy/haproxy.cfg + ansible.builtin.copy: src="{{ files }}/communishift/haproxy.cfg" dest=/etc/haproxy/haproxy.cfg - name: Turn on certain selinux booleans so haproxy can bind to ports seboolean: name=haproxy_connect_any state=true persistent=true diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index a0c6b03746..681eeac974 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -26,7 +26,7 @@ tasks: - name: Copy keytab - copy: src={{private}}/files/keytabs/{{env}}/pkgs + ansible.builtin.copy: src={{private}}/files/keytabs/{{env}}/pkgs dest=/etc/httpd.keytab owner=apache group=apache mode=0600 tags: diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index aa600930db..32ed9f43d5 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -46,7 +46,7 @@ # - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" - name: Ensure nf_conntrack module is loaded before tuning ip_conntrack_max - copy: + ansible.builtin.copy: content: | nf_conntrack dest: /etc/modules-load.d/nf_conntrack.conf @@ -138,7 +138,7 @@ # If it's not, doesn't hurt to copy it over again # - name: deploy ticket key - copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey_{{env}}.tkey + ansible.builtin.copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey_{{env}}.tkey owner=root group=root mode=0600 notify: - reload proxyhttpd diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index cb46eb098e..c051541060 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -206,7 +206,7 @@ - containerrebuild - name: set releng user keytab - copy: + ansible.builtin.copy: src: "{{private}}/files/keytabs/{{env}}/releng" dest: /etc/krb5.releng.keytab owner: root @@ -216,7 +216,7 @@ - containerrebuild - name: copy releng ssh key for rebuild fedpkg/distgit pushes - copy: + ansible.builtin.copy: src: "{{private}}/files/releng/sshkeys/container-rebuild-{{env}}" dest: /etc/pki/releng owner: root @@ -226,7 +226,7 @@ - containerrebuild - name: place relengpush script for automatic rebuilds - copy: + ansible.builtin.copy: src: "{{files}}/releng/relengpush" dest: "/usr/local/bin/relengpush" owner: root @@ -236,7 +236,7 @@ - containerrebuild - name: place relengpush int script for automatic rebuilds - copy: + ansible.builtin.copy: src: "{{files}}/releng/relengpush-int" dest: "/usr/local/bin/relengpush-int" owner: root diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index 980d40b63f..726c0f2fc7 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -66,13 +66,13 @@ - python3-productmd - name: add create-filelist script from quick-fedora-mirror - copy: src="{{ files }}/scripts/create-filelist.py2" dest=/usr/local/bin/create-filelist mode=0755 + ansible.builtin.copy: src="{{ files }}/scripts/create-filelist.py2" dest=/usr/local/bin/create-filelist mode=0755 - name: add cron script to update fullfiletimelist - copy: src="{{ files }}/scripts/update-fullfiletimelist" dest=/usr/local/bin/update-fullfiletimelist mode=0755 + ansible.builtin.copy: src="{{ files }}/scripts/update-fullfiletimelist" dest=/usr/local/bin/update-fullfiletimelist mode=0755 - name: add cron script to prune old logs at /srv/pub/alt/linuxsystemroles/logs - copy: src="{{ files }}/scripts/linuxsystemroles-logs-clean" dest=/usr/local/bin/linuxsystemroles-logs-clean mode=0755 + ansible.builtin.copy: src="{{ files }}/scripts/linuxsystemroles-logs-clean" dest=/usr/local/bin/linuxsystemroles-logs-clean mode=0755 - name: Update fullfiletimelist job cron: name="update-fullfiletimelist" hour="*/2" minute="55" user="root" diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 0358b43bc7..25250c15cd 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -22,7 +22,7 @@ - import_tasks: "{{ tasks_path }}/yumrepos.yml" - name: override nbde_client-network-flush to work around bug - copy: + ansible.builtin.copy: src: "{{ files }}/common/nbde_client-network-flush" dest: /usr/bin/nbde_client-network-flush owner: root @@ -30,7 +30,7 @@ mode: 755 - name: tell NetworkManager we don't want any auto connections - copy: + ansible.builtin.copy: src: "{{ files }}/common/noautodefault.conf" dest: /etc/NetworkManager/conf.d/noautodefault.conf owner: root diff --git a/playbooks/include/proxies-fedorahosted.yml b/playbooks/include/proxies-fedorahosted.yml index 9bb760b209..04615b316c 100644 --- a/playbooks/include/proxies-fedorahosted.yml +++ b/playbooks/include/proxies-fedorahosted.yml @@ -23,7 +23,7 @@ - '/etc/httpd/conf.d/git.fedorahosted.org' - name: Install special fedorahosted-redirects.conf with fedorahosted redirects - copy: src={{ files }}/httpd/fedorahosted-redirects.conf dest=/etc/httpd/conf.d/fedorahosted.org/fedorahosted-redirects.conf + ansible.builtin.copy: src={{ files }}/httpd/fedorahosted-redirects.conf dest=/etc/httpd/conf.d/fedorahosted.org/fedorahosted-redirects.conf - name: Install special git.fedorahosted-redirects.conf with git.fedorahosted redirects - copy: src={{ files }}/httpd/git.fedorahosted-redirects.conf dest=/etc/httpd/conf.d/git.fedorahosted.org/fedorahosted-redirects.conf + ansible.builtin.copy: src={{ files }}/httpd/git.fedorahosted-redirects.conf dest=/etc/httpd/conf.d/git.fedorahosted.org/fedorahosted-redirects.conf diff --git a/playbooks/manual/gdpr/sar.yml b/playbooks/manual/gdpr/sar.yml index b7e9ca1cdd..078f92f9c5 100644 --- a/playbooks/manual/gdpr/sar.yml +++ b/playbooks/manual/gdpr/sar.yml @@ -29,7 +29,7 @@ become_user: "{{ sar_script_user }}" when: "sar_huge is not defined or not sar_huge" # Store the result on disk - - copy: + - ansible.builtin.copy: content: "{{ sar_data['stdout'] }}" dest: "{{ hostvars['localhost']['sar_tmp_dir'] }}/{{ sar_output_file }}" delegate_to: localhost diff --git a/playbooks/manual/gdpr/sar_openshift.yml b/playbooks/manual/gdpr/sar_openshift.yml index 2e2dfb9c24..8a3056e92b 100644 --- a/playbooks/manual/gdpr/sar_openshift.yml +++ b/playbooks/manual/gdpr/sar_openshift.yml @@ -10,7 +10,7 @@ register: sar_data # Store the result on disk - name: Copy the output data locally - copy: + ansible.builtin.copy: content: "{{ sar_data['stdout'] }}" dest: "{{ hostvars['localhost']['sar_tmp_dir'] }}/{{ item.value.sar_output_file }}" delegate_to: localhost diff --git a/playbooks/manual/import-irc-cookies-to-matrix.yml b/playbooks/manual/import-irc-cookies-to-matrix.yml index bb44ae3406..5e2e6e1bf6 100644 --- a/playbooks/manual/import-irc-cookies-to-matrix.yml +++ b/playbooks/manual/import-irc-cookies-to-matrix.yml @@ -13,7 +13,7 @@ tasks: - name: Add the pgpass file - copy: + ansible.builtin.copy: content: | db01{{ env_suffix }}.iad2.fedoraproject.org:*:maubot:maubot:{{ (env == 'production')|ternary(maubot_prod_db_password, maubot_stg_db_password) }} dest: /root/.pgpass @@ -27,7 +27,7 @@ name: python3-psycopg2 - name: Install the import script - copy: + ansible.builtin.copy: src: "{{ files }}/zodbot/karma-to-cookies-db.py" dest: /usr/local/bin/karma-to-cookies-db mode: "0755" diff --git a/playbooks/manual/noggin-deployment/fix-home-fedora-ownerships.yml b/playbooks/manual/noggin-deployment/fix-home-fedora-ownerships.yml index 795014ccda..ae7bdc944a 100644 --- a/playbooks/manual/noggin-deployment/fix-home-fedora-ownerships.yml +++ b/playbooks/manual/noggin-deployment/fix-home-fedora-ownerships.yml @@ -16,7 +16,7 @@ register: home_fedora_res - name: Copy the script to the host - copy: + ansible.builtin.copy: src: "{{ files }}/scripts/fix-home-fedora-ownerships.sh" dest: /usr/local/sbin/fix-home-fedora-ownerships.sh mode: "0755" diff --git a/playbooks/manual/ocp4-place-ignitionfiles.yml b/playbooks/manual/ocp4-place-ignitionfiles.yml index 1a484d54ec..44175b64d5 100644 --- a/playbooks/manual/ocp4-place-ignitionfiles.yml +++ b/playbooks/manual/ocp4-place-ignitionfiles.yml @@ -42,7 +42,7 @@ dest: "/var/www/html/rhcos/.treeinfo" mode: "0644" - name: == OCP KVM provisioning == Copy kubeadmin config files to bastion - copy: + ansible.builtin.copy: src: "/srv/web/infra/bigfiles/openshiftboot/{{ env }}/auth/" dest: "/root/ocp4/ocp-{{env}}/" - name: == OCP KVM provisioning == Downloading RHCOS deploy files diff --git a/playbooks/manual/rebuild/hotspot.yml b/playbooks/manual/rebuild/hotspot.yml index 287f52d086..70ceded4cd 100644 --- a/playbooks/manual/rebuild/hotspot.yml +++ b/playbooks/manual/rebuild/hotspot.yml @@ -9,4 +9,6 @@ tasks: - ansible.builtin.file: dest=/srv/web/fedoraproject.org/static/ state=directory - - copy: src=hotspot.txt dest=/srv/web/fedoraproject.org/static/hotspot.txt + - ansible.builtin.copy: + src: hotspot.txt + dest: /srv/web/fedoraproject.org/static/hotspot.txt diff --git a/playbooks/manual/remote_delldrive.yml b/playbooks/manual/remote_delldrive.yml index 01456597da..d3658ed6ac 100644 --- a/playbooks/manual/remote_delldrive.yml +++ b/playbooks/manual/remote_delldrive.yml @@ -10,7 +10,7 @@ tasks: - name: Copy script over to {{target}} - copy: src={{private}}/scripts/drivestatus.py dest=/root/drivestatus.py + ansible.builtin.copy: src={{private}}/scripts/drivestatus.py dest=/root/drivestatus.py - name: Run it for {{mgmt}} shell: python /root/drivestatus.py {{mgmt}} diff --git a/playbooks/manual/sign-and-import.yml b/playbooks/manual/sign-and-import.yml index 37a6e58838..ae7e04063f 100644 --- a/playbooks/manual/sign-and-import.yml +++ b/playbooks/manual/sign-and-import.yml @@ -47,7 +47,7 @@ ansible.builtin.file: path={{ rpmdir }}-old state=directory - name: Copy the source rpms to the SRPMS dir of {{ repodir }} - copy: src={{ item }} dest={{ repodir }}/SRPMS/ + ansible.builtin.copy: src={{ item }} dest={{ repodir }}/SRPMS/ with_fileglob: - "{{ rpmdir }}/*.src.rpm" @@ -58,12 +58,12 @@ - "{{ rpmdir }}/*.src.rpm" - name: Copy the binary rpms to the x86_64 dir of {{ repodir }} - copy: src={{ item }} dest={{ repodir }}/x86_64/ + ansible.builtin.copy: src={{ item }} dest={{ repodir }}/x86_64/ with_fileglob: - "{{ rpmdir }}/*.rpm" - name: Copy the binary rpms to the i386 dir of {{ repodir }} - copy: src={{ item }} dest={{ repodir }}/i386/ + ansible.builtin.copy: src={{ item }} dest={{ repodir }}/i386/ with_fileglob: - "{{ rpmdir }}/*.rpm" diff --git a/playbooks/manual/staging-sync/bodhi.yml b/playbooks/manual/staging-sync/bodhi.yml index 1387c90274..3e57a9b2de 100644 --- a/playbooks/manual/staging-sync/bodhi.yml +++ b/playbooks/manual/staging-sync/bodhi.yml @@ -56,8 +56,10 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - - copy: src=/srv/web/infra/db-dumps/bodhi2.dump.xz dest=/var/tmp/bodhi2.dump.xz - owner=postgres group=postgres + - ansible.builtin.copy: + src: /srv/web/infra/db-dumps/bodhi2.dump.xz + dest: /var/tmp/bodhi2.dump.xz + owner: postgres group=postgres - command: unxz /var/tmp/bodhi2.dump.xz creates=/var/tmp/bodhi2.dump - command: dropdb bodhi2 diff --git a/playbooks/manual/staging-sync/db-sync.yml b/playbooks/manual/staging-sync/db-sync.yml index e53788737f..81d350f766 100644 --- a/playbooks/manual/staging-sync/db-sync.yml +++ b/playbooks/manual/staging-sync/db-sync.yml @@ -73,7 +73,7 @@ tasks: # push dump to stg from batcave - name: Push the DB dump from batcave to the dbhost in stg - copy: + ansible.builtin.copy: src: /var/tmp/{{ db }}.dump.xz dest: /var/tmp/{{ db }}.dump.xz diff --git a/playbooks/manual/staging-sync/mailman.yml b/playbooks/manual/staging-sync/mailman.yml index dfdd5dfbdc..409fd1113c 100644 --- a/playbooks/manual/staging-sync/mailman.yml +++ b/playbooks/manual/staging-sync/mailman.yml @@ -35,11 +35,11 @@ tasks: # - template: src=templates/mailman-reset-staging.sql dest=/var/lib/pgsql/mailman-reset-staging.sql - - copy: - src=/srv/web/infra/db-dumps/mailman.dump.xz - dest=/var/tmp/mailman.dump.xz - owner=postgres - group=postgres + - ansible.builtin.copy: + src: /srv/web/infra/db-dumps/mailman.dump.xz + dest: /var/tmp/mailman.dump.xz + owner: postgres + group: postgres - command: unxz /var/tmp/mailman.dump.xz creates=/var/tmp/mailman.dump - command: dropdb mailman @@ -50,11 +50,11 @@ # shell: psql -f /var/lib/pgsql/mailman-reset-staging.sql mailman # - template: src=templates/hyperkitty-reset-staging.sql dest=/var/lib/pgsql/hyperkitty-reset-staging.sql - - copy: - src=/srv/web/infra/db-dumps/hyperkitty.dump.xz - dest=/var/tmp/hyperkitty.dump.xz - owner=postgres - group=postgres + - ansible.builtin.copy: + src: /srv/web/infra/db-dumps/hyperkitty.dump.xz + dest: /var/tmp/hyperkitty.dump.xz + owner: postgres + group: postgres - command: unxz /var/tmp/hyperkitty.dump.xz creates=/var/tmp/hyperkitty.dump - command: dropdb hyperkitty diff --git a/playbooks/manual/sync-hosts.yml b/playbooks/manual/sync-hosts.yml index 1abd555482..38a1581c67 100644 --- a/playbooks/manual/sync-hosts.yml +++ b/playbooks/manual/sync-hosts.yml @@ -23,7 +23,7 @@ when: "{{ inventory_hostname == 'remote_src_host' }}" - name: copy files from control node to remote_dest_host - copy: + ansible.builtin.copy: src: /tmp/staging dest: /tmp/staging when: "{{ inventory_hostname == 'remote_dest_host' }}" diff --git a/playbooks/manual/update-firmware.yml b/playbooks/manual/update-firmware.yml index c688d988c3..fdefdeabae 100644 --- a/playbooks/manual/update-firmware.yml +++ b/playbooks/manual/update-firmware.yml @@ -65,7 +65,7 @@ - name: Copy updates check_mode: no - copy: src={{ bigfiles }}/firmware/{{ item.item.0.dirname }}/{{ item.item.1}} + ansible.builtin.copy: src={{ bigfiles }}/firmware/{{ item.item.0.dirname }}/{{ item.item.1}} dest=/root/firmware-upgrades/ mode=0700 register: copy_results diff --git a/playbooks/update_ticketkey.yml b/playbooks/update_ticketkey.yml index 8fcbd636ba..d9044f9d6d 100644 --- a/playbooks/update_ticketkey.yml +++ b/playbooks/update_ticketkey.yml @@ -33,7 +33,7 @@ tasks: - name: deploy ticket key - copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey_{{env}}.tkey + ansible.builtin.copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey_{{env}}.tkey owner=root group=root mode=0600 notify: - reload proxyhttpd diff --git a/roles/abrt/faf-pre/tasks/main.yml b/roles/abrt/faf-pre/tasks/main.yml index 722817d5be..212106994c 100644 --- a/roles/abrt/faf-pre/tasks/main.yml +++ b/roles/abrt/faf-pre/tasks/main.yml @@ -21,7 +21,7 @@ ansible.builtin.file: path=/etc/fedora-messaging/faf owner=root group=root mode=0755 state=directory - name: Install certs for fedora-messaging - copy: src={{ item.src }} + ansible.builtin.copy: src={{ item.src }} dest=/etc/fedora-messaging/faf/{{ item.dest }} owner={{ item.owner }} group=root mode={{ item.mode }} loop: diff --git a/roles/abrt/faf/tasks/check.yml b/roles/abrt/faf/tasks/check.yml index 43a6e20fe2..8b2ffddcc5 100644 --- a/roles/abrt/faf/tasks/check.yml +++ b/roles/abrt/faf/tasks/check.yml @@ -23,7 +23,7 @@ changed_when: false - name: Cpf - copy: + ansible.builtin.copy: src: ureport_sample dest: "{{ faf_spool_dir }}/reports/incoming" owner: faf diff --git a/roles/abrt/faf/tasks/install.yml b/roles/abrt/faf/tasks/install.yml index 457b4f07e3..9950d547c1 100644 --- a/roles/abrt/faf/tasks/install.yml +++ b/roles/abrt/faf/tasks/install.yml @@ -1,13 +1,13 @@ --- - name: Enable Copr repo for RHEL - copy: + ansible.builtin.copy: src: group_abrt-faf-el8-epel-8.repo dest: /etc/yum.repos.d/ when: ansible_distribution == 'RedHat' - name: Enable Copr repo for Fedora - copy: + ansible.builtin.copy: src: group_abrt-faf-el8-fedora.repo dest: /etc/yum.repos.d/ when: ansible_distribution == 'Fedora' diff --git a/roles/ansible-server/tasks/main.yml b/roles/ansible-server/tasks/main.yml index a069d3cb02..1f3ce0b882 100644 --- a/roles/ansible-server/tasks/main.yml +++ b/roles/ansible-server/tasks/main.yml @@ -25,7 +25,7 @@ - ansible-server - name: Installing the phx2 dns check script - copy: src=dns_check.py dest=/usr/local/bin/dns_check owner=root mode=0755 + ansible.builtin.copy: src=dns_check.py dest=/usr/local/bin/dns_check owner=root mode=0755 tags: - ansible-server diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml index 0b56e4eac5..c6be9261f3 100644 --- a/roles/apache/tasks/main.yml +++ b/roles/apache/tasks/main.yml @@ -32,7 +32,7 @@ # install hash randomization hotfix - name: Hotfix - copy over new httpd init script - copy: src="{{ files }}/hotfix/httpd/httpd.init" dest=/etc/init.d/httpd + ansible.builtin.copy: src="{{ files }}/hotfix/httpd/httpd.init" dest=/etc/init.d/httpd owner=root group=root mode=0755 when: ansible_distribution_major_version|int < 30 and ansible_distribution == 'Fedora' notify: @@ -44,7 +44,7 @@ # install hash randomization hotfix - name: Hotfix - copy over new httpd init script - copy: src="{{ files }}/hotfix/httpd/httpd.init" dest=/etc/init.d/httpd + ansible.builtin.copy: src="{{ files }}/hotfix/httpd/httpd.init" dest=/etc/init.d/httpd owner=root group=root mode=0755 when: ansible_distribution_major_version|int <= 8 and ansible_distribution == 'RedHat' notify: @@ -83,7 +83,7 @@ - apachestatus - name: Setup logrotate to our needs - copy: src="{{ files }}/httpd/httpd.logrotate" dest=/etc/logrotate.d/httpd + ansible.builtin.copy: src="{{ files }}/httpd/httpd.logrotate" dest=/etc/logrotate.d/httpd tags: - config - apache diff --git a/roles/apps-fp-o/tasks/main.yml b/roles/apps-fp-o/tasks/main.yml index e6ba3a7429..f8fe0c8537 100644 --- a/roles/apps-fp-o/tasks/main.yml +++ b/roles/apps-fp-o/tasks/main.yml @@ -5,7 +5,7 @@ - apps-fp-o - name: Copy in the proxy config - copy: > + ansible.builtin.copy: > src=apps.fp.o.conf dest=/etc/httpd/conf.d/{{website}}/apps.fp.o.conf owner=root group=root mode=0644 notify: @@ -48,7 +48,7 @@ - apps-fp-o - name: Copy in our app data yaml - copy: > + ansible.builtin.copy: > src=apps.yaml dest=/usr/share/apps-fp-o/apps.yaml owner=root group=root mode=0644 notify: diff --git a/roles/base/tasks/keytab.yml b/roles/base/tasks/keytab.yml index 56f348d194..873040bd74 100644 --- a/roles/base/tasks/keytab.yml +++ b/roles/base/tasks/keytab.yml @@ -96,7 +96,7 @@ when: not host_keytab_status.stat.exists - name: Deploy base64 keytab - copy: dest=/etc/krb5.keytab.b64 + ansible.builtin.copy: dest=/etc/krb5.keytab.b64 content={{keytab.stdout}} owner=root group=root mode=0600 tags: diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 4e81ee9caf..13d4e29ad0 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -158,7 +158,7 @@ - iptables - name: Install blocklist update script - copy: + ansible.builtin.copy: src: "{{ private }}/files/blocklist/blocklist-update.sh" dest: /usr/local/bin/blocklist-update.sh owner: root @@ -260,7 +260,7 @@ - flush journald tmpfiles to persistent store - name: Install rh ca for splunk - copy: src={{ private }}/files/splunk-certs/2022-IT-Root-CA.pem + ansible.builtin.copy: src={{ private }}/files/splunk-certs/2022-IT-Root-CA.pem dest=/etc/pki/tls/certs/2022-IT-Root-CA.pem tags: - rsyslogd @@ -279,7 +279,7 @@ when: inventory_hostname.startswith('log01') - name: Rsyslog.conf - copy: src={{ item }} dest=/etc/rsyslog.conf mode=0644 + ansible.builtin.copy: src={{ item }} dest=/etc/rsyslog.conf mode=0644 with_first_found: - rsyslog/rsyslog.conf.{{ inventory_hostname }} - rsyslog/rsyslog.conf.{{ dist_tag }} @@ -292,7 +292,7 @@ - base - name: Rsyslog log rotate for rsyslog servers - copy: src=rsyslog/merged-rsyslog dest=/etc/logrotate.d/merged-rsyslog mode=0644 + ansible.builtin.copy: src=rsyslog/merged-rsyslog dest=/etc/logrotate.d/merged-rsyslog mode=0644 when: inventory_hostname.startswith('log') notify: - restart rsyslog @@ -302,7 +302,7 @@ - base - name: Add rsyslog config to /etc/rsyslog.d - copy: src={{ item }} dest=/etc/rsyslog.d/ owner=root group=root mode=0644 + ansible.builtin.copy: src={{ item }} dest=/etc/rsyslog.d/ owner=root group=root mode=0644 with_fileglob: - rsyslog/*.conf notify: @@ -313,7 +313,7 @@ - base - name: Rsyslog-audit.conf - copy: src={{ item }} dest=/etc/rsyslog.d/rsyslog-audit.conf owner=root group=root mode=0644 + ansible.builtin.copy: src={{ item }} dest=/etc/rsyslog.d/rsyslog-audit.conf owner=root group=root mode=0644 with_first_found: - rsyslog/rsyslog-audit.conf.{{ datacenter }} - rsyslog/rsyslog-audit.conf.default @@ -325,7 +325,7 @@ - base - name: Log everything to log01 except on mirrorlist, do not log local4 there. - copy: src=rsyslog/rsyslog-log01 dest=/etc/rsyslog.d/rsyslog-log01.conf mode=0644 + ansible.builtin.copy: src=rsyslog/rsyslog-log01 dest=/etc/rsyslog.d/rsyslog-log01.conf mode=0644 when: not inventory_hostname.startswith(('mirrorlist','copr')) tags: - rsyslogd @@ -333,7 +333,7 @@ - base - name: Log everything to log01 except on mirrorlist, do log local4 there. - copy: src=rsyslog/rsyslog-log01-nolocal4 dest=/etc/rsyslog.d/rsyslog-log01.conf mode=0644 + ansible.builtin.copy: src=rsyslog/rsyslog-log01-nolocal4 dest=/etc/rsyslog.d/rsyslog-log01.conf mode=0644 when: inventory_hostname.startswith('mirrorlist') tags: - rsyslogd @@ -348,7 +348,7 @@ - config - name: Rsyslogd put systemd limits directory for file handles - copy: src=rsyslog/rsyslog-limits-systemd + ansible.builtin.copy: src=rsyslog/rsyslog-limits-systemd dest=/etc/systemd/system/rsyslog.service.d/limits.conf mode=0644 when: inventory_hostname.startswith('log') or inventory_hostname.startswith('people') tags: @@ -364,7 +364,7 @@ - rsyslog-audit - name: Copy over our custom selinux module - copy: src=selinux/rsyslog-audit.pp dest=/usr/local/share/rsyslog/rsyslog-audit.pp + ansible.builtin.copy: src=selinux/rsyslog-audit.pp dest=/usr/local/share/rsyslog/rsyslog-audit.pp register: selinux_module tags: - rsyslogd @@ -381,7 +381,7 @@ # Custom selinux policy to allow unix_chkpwd to map PAM database - name: Copy over our custom selinux module - copy: src=selinux/mapchkpwd.pp dest=/usr/local/share/mapchkpwd.pp + ansible.builtin.copy: src=selinux/mapchkpwd.pp dest=/usr/local/share/mapchkpwd.pp register: selinux_module when: ansible_distribution_major_version|int >= 29 and ansible_distribution == 'Fedora' tags: @@ -390,7 +390,7 @@ # Custom selinux policy to allow unix_chkpwd to map PAM database - name: Copy over our custom selinux module - copy: src=selinux/mapchkpwd.pp dest=/usr/local/share/mapchkpwd.pp + ansible.builtin.copy: src=selinux/mapchkpwd.pp dest=/usr/local/share/mapchkpwd.pp register: selinux_module when: ansible_distribution_major_version|int >= 8 and ansible_distribution == 'RedHat' tags: @@ -413,7 +413,7 @@ # - name: Install common scripts - copy: src={{ item }} dest=/usr/local/bin/ owner=root group=root mode=0755 + ansible.builtin.copy: src={{ item }} dest=/usr/local/bin/ owner=root group=root mode=0755 with_fileglob: - common-scripts/* tags: @@ -437,7 +437,7 @@ # Set PS1 to show stage environment at PS1 # - name: Set PS1 for stage in /etc/profile.d - copy: > + ansible.builtin.copy: > src=setstgps1.sh dest="/etc/profile.d/setstgps1.sh" owner=root @@ -452,7 +452,7 @@ # Set PS1 to show prod environment at PS1 # - name: Set PS1 for prod in /etc/profile.d - copy: > + ansible.builtin.copy: > src=setprodps1.sh dest="/etc/profile.d/setprodps1.sh" owner=root @@ -467,7 +467,7 @@ # Set PS1 to show prod-iad2 environment at PS1 # - name: Set PS1 for prod in /etc/profile.d - copy: > + ansible.builtin.copy: > src=setprodiad2ps1.sh dest="/etc/profile.d/setprodiad2ps1.sh" owner=root @@ -536,7 +536,7 @@ - python3alternative - name: Cron jobs to compress logs under /var/log/hosts and /mnt/fedora_stats - copy: src=compress-log.cron dest=/etc/cron.d/ mode=0644 + ansible.builtin.copy: src=compress-log.cron dest=/etc/cron.d/ mode=0644 tags: - compress when: inventory_hostname.startswith('log0') @@ -545,7 +545,7 @@ import_tasks: crypto-policies.yml - name: Proxy log rotate for proxy servers - copy: src="{{ files }}/common/rsyslog-logrotate" dest=/etc/logrotate.d/rsyslog mode=0644 + ansible.builtin.copy: src="{{ files }}/common/rsyslog-logrotate" dest=/etc/logrotate.d/rsyslog mode=0644 when: inventory_hostname.startswith('proxy') notify: - restart rsyslog diff --git a/roles/base/tasks/postfix.yml b/roles/base/tasks/postfix.yml index ea785a6721..e7741af9a6 100644 --- a/roles/base/tasks/postfix.yml +++ b/roles/base/tasks/postfix.yml @@ -1,6 +1,6 @@ --- - name: /etc/postfix/main.cf - copy: src={{ item }} dest=/etc/postfix/main.cf + ansible.builtin.copy: src={{ item }} dest=/etc/postfix/main.cf with_first_found: - "{{ postfix_maincf }}" - "postfix/main.cf/main.cf.{{ ansible_fqdn }}" @@ -18,7 +18,7 @@ - smtp_auth_relay - name: Install /etc/postfix/master.cf file - copy: src={{ item }} dest=/etc/postfix/master.cf mode=0644 + ansible.builtin.copy: src={{ item }} dest=/etc/postfix/master.cf mode=0644 with_first_found: - "postfix/master.cf/master.cf.{{ inventory_hostname }}" - "postfix/master.cf/master.cf.{{ host_group }}" @@ -33,7 +33,7 @@ - base - name: Deploy sender_access file - copy: src="{{private}}/files/smtpd/sender_access.{{postfix_group}}" dest="/etc/postfix/sender_access" + ansible.builtin.copy: src="{{private}}/files/smtpd/sender_access.{{postfix_group}}" dest="/etc/postfix/sender_access" when: postfix_group == "smtp-mm" or postfix_group == "mailman" or postfix_group == "gateway" notify: - restart postfix @@ -63,7 +63,7 @@ - base - name: Install /etc/postfix/transport file - copy: src="postfix/{{ postfix_transport_filename }}" dest=/etc/postfix/transport + ansible.builtin.copy: src="postfix/{{ postfix_transport_filename }}" dest=/etc/postfix/transport when: inventory_hostname.startswith(('smtp-mm','bastion','noc02')) and env != 'staging' notify: - rebuild postfix transport @@ -74,7 +74,7 @@ - config - name: Install /etc/postfix/bysender file - copy: src="postfix/bysender" dest=/etc/postfix/bysender + ansible.builtin.copy: src="postfix/bysender" dest=/etc/postfix/bysender when: inventory_hostname.startswith(('bastion')) and env != 'staging' notify: - rebuild postfix bysender @@ -85,7 +85,7 @@ - config - name: Create /etc/postfix/tls_policy - copy: src="postfix/tls_policy" dest=/etc/postfix/tls_policy + ansible.builtin.copy: src="postfix/tls_policy" dest=/etc/postfix/tls_policy when: inventory_hostname.startswith(('bastion','smtp-mm','pagure')) and env != 'staging' notify: - rebuild postfix tls_policy @@ -97,7 +97,7 @@ # This has: private key, then cert, then intermediate cert # This cert is a digicert one, renew it there. - name: Install /etc/pki/tls/private/gateway-chain.pem - copy: + ansible.builtin.copy: src="{{private}}/files/smtpd/gateway-chain.pem" dest=/etc/pki/tls/private/gateway-chain.pem owner=root diff --git a/roles/base/tasks/watchdog.yml b/roles/base/tasks/watchdog.yml index 5298b3b93a..05e42ff00e 100644 --- a/roles/base/tasks/watchdog.yml +++ b/roles/base/tasks/watchdog.yml @@ -18,7 +18,7 @@ - base - name: Watchdog device configuration - copy: src=watchdog.conf dest=/etc/watchdog.conf owner=root group=root mode=0644 + ansible.builtin.copy: src=watchdog.conf dest=/etc/watchdog.conf owner=root group=root mode=0644 tags: - config - watchdog diff --git a/roles/basessh/tasks/main.yml b/roles/basessh/tasks/main.yml index 8ff9886868..76f5db5d66 100644 --- a/roles/basessh/tasks/main.yml +++ b/roles/basessh/tasks/main.yml @@ -212,7 +212,7 @@ - base - name: Copy the certificates - copy: src="{{pubkeydir}}/{{inventory_hostname}}{{item}}-cert.pub" + ansible.builtin.copy: src="{{pubkeydir}}/{{inventory_hostname}}{{item}}-cert.pub" dest="{{item}}-cert.pub" with_items: "{{certs_to_sign}}" register: certcopy diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml index a4f886a06b..47e296f346 100644 --- a/roles/batcave/tasks/main.yml +++ b/roles/batcave/tasks/main.yml @@ -48,7 +48,7 @@ when: inventory_hostname.startswith('batcave01') - name: Setup ssh_known_hosts file - copy: src=ssh_known_hosts dest=/etc/ssh/ssh_known_hosts mode=0644 + ansible.builtin.copy: src=ssh_known_hosts dest=/etc/ssh/ssh_known_hosts mode=0644 tags: - batcave - config @@ -59,40 +59,40 @@ # - name: Setup roots bashrc to note about agents - copy: src=root_bashrc dest=/root/.bashrc + ansible.builtin.copy: src=root_bashrc dest=/root/.bashrc tags: - batcave - config - name: Run daily logview report for ansible actions. - copy: src=logview.cron dest=/etc/cron.daily/logview.cron mode=0755 + ansible.builtin.copy: src=logview.cron dest=/etc/cron.daily/logview.cron mode=0755 tags: - batcave - config when: inventory_hostname.startswith('batcave01') - name: Install program for generating ticket key - copy: src=generate_ticketkey dest=/usr/local/bin/generate_ticketkey mode=0755 + ansible.builtin.copy: src=generate_ticketkey dest=/usr/local/bin/generate_ticketkey mode=0755 tags: - batcave - config - name: Setup cron for daily ticketkey reollover - copy: src=ticketkey.cron dest=/etc/cron.hourly/ticketkey.cron mode=0755 + ansible.builtin.copy: src=ticketkey.cron dest=/etc/cron.hourly/ticketkey.cron mode=0755 tags: - batcave - config when: inventory_hostname.startswith('batcave01') - name: Setup cron for removing old pdr requests - copy: src=pdr.cron dest=/etc/cron.d/pdr.cron mode=0644 + ansible.builtin.copy: src=pdr.cron dest=/etc/cron.d/pdr.cron mode=0644 tags: - batcave - config when: inventory_hostname.startswith('batcave01') - name: Setup cron to expose the rabbitmq certs - copy: + ansible.builtin.copy: src: make-rabbitmq-certs-public.sh dest: /etc/cron.daily/make-rabbitmq-certs-public mode: "0755" @@ -136,7 +136,7 @@ - fedora-messaging - name: Install the rabbitmq certificates for batcave - copy: src={{ item.src }} + ansible.builtin.copy: src={{ item.src }} dest=/etc/pki/rabbitmq/{{ item.dest }} owner={{ item.owner }} group={{ item.group}} mode={{ item.mode }} with_items: @@ -169,7 +169,7 @@ # - name: Setup git-notifier script - copy: src=git-notifier dest=/usr/local/bin/git-notifier mode=0755 + ansible.builtin.copy: src=git-notifier dest=/usr/local/bin/git-notifier mode=0755 tags: - batcave - config @@ -177,7 +177,7 @@ # Hook to republish our bare repos for web viewing. - name: Setup syncgittree.sh script - copy: src=syncgittree.sh dest=/usr/local/bin/syncgittree.sh mode=0755 + ansible.builtin.copy: src=syncgittree.sh dest=/usr/local/bin/syncgittree.sh mode=0755 tags: - batcave - config @@ -194,7 +194,7 @@ # python $reposource/hooks/zodbot-announce-commits.py $reposource $zodbot_channel $oldrev $newrev ${1#refs/heads/} - name: Install zodbot-announce-commits script - copy: src=zodbot-announce-commits.py dest=/usr/local/bin/zodbot-announce-commits.py mode=0755 + ansible.builtin.copy: src=zodbot-announce-commits.py dest=/usr/local/bin/zodbot-announce-commits.py mode=0755 tags: - batcave - config @@ -217,14 +217,14 @@ # - name: Install vmdiff.sh cron - copy: src=vmdiff.sh dest=/etc/cron.hourly/vmdiff.sh mode=0755 + ansible.builtin.copy: src=vmdiff.sh dest=/etc/cron.hourly/vmdiff.sh mode=0755 tags: - batcave - config when: inventory_hostname.startswith('batcave01') - name: Install infradocs.sh cron - copy: src=infradocs.sh dest=/etc/cron.hourly/infradocs.sh mode=0755 + ansible.builtin.copy: src=infradocs.sh dest=/etc/cron.hourly/infradocs.sh mode=0755 tags: - batcave - config @@ -236,7 +236,7 @@ # - name: Setup public db copy script - copy: src=public-db-copy.sh dest=/usr/local/bin/public-db-copy.sh mode=0755 + ansible.builtin.copy: src=public-db-copy.sh dest=/usr/local/bin/public-db-copy.sh mode=0755 tags: - batcave - config @@ -245,7 +245,7 @@ # - name: Setup public db copy script - copy: src=public-db-copy.cron dest=/etc/cron.d/public-db-copy.cron mode=0644 + ansible.builtin.copy: src=public-db-copy.cron dest=/etc/cron.d/public-db-copy.cron mode=0644 tags: - batcave - config @@ -256,7 +256,7 @@ # - name: Setup checkdiff ansible job - copy: src=ansible-playbook-check-diff.cron dest=/etc/cron.daily/ansible-playbook-check-diff.cron mode=0755 + ansible.builtin.copy: src=ansible-playbook-check-diff.cron dest=/etc/cron.daily/ansible-playbook-check-diff.cron mode=0755 tags: - batcave - config @@ -267,7 +267,7 @@ # - name: Setup letsencrypt run for proxies - copy: src=proxy-certs-check-renew.cron dest=/etc/cron.weekly/proxy-certs-check-renew.cron mode=0755 + ansible.builtin.copy: src=proxy-certs-check-renew.cron dest=/etc/cron.weekly/proxy-certs-check-renew.cron mode=0755 tags: - batcave - config @@ -278,7 +278,7 @@ # - name: Setup rhel8 sync copy script - copy: src=rhel8-sync dest=/mnt/fedora/app/fi-repo/rhel/rhel8/rhel8-sync mode=0775 + ansible.builtin.copy: src=rhel8-sync dest=/mnt/fedora/app/fi-repo/rhel/rhel8/rhel8-sync mode=0775 tags: - batcave - config @@ -288,7 +288,7 @@ # - name: Setup rhel9 sync copy script - copy: src=rhel9-sync dest=/mnt/fedora/app/fi-repo/rhel/rhel9/rhel9-sync mode=0775 + ansible.builtin.copy: src=rhel9-sync dest=/mnt/fedora/app/fi-repo/rhel/rhel9/rhel9-sync mode=0775 tags: - batcave - config @@ -298,7 +298,7 @@ # sync-rhn cron job # - name: Setup sync-rhn cron - copy: src=sync-rhn dest=/etc/cron.d/sync-rhn mode=0644 + ansible.builtin.copy: src=sync-rhn dest=/etc/cron.d/sync-rhn mode=0644 tags: - batcave - config @@ -309,7 +309,7 @@ # sync-centos cron job # - name: Setup sync-rhn cron - copy: src=sync-centos dest=/etc/cron.d/sync-centos mode=0644 + ansible.builtin.copy: src=sync-centos dest=/etc/cron.d/sync-centos mode=0644 tags: - batcave - config @@ -320,7 +320,7 @@ # - name: Setup centos 9s sync script - copy: src=centos-9s-sync dest=/mnt/fedora/app/fi-repo/centos/centos-9s-sync mode=0775 + ansible.builtin.copy: src=centos-9s-sync dest=/mnt/fedora/app/fi-repo/centos/centos-9s-sync mode=0775 tags: - batcave - config @@ -330,7 +330,7 @@ # - name: Setup centos 10 sync script - copy: src=centos-10-sync dest=/mnt/fedora/app/fi-repo/centos/centos-10-sync mode=0775 + ansible.builtin.copy: src=centos-10-sync dest=/mnt/fedora/app/fi-repo/centos/centos-10-sync mode=0775 tags: - batcave - config @@ -340,7 +340,7 @@ # Setup web server config # - name: Install web server config for batcave (mimetypes) - copy: src=mime-types.conf dest=/etc/httpd/conf.d/mime-types.conf mode=0644 + ansible.builtin.copy: src=mime-types.conf dest=/etc/httpd/conf.d/mime-types.conf mode=0644 notify: - reload httpd tags: @@ -349,7 +349,7 @@ - httpd - name: Install web server config for batcave (access rules) - copy: src=allows dest=/etc/httpd/conf.d/allows mode=0644 + ansible.builtin.copy: src=allows dest=/etc/httpd/conf.d/allows mode=0644 notify: - reload httpd tags: @@ -379,7 +379,7 @@ when: inventory_hostname.startswith('batcave01') - name: Create repo2json cron job - copy: src=repo2json.cron dest=/etc/cron.d/repo2json.cron mode=0644 + ansible.builtin.copy: src=repo2json.cron dest=/etc/cron.d/repo2json.cron mode=0644 tags: - batcave - config @@ -390,7 +390,7 @@ # - name: Install the ansible_utils/rbac config - copy: src={{ private }}/files/rbac/rbac.yaml dest=/etc/ansible_utils/rbac.yaml mode=0540 group=sysadmin + ansible.builtin.copy: src={{ private }}/files/rbac/rbac.yaml dest=/etc/ansible_utils/rbac.yaml mode=0540 group=sysadmin tags: - rbac - batcave @@ -411,7 +411,7 @@ - config - name: Install geoip download cron - copy: + ansible.builtin.copy: src: geoip-download-databases.cron dest: /etc/cron.d/geoip-download-databases.cron mode: "0644" @@ -549,7 +549,7 @@ - batcave - name: Add SAR script for koji - copy: src=koji_sar.py dest=/usr/local/bin/koji_sar.py owner=root mode=0700 + ansible.builtin.copy: src=koji_sar.py dest=/usr/local/bin/koji_sar.py owner=root mode=0700 tags: - SAR - GDPR @@ -571,7 +571,7 @@ - selinux - name: Put in place namespace.conf file - copy: src=namespace.conf dest=/etc/security/namespace.conf mode=644 owner=root group=root + ansible.builtin.copy: src=namespace.conf dest=/etc/security/namespace.conf mode=644 owner=root group=root tags: - config - batcave @@ -613,7 +613,7 @@ # - name: Enable the postgresql 12 module for psql on batcave - copy: + ansible.builtin.copy: dest: /etc/dnf/modules.d/postgresql.module content: | [postgresql] @@ -651,7 +651,7 @@ - hotfix - name: Empty default welcome.conf - copy: dest=/etc/httpd/conf.d/welcome.conf content="" + ansible.builtin.copy: dest=/etc/httpd/conf.d/welcome.conf content="" tags: - batcave - config diff --git a/roles/bkernel/tasks/main.yml b/roles/bkernel/tasks/main.yml index a0ff5a4089..1e701119e8 100644 --- a/roles/bkernel/tasks/main.yml +++ b/roles/bkernel/tasks/main.yml @@ -25,7 +25,7 @@ - bkernel - name: Setup pesign users config - copy: src=pesign-users dest=/etc/pesign/users mode=0600 owner=root group=root + ansible.builtin.copy: src=pesign-users dest=/etc/pesign/users mode=0600 owner=root group=root tags: - bkernel @@ -55,7 +55,7 @@ - bkernel - name: When you awake you will remember nothing - copy: src=history_off.sh dest=/etc/profile.d/history_off.sh mode=0644 + ansible.builtin.copy: src=history_off.sh dest=/etc/profile.d/history_off.sh mode=0644 tags: - bkernel diff --git a/roles/blockerbugs/tasks/main.yml b/roles/blockerbugs/tasks/main.yml index 2764f6243b..a2b284c31c 100644 --- a/roles/blockerbugs/tasks/main.yml +++ b/roles/blockerbugs/tasks/main.yml @@ -12,7 +12,7 @@ - blockerbugs - name: Setup blockerbugs apache conf - copy: src=blockerbugs.conf dest=/etc/httpd/conf.d/blockerbugs.conf mode=644 + ansible.builtin.copy: src=blockerbugs.conf dest=/etc/httpd/conf.d/blockerbugs.conf mode=644 notify: - reload httpd tags: @@ -72,7 +72,7 @@ - blockerbugs - name: Setup blockerbugs cron (master node only) - copy: src=blockerbugs.cron dest=/etc/cron.d/blockerbugs + ansible.builtin.copy: src=blockerbugs.cron dest=/etc/cron.d/blockerbugs when: master_blockerbugs_node tags: - config @@ -80,7 +80,7 @@ # this is a "short-term" patch that won't be needed for future versions of blockerbugs - name: Patch bz_interface to work with rhbz changes - copy: src=20210914-patched-bz_interface.py dest=/usr/lib/python3.9/site-packages/blockerbugs/util/bz_interface.py + ansible.builtin.copy: src=20210914-patched-bz_interface.py dest=/usr/lib/python3.9/site-packages/blockerbugs/util/bz_interface.py when: master_blockerbugs_node tags: - blockerbugs diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index ad9d782546..e6a295e733 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -72,7 +72,7 @@ - config - name: Put pungi multilib configuration in place - copy: + ansible.builtin.copy: src: pungi_multilib.conf dest: /etc/bodhi/pungi_multilib.conf tags: @@ -81,7 +81,7 @@ - config - name: Put pungi general configuration in place - copy: + ansible.builtin.copy: src: pungi_general.conf dest: /etc/bodhi/pungi_general.conf tags: @@ -90,7 +90,7 @@ - config - name: Put createrepo_c configuration in place - copy: + ansible.builtin.copy: src: createrepo_c.ini dest: /etc/bodhi/createrepo_c.ini tags: @@ -138,7 +138,7 @@ py3ver: "{{ _python3_version_result.stdout | trim }}" - name: Put the koji sync listener script in place - copy: + ansible.builtin.copy: src: koji_sync_listener.py dest: /usr/lib/python{{ py3ver }}/site-packages/koji_sync_listener.py mode: "0644" @@ -170,7 +170,7 @@ # - name: Put new-updates-sync in place - copy: src=new-updates-sync dest=/usr/local/bin/new-updates-sync mode="0755" + ansible.builtin.copy: src=new-updates-sync dest=/usr/local/bin/new-updates-sync mode="0755" when: env == "production" tags: - config @@ -178,7 +178,7 @@ - cron - name: Put bodhi-automated-pushes.py in place - copy: src=bodhi-automated-pushes.py dest=/usr/local/bin/bodhi-automated-pushes.py mode="0755" + ansible.builtin.copy: src=bodhi-automated-pushes.py dest=/usr/local/bin/bodhi-automated-pushes.py mode="0755" when: env == "production" tags: - config @@ -187,14 +187,14 @@ # These next two are used by quick-fedora-mirror - name: Put update-fullfiletimelist in place - copy: src="{{ files }}/scripts/update-fullfiletimelist" dest=/usr/local/bin/update-fullfiletimelist mode="0755" + ansible.builtin.copy: src="{{ files }}/scripts/update-fullfiletimelist" dest=/usr/local/bin/update-fullfiletimelist mode="0755" when: env == "production" tags: - config - bodhi - cron - name: Add create-filelist script from quick-fedora-mirror - copy: src="{{ files }}/scripts/create-filelist" dest=/usr/local/bin/create-filelist mode="0755" + ansible.builtin.copy: src="{{ files }}/scripts/create-filelist" dest=/usr/local/bin/create-filelist mode="0755" when: env == "production" tags: - config @@ -202,7 +202,7 @@ - cron - name: Set the updates sync cron job - copy: src=new-updates-sync.cron dest=/etc/cron.d/updates-sync + ansible.builtin.copy: src=new-updates-sync.cron dest=/etc/cron.d/updates-sync when: env == "production" tags: - config @@ -210,7 +210,7 @@ - cron - name: Set the bodhi-automated-pushes cron job - copy: src=bodhi-automated-pushes.cron dest=/etc/cron.d/bodhi-automated-pushes + ansible.builtin.copy: src=bodhi-automated-pushes.cron dest=/etc/cron.d/bodhi-automated-pushes when: env == "production" tags: - config @@ -340,7 +340,7 @@ - bodhi - name: Deploy the fedora-messaging CA - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/ca.crt" dest: /etc/pki/fedora-messaging/cacert.pem mode: "0644" @@ -350,7 +350,7 @@ - bodhi - name: Deploy the fedora-messaging cert - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/bodhi{{env_suffix}}.crt" dest: /etc/pki/fedora-messaging/bodhi-cert.pem mode: "0644" @@ -360,7 +360,7 @@ - bodhi - name: Deploy the fedora-messaging key - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/bodhi{{env_suffix}}.key" dest: /etc/pki/fedora-messaging/bodhi-key.pem mode: "0600" @@ -398,7 +398,7 @@ - config - name: Configure fm-consumer@.service to run as apache - copy: + ansible.builtin.copy: src: fm-consumer@.service dest: /etc/systemd/system/fm-consumer@.service.d/local.conf owner: root @@ -411,7 +411,7 @@ - config - name: Setup the Celery service - copy: + ansible.builtin.copy: src: bodhi-celery.service dest: /etc/systemd/system/bodhi-celery.service owner: root diff --git a/roles/bugzilla2fedmsg/tasks/main.yml b/roles/bugzilla2fedmsg/tasks/main.yml index f694654a07..9bae9a3fe1 100644 --- a/roles/bugzilla2fedmsg/tasks/main.yml +++ b/roles/bugzilla2fedmsg/tasks/main.yml @@ -13,7 +13,7 @@ - bugzilla2fedmsg - name: Copy a custom moksha systemd service file - copy: > + ansible.builtin.copy: > src=moksha-hub.service dest=/usr/lib/systemd/system/moksha-hub.service notify: @@ -47,7 +47,7 @@ - bugzilla2fedmsg - name: Copy in the certs and keys. - copy: > + ansible.builtin.copy: > src="{{ private }}/files/bugzilla2fedmsg/{{ item }}" dest="/etc/pki/fedmsg/{{ item }}" mode=0640 owner=fedmsg group=fedmsg diff --git a/roles/bz_review_report/tasks/main.yml b/roles/bz_review_report/tasks/main.yml index 5116d4fb7f..3e256b6de6 100644 --- a/roles/bz_review_report/tasks/main.yml +++ b/roles/bz_review_report/tasks/main.yml @@ -13,7 +13,7 @@ ## Install all files - name: Install the bz-review-report script - copy: > + ansible.builtin.copy: > src=bz-review-report.py dest=/usr/local/bin/bz-review-report.py owner=root group=root mode=0755 tags: @@ -22,7 +22,7 @@ ## Install the cron job - name: Install the bz-review-report cronjob - copy: > + ansible.builtin.copy: > src=bz-review-report.cron dest=/etc/cron.d/bz-review-report.cron owner=root group=root mode=0644 tags: diff --git a/roles/cgit/base/tasks/main.yml b/roles/cgit/base/tasks/main.yml index bbd6ce31be..b0836efaef 100644 --- a/roles/cgit/base/tasks/main.yml +++ b/roles/cgit/base/tasks/main.yml @@ -21,7 +21,7 @@ tags: cgit - name: Copy cgit them into place. - copy: src={{item}} dest=/usr/share/cgit/{{item}} owner=root group=root mode=0644 + ansible.builtin.copy: src={{item}} dest=/usr/share/cgit/{{item}} owner=root group=root mode=0644 with_items: - cgit.css - cgit.png @@ -34,15 +34,15 @@ tags: cgit - name: Put cgitrc in place for people - copy: src=cgitrc.people dest=/etc/cgitrc owner=root mode=0644 + ansible.builtin.copy: src=cgitrc.people dest=/etc/cgitrc owner=root mode=0644 when: inventory_hostname.startswith('people') tags: cgit - name: Put cgitrc in place for batcave - copy: src=cgitrc.batcave dest=/etc/cgitrc owner=root mode=0644 + ansible.builtin.copy: src=cgitrc.batcave dest=/etc/cgitrc owner=root mode=0644 when: inventory_hostname.startswith('batcave') tags: cgit # - name: Install the libravatar filter -# copy: src=email-libravatar-korg.lua dest=/usr/libexec/cgit/filters/email-libravatar-korg.lua owner=root group=root mode=0755 +# ansible.builtin.copy: src=email-libravatar-korg.lua dest=/usr/libexec/cgit/filters/email-libravatar-korg.lua owner=root group=root mode=0755 # tags: cgit diff --git a/roles/cgit/clean_lock_cron/tasks/main.yml b/roles/cgit/clean_lock_cron/tasks/main.yml index d6e80291ec..b11e9a3025 100644 --- a/roles/cgit/clean_lock_cron/tasks/main.yml +++ b/roles/cgit/clean_lock_cron/tasks/main.yml @@ -2,5 +2,5 @@ # tasklist for setting up the Cron job cleaning CGit locks - name: Install the cron file - copy: src=clean-lock.cron dest=/etc/cron.d/cgit-clean-lock.cron mode=0644 + ansible.builtin.copy: src=clean-lock.cron dest=/etc/cron.d/cgit-clean-lock.cron mode=0644 tags: cgit diff --git a/roles/cgit/make_pkgs_list/tasks/main.yml b/roles/cgit/make_pkgs_list/tasks/main.yml index 2eec93896e..4bb18b45fa 100644 --- a/roles/cgit/make_pkgs_list/tasks/main.yml +++ b/roles/cgit/make_pkgs_list/tasks/main.yml @@ -10,16 +10,16 @@ tags: cgit - name: Ensure the repo list file exists - copy: content="" dest=/srv/git/pkgs-git-repos-list force=no owner=apache group=apache mode=0644 + ansible.builtin.copy: content="" dest=/srv/git/pkgs-git-repos-list force=no owner=apache group=apache mode=0644 tags: cgit - name: Install the script - copy: src=make-cgit-pkgs-list.sh dest=/usr/local/bin/make-cgit-pkgs-list.sh mode=0755 + ansible.builtin.copy: src=make-cgit-pkgs-list.sh dest=/usr/local/bin/make-cgit-pkgs-list.sh mode=0755 when: inventory_hostname.startswith('pkgs') tags: cgit - name: Install the script for fedorapeople - copy: src=make-people-git.sh dest=/usr/local/bin/make-people-git.sh mode=0755 + ansible.builtin.copy: src=make-people-git.sh dest=/usr/local/bin/make-people-git.sh mode=0755 when: inventory_hostname.startswith('people') tags: cgit @@ -27,7 +27,7 @@ # For the batcave we just have a small static list # - name: Install the file for batcave - copy: src=cgit-projects-batcave dest=/etc/cgit-projects-batcave mode=0644 + ansible.builtin.copy: src=cgit-projects-batcave dest=/etc/cgit-projects-batcave mode=0644 when: inventory_hostname.startswith('batcave') tags: cgit diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml index e8338c89e3..518b20da10 100644 --- a/roles/check-compose/tasks/main.yml +++ b/roles/check-compose/tasks/main.yml @@ -151,7 +151,7 @@ # convenience while the roles are all run on the same system, and # stg uses the prod account and credentials to listen on prod - name: Deploy the Fedora infra fedora-messaging cert - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{ checkcompose_env }}/pki/issued/{{ openqa_amqp_this_username }}.crt" dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_this_username }}-cert.pem" mode: "0644" @@ -166,7 +166,7 @@ # on the same box as openQA, in fact we need to keep the ownership in # line. This needs making cleaner somehow. - name: Deploy the Fedora infra fedora-messaging key - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{ checkcompose_env }}/pki/private/{{ openqa_amqp_this_username }}.key" dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_this_username }}-key.pem" mode: "0640" diff --git a/roles/clamav/tasks/main.yml b/roles/clamav/tasks/main.yml index 5b560fd12f..d3ea59b11f 100644 --- a/roles/clamav/tasks/main.yml +++ b/roles/clamav/tasks/main.yml @@ -22,13 +22,13 @@ - cronie-anacron - name: Setup the freshclam configuration - copy: src=freshclam.conf dest=/etc/freshclam.conf + ansible.builtin.copy: src=freshclam.conf dest=/etc/freshclam.conf - name: Enable freshclam by fixing the stupid default sysconfig - copy: src=freshclam-sysconfig dest=/etc/sysconfig/freshclam + ansible.builtin.copy: src=freshclam-sysconfig dest=/etc/sysconfig/freshclam - name: Setup the freshclam cron job - copy: src=freshclam-cron dest=/etc/cron.daily/freshclam + ansible.builtin.copy: src=freshclam-cron dest=/etc/cron.daily/freshclam - name: Setup the periodic clam scan script template: > diff --git a/roles/cloudstats/tasks/main.yml b/roles/cloudstats/tasks/main.yml index efab52aeda..c361916c23 100644 --- a/roles/cloudstats/tasks/main.yml +++ b/roles/cloudstats/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install the cloud-image-stat script - copy: > + ansible.builtin.copy: > src=cloud-image-stat.py dest=/usr/local/bin/cloud-image-stat.py owner=root group=root mode=0755 tags: @@ -8,7 +8,7 @@ - cloudstats - name: Install the cloud-image-stats cronjob to collect stats from log01 - copy: > + ansible.builtin.copy: > src=cloud-image-stat.cron dest=/etc/cron.d/cloud-image-stat.cron owner=root group=root mode=0644 tags: diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml index 90d5922041..bdd6e4813d 100644 --- a/roles/collectd/base/tasks/main.yml +++ b/roles/collectd/base/tasks/main.yml @@ -55,7 +55,7 @@ # install collectd-network config - name: /etc/collectd.d/network.conf - copy: src=network-server.conf dest=/etc/collectd.d/network.conf + ansible.builtin.copy: src=network-server.conf dest=/etc/collectd.d/network.conf tags: - collectd notify: @@ -88,7 +88,7 @@ when: collectd_apache and ansible_distribution_major_version|int >= 29 and ansible_distribution == 'Fedora' - name: /etc/collectd/apache.conf - copy: src=apache.conf dest=/etc/collectd.d/apache.conf + ansible.builtin.copy: src=apache.conf dest=/etc/collectd.d/apache.conf tags: - collectd notify: @@ -111,7 +111,7 @@ when: ( collectd_apache is defined ) and ansible_selinux.status != "disabled" - name: Enable collectd nfs module - copy: src=nfs.conf dest=/etc/collectd.d/nfs.conf + ansible.builtin.copy: src=nfs.conf dest=/etc/collectd.d/nfs.conf tags: - collectd notify: @@ -125,7 +125,7 @@ - selinux - name: Copy over our general collectd selinux module - copy: src=selinux/fi-collectd.pp dest=/usr/share/collectd/fi-collectd.pp + ansible.builtin.copy: src=selinux/fi-collectd.pp dest=/usr/share/collectd/fi-collectd.pp register: ficgeneral_module tags: - collectd @@ -159,7 +159,7 @@ - selinux - name: Copy over our pstorefs/collectd selinux module (rhel6 has no pstorefs) - copy: src=selinux/fi-pstorefs.pp dest=/usr/share/collectd/fi-pstorefs.pp + ansible.builtin.copy: src=selinux/fi-pstorefs.pp dest=/usr/share/collectd/fi-pstorefs.pp register: ficpstorefs_module tags: - collectd diff --git a/roles/collectd/bind/tasks/main.yml b/roles/collectd/bind/tasks/main.yml index d5bb273867..03e10fb304 100644 --- a/roles/collectd/bind/tasks/main.yml +++ b/roles/collectd/bind/tasks/main.yml @@ -7,7 +7,7 @@ - collectd - name: Copy in /etc/collectd.d/bind.conf - copy: > + ansible.builtin.copy: > src=bind.conf dest=/etc/collectd.d/bind.conf tags: diff --git a/roles/collectd/fcomm-queue/tasks/main.yml b/roles/collectd/fcomm-queue/tasks/main.yml index 4868808149..8e4cb517d6 100644 --- a/roles/collectd/fcomm-queue/tasks/main.yml +++ b/roles/collectd/fcomm-queue/tasks/main.yml @@ -6,7 +6,7 @@ - collectd - name: Copy in /usr/local/bin/fcomm-queue-collectd - copy: > + ansible.builtin.copy: > src=fcomm-queue-collectd.py dest=/usr/local/bin/fcomm-queue-collectd mode=0755 @@ -15,7 +15,7 @@ notify: restart collectd - name: Copy in /etc/collectd.d/fcomm-queue.conf - copy: > + ansible.builtin.copy: > src=fcomm-queue.conf dest=/etc/collectd.d/fcomm-queue-conf tags: @@ -30,7 +30,7 @@ - selinux - name: Copy over our fcomm collectd selinux module - copy: src=selinux/fi-collectd-fcomm.pp dest=/usr/share/collectd/fi-collectd-fcomm.pp + ansible.builtin.copy: src=selinux/fi-collectd-fcomm.pp dest=/usr/share/collectd/fi-collectd-fcomm.pp register: ficfcomm_module tags: - collectd diff --git a/roles/collectd/fedmsg-activation/tasks/main.yml b/roles/collectd/fedmsg-activation/tasks/main.yml index f8e130fe2e..5c6fc9218b 100644 --- a/roles/collectd/fedmsg-activation/tasks/main.yml +++ b/roles/collectd/fedmsg-activation/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Copy in /usr/local/bin/fedmsg-map - copy: src=fedmsg-map.py dest=/usr/local/bin/fedmsg-map mode=0755 + ansible.builtin.copy: src=fedmsg-map.py dest=/usr/local/bin/fedmsg-map mode=0755 tags: - collectd notify: restart collectd - name: Copy in /etc/collectd.d/fedmsg-activation/conf - copy: src=fedmsg-activation.conf dest=/etc/collectd.d/fedmsg-activation.conf + ansible.builtin.copy: src=fedmsg-activation.conf dest=/etc/collectd.d/fedmsg-activation.conf tags: - collectd notify: restart collectd diff --git a/roles/collectd/memcached/tasks/main.yml b/roles/collectd/memcached/tasks/main.yml index dd25cfa182..d763deaace 100644 --- a/roles/collectd/memcached/tasks/main.yml +++ b/roles/collectd/memcached/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Copy in the memcached collectd config - copy: src=memcached.conf dest=/etc/collectd.d/memcached.conf + ansible.builtin.copy: src=memcached.conf dest=/etc/collectd.d/memcached.conf tags: - collectd/memcached - collectd diff --git a/roles/collectd/server/tasks/main.yml b/roles/collectd/server/tasks/main.yml index 06b094c64e..2bbbc74ffa 100644 --- a/roles/collectd/server/tasks/main.yml +++ b/roles/collectd/server/tasks/main.yml @@ -31,7 +31,7 @@ # install collectd types - name: Install collectd types - copy: + ansible.builtin.copy: src: "{{ item }}" dest: /usr/share/collectd/{{ item }} loop: @@ -44,7 +44,7 @@ # install collectd configs - name: Install collectd config - copy: + ansible.builtin.copy: src: "{{ item }}" dest: /etc/collectd.d/{{ item }} loop: @@ -59,14 +59,14 @@ # install apache config - name: Install collectd apache config - copy: src=collectd.conf dest=/etc/httpd/conf.d/collectd.conf + ansible.builtin.copy: src=collectd.conf dest=/etc/httpd/conf.d/collectd.conf tags: - config - collectd/server # install upgrade target - name: Install collect upgrade target to handle v4 clients - copy: src=vfive-upgrade.conf dest=/etc/collectd.d/vfive-upgrade.conf + ansible.builtin.copy: src=vfive-upgrade.conf dest=/etc/collectd.d/vfive-upgrade.conf tags: - config - collectd/server @@ -80,7 +80,7 @@ # push our custom config file for the graph CGIs - name: Push the collection.conf file - copy: + ansible.builtin.copy: src: collection.conf dest: /etc/collection.conf tags: @@ -96,7 +96,7 @@ - collectd/server - name: Override the timeout for stopping collectd - copy: + ansible.builtin.copy: src: service.timeout.conf dest: /etc/systemd/system/collectd.service.d/timeout.conf notify: diff --git a/roles/copr/backend/files/provision/create_swap_file.yml b/roles/copr/backend/files/provision/create_swap_file.yml index 0573d5b65a..a70039264e 100644 --- a/roles/copr/backend/files/provision/create_swap_file.yml +++ b/roles/copr/backend/files/provision/create_swap_file.yml @@ -1,12 +1,12 @@ --- - name: install enable-swap.service - copy: + ansible.builtin.copy: src: files/enable-swap.service dest: /etc/systemd/system/ register: enable_swap_service - name: install enable-swap.sh - copy: + ansible.builtin.copy: src: files/enable-swap.sh dest: /usr/local/sbin/ mode: '0755' diff --git a/roles/copr/backend/files/provision/playbook-prepare-builder-to-create-images.yml b/roles/copr/backend/files/provision/playbook-prepare-builder-to-create-images.yml index 03e5f4b5e2..cf4cc8b61a 100644 --- a/roles/copr/backend/files/provision/playbook-prepare-builder-to-create-images.yml +++ b/roles/copr/backend/files/provision/playbook-prepare-builder-to-create-images.yml @@ -50,7 +50,7 @@ when: helpers_installed.changed - name: set direct backend for guestfish - copy: + ansible.builtin.copy: content: "export LIBGUESTFS_BACKEND=direct" dest: /etc/profile.d/guestfish-copr.sh @@ -70,7 +70,7 @@ - "{{ eimg_configdir }}/files/copr-distgit-client" - "{{ eimg_configdir }}/files/copr-rpmbuild" - - copy: + - ansible.builtin.copy: src: "{{ item }}" dest: "{{ eimg_configdir }}/{{ item }}" loop: @@ -88,7 +88,7 @@ - files/copr-rpmbuild/rpkg.conf.j2 - name: eimg.sh config - copy: + ansible.builtin.copy: content: | EIMG_COPR_PLAYBOOK_DIR={{ eimg_configdir }} EIMG_COPR_PLAYBOOK=local-image-update.yml diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 0d86f6d7d5..3b275db09b 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -24,12 +24,12 @@ when: starting_builder - name: put infra repos into yum.repos.d - copy: src=files/dnf/infra-tags.repo dest=/etc/yum.repos.d + ansible.builtin.copy: src=files/dnf/infra-tags.repo dest=/etc/yum.repos.d when: - preparing_image - name: put infra stg repos into yum.repos.d if staging - copy: src=files/dnf/infra-tags-stg.repo dest=/etc/yum.repos.d + ansible.builtin.copy: src=files/dnf/infra-tags-stg.repo dest=/etc/yum.repos.d when: - devel - starting_builder @@ -200,7 +200,7 @@ - starting_builder - name: put updated mock configs into /etc/mock - copy: src=files/mock/ dest=/etc/copr-rpmbuild/mock-config-overrides + ansible.builtin.copy: src=files/mock/ dest=/etc/copr-rpmbuild/mock-config-overrides # conditional, per https://pagure.io/copr/copr/issue/1189 - as we don't want # to bake broken mock configuration into the image. when: @@ -230,7 +230,7 @@ ignore_errors: true - name: put copr-rpmbuild configuration file in the right place - copy: src=files/main.ini dest=/etc/copr-rpmbuild/main.ini + ansible.builtin.copy: src=files/main.ini dest=/etc/copr-rpmbuild/main.ini when: # TODO: use the default main.ini provided by copr-rpmbuild - starting_builder @@ -252,7 +252,7 @@ authorized_key: user=root key='{{ lookup('file', 'files/buildsys.pub') }}' - name: setup 10x more fds in limits.conf - copy: + ansible.builtin.copy: content: | * soft nofile 10240 * hard nofile 10240 @@ -315,7 +315,7 @@ # Hotfix for https://github.com/fedora-copr/copr/issues/3140 # Hotfix for https://github.com/fedora-copr/copr/issues/3146 - name: Install custom copr-rpmbuild configs - copy: + ansible.builtin.copy: src: "files/{{ item }}" dest: "/etc/copr-rpmbuild/{{ item }}" when: diff --git a/roles/copr/backend/tasks/copr-ping.yml b/roles/copr/backend/tasks/copr-ping.yml index aaf555855d..407ea99d61 100644 --- a/roles/copr/backend/tasks/copr-ping.yml +++ b/roles/copr/backend/tasks/copr-ping.yml @@ -70,7 +70,7 @@ tags: copr_ping - name: Install the Copr API token - copy: + ansible.builtin.copy: content: | [copr-cli] login = {{ copr_ping_bot_login }} diff --git a/roles/copr/backend/tasks/install_cloud_cert.yml b/roles/copr/backend/tasks/install_cloud_cert.yml index 442b86b550..b64d98bb94 100644 --- a/roles/copr/backend/tasks/install_cloud_cert.yml +++ b/roles/copr/backend/tasks/install_cloud_cert.yml @@ -1,6 +1,6 @@ --- - name: Copy .pem - copy: src=../../files/fedora-cloud/fed-cloud09.pem dest=/etc/pki/ca-trust/source/anchors/ + ansible.builtin.copy: src=../../files/fedora-cloud/fed-cloud09.pem dest=/etc/pki/ca-trust/source/anchors/ register: cloud_pem_copied - name: Update certificates diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index eb6aafa865..ece3c4a178 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -56,7 +56,7 @@ - .ssh - name: Setup privkey for copr user - copy: src="{{ private }}/files/copr/buildsys.priv" dest=/home/copr/.ssh/id_rsa owner=copr group=copr mode=600 + ansible.builtin.copy: src="{{ private }}/files/copr/buildsys.priv" dest=/home/copr/.ssh/id_rsa owner=copr group=copr mode=600 - name: Setup copr user ssh config file template: @@ -81,7 +81,7 @@ when: hostsstat.rc == 1 - name: Replace bashrc for copr user - copy: src="copr_bashrc" dest=/home/copr/.bashrc owner=copr group=copr mode=600 + ansible.builtin.copy: src="copr_bashrc" dest=/home/copr/.bashrc owner=copr group=copr mode=600 - name: Auth_key so we can login to localhost as the copr user from the copr user authorized_key: user=copr key="{{ item }}" @@ -90,7 +90,7 @@ - "provision/files/buildsys.pub" - name: Copy .boto file - copy: src="boto" dest=/home/copr/.boto owner=copr group=copr + ansible.builtin.copy: src="boto" dest=/home/copr/.boto owner=copr group=copr # setup webserver - name: Install lighttpd.conf @@ -122,7 +122,7 @@ # mime default to text/plain and enable dirlisting for indexes - name: Update lighttpd configs - copy: src="lighttpd/{{ item }}" dest="/etc/lighttpd/conf.d/{{ item }}" owner=root group=root mode=0644 + ansible.builtin.copy: src="lighttpd/{{ item }}" dest="/etc/lighttpd/conf.d/{{ item }}" owner=root group=root mode=0644 with_items: - dirlisting.conf - mime.conf @@ -135,14 +135,14 @@ template: src="lighttpd/dir-generator.php.j2" dest="/var/lib/copr/public_html/dir-generator.php" owner=copr group=copr mode=0755 - name: Install resalloc CGI script - copy: + ansible.builtin.copy: src: cgi-resalloc dest: /var/www/ setype: httpd_sys_script_exec_t mode: "0755" - name: Install the helper scripts for lighttpd log rotation - copy: + ansible.builtin.copy: src: "{{ item }}" dest: /usr/local/bin/{{ item }} mode: "0755" @@ -206,12 +206,12 @@ - resalloc - name: Put ansible.cfg for all this into /etc/ansible/ on the system - copy: src="provision/ansible.cfg" dest=/etc/ansible/ansible.cfg + ansible.builtin.copy: src="provision/ansible.cfg" dest=/etc/ansible/ansible.cfg tags: - provision_config - name: Install .ansible.cfg for copr user - copy: src=ansible.cfg dest=/home/copr/.ansible.cfg + ansible.builtin.copy: src=ansible.cfg dest=/home/copr/.ansible.cfg owner=copr group=copr mode=600 tags: - provision_config @@ -226,7 +226,7 @@ - always - name: Copy image preparation scripts - copy: src="{{ item }}" dest=/usr/local/bin/ + ansible.builtin.copy: src="{{ item }}" dest=/usr/local/bin/ owner=root mode=755 with_fileglob: - copr-builder-image-*.sh @@ -235,7 +235,7 @@ - provision_config - name: Testing fixture - copy: dest="/home/copr/cloud/ec2rc.variable" content="" + ansible.builtin.copy: dest="/home/copr/cloud/ec2rc.variable" content="" when: devel|bool - name: Copy copr-be.conf @@ -303,7 +303,7 @@ - clean_rh_subscriptions - name: Install offline token for copr-team in RHSM - copy: + ansible.builtin.copy: content: "{{ copr_red_hat_subscription_offline_token }}" dest: "{{ rhn_offline_token_file }}" mode: "0600" @@ -360,7 +360,7 @@ ansible.builtin.file: dest=/usr/local/share/copr state=directory - name: Copy over our custom selinux module - copy: src=selinux/copr_rules.pp dest=/usr/local/share/copr/copr_rules.pp + ansible.builtin.copy: src=selinux/copr_rules.pp dest=/usr/local/share/copr/copr_rules.pp register: selinux_module - name: Install our custom selinux module @@ -390,7 +390,7 @@ append: yes - name: Install daily custom copr-backend crontab - copy: src=cron.daily/copr-backend dest=/etc/cron.daily/ + ansible.builtin.copy: src=cron.daily/copr-backend dest=/etc/cron.daily/ mode=0755 tags: [cron_tasks] diff --git a/roles/copr/backend/tasks/mount_fs.yml b/roles/copr/backend/tasks/mount_fs.yml index 9c833c69e1..13107861a9 100644 --- a/roles/copr/backend/tasks/mount_fs.yml +++ b/roles/copr/backend/tasks/mount_fs.yml @@ -54,7 +54,7 @@ when: datacenter == 'aws' block: - name: Install the drop-in raid-check.timer override - copy: + ansible.builtin.copy: dest: /etc/systemd/system/raid-check.timer content: | [Unit] diff --git a/roles/copr/backend/tasks/network.yml b/roles/copr/backend/tasks/network.yml index eefe5946b0..7e64a4150d 100644 --- a/roles/copr/backend/tasks/network.yml +++ b/roles/copr/backend/tasks/network.yml @@ -1,6 +1,6 @@ --- - name: Copy ifcfg-eth1 - copy: src="ifcfg-eth1" dest=/etc/sysconfig/network-scripts/ owner=root group=root mode=644 + ansible.builtin.copy: src="ifcfg-eth1" dest=/etc/sysconfig/network-scripts/ owner=root group=root mode=644 - name: Enable network-manager to use the /etc/sysconfig/network-scripts ini_file: diff --git a/roles/copr/backend/tasks/pulp.yml b/roles/copr/backend/tasks/pulp.yml index 8dec9290a6..ba147914de 100644 --- a/roles/copr/backend/tasks/pulp.yml +++ b/roles/copr/backend/tasks/pulp.yml @@ -13,7 +13,7 @@ mode: "0700" - name: Install Pulp auth certificates - copy: + ansible.builtin.copy: src: "{{ private }}/files/copr/pulp/{{ item }}" dest: "/home/copr/.config/pulp/" owner: copr diff --git a/roles/copr/backend/tasks/resalloc.yml b/roles/copr/backend/tasks/resalloc.yml index ef52692ce1..986a181ef2 100644 --- a/roles/copr/backend/tasks/resalloc.yml +++ b/roles/copr/backend/tasks/resalloc.yml @@ -108,7 +108,7 @@ provision_user: resalloc - name: Install .ansible.cfg for {{ provision_user }} user - copy: src=ansible.cfg dest=/var/lib/resallocserver/.ansible.cfg + ansible.builtin.copy: src=ansible.cfg dest=/var/lib/resallocserver/.ansible.cfg owner=resalloc group=resalloc mode=600 tags: - provision_config @@ -139,7 +139,7 @@ group: resalloc - name: Resalloc, copy backend ssh identity - copy: + ansible.builtin.copy: src: "{{ private }}/files/copr/buildsys.priv" dest: /var/lib/resallocserver/.ssh/id_rsa owner: resalloc @@ -190,7 +190,7 @@ - provision_config_resalloc_aws - name: Shortcut for creating s390x images in cloud - copy: + ansible.builtin.copy: src: copr-prepare-s390x-image-builder dest: /usr/local/bin/copr-prepare-s390x-image-builder mode: "0755" @@ -201,7 +201,7 @@ package: name=ansible-collection-community-general state=latest - name: Install IBM Cloud token file - copy: + ansible.builtin.copy: content: "IBMCLOUD_API_KEY={{ copr_cloud_ibm_token | default('unset') }}" dest: "{{ ibmcloud_token_file }}" owner: resalloc diff --git a/roles/copr/base/tasks/main.yml b/roles/copr/base/tasks/main.yml index 21b533f2d1..6d641def71 100644 --- a/roles/copr/base/tasks/main.yml +++ b/roles/copr/base/tasks/main.yml @@ -20,12 +20,12 @@ when: ansible_distribution != 'Fedora' - name: Copy .forward file - copy: src="{{ _forward_src }}" dest="/root/.forward" owner=root group=root + ansible.builtin.copy: src="{{ _forward_src }}" dest="/root/.forward" owner=root group=root tags: - config - name: Deploy /etc/hosts file - copy: src="hosts" dest=/etc/ owner=root group=root mode=644 + ansible.builtin.copy: src="hosts" dest=/etc/ owner=root group=root mode=644 tags: - config @@ -39,7 +39,7 @@ when: ansible_distribution == 'Fedora' - name: Configure crond - copy: src=sysconfig.crond dest=/etc/sysconfig/crond + ansible.builtin.copy: src=sysconfig.crond dest=/etc/sysconfig/crond notify: restart crond - name: Install base copr packages @@ -69,7 +69,7 @@ notify: restart crond - name: Override the default rsyslog logrotate file - copy: src=syslog-logrotate dest=/etc/logrotate.d/rsyslog + ansible.builtin.copy: src=syslog-logrotate dest=/etc/logrotate.d/rsyslog tags: - logrotate when: ansible_distribution == 'Fedora' diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml index 8e0b1f07e3..0239d22d00 100644 --- a/roles/copr/dist_git/tasks/main.yml +++ b/roles/copr/dist_git/tasks/main.yml @@ -49,13 +49,13 @@ - restart copr-dist-git - name: Set git variables for copr-dist-git user - copy: src=".gitconfig" dest="/home/copr-dist-git/.gitconfig" + ansible.builtin.copy: src=".gitconfig" dest="/home/copr-dist-git/.gitconfig" - name: Set git config username git_config: name=user.name scope=global value="Copr dist git" - name: Install httpd config needed for COPR lookaside cache - copy: src="httpd/dist-git/{{ item }}" dest="/etc/httpd/conf.d/dist-git/{{ item }}" + ansible.builtin.copy: src="httpd/dist-git/{{ item }}" dest="/etc/httpd/conf.d/dist-git/{{ item }}" with_items: - lookaside-copr.conf tags: @@ -70,7 +70,7 @@ - certbot - name: Install copr-dist-git httpd config - copy: src="httpd/{{ item }}" dest="/etc/httpd/conf.d/{{ item }}" + ansible.builtin.copy: src="httpd/{{ item }}" dest="/etc/httpd/conf.d/{{ item }}" with_items: - copr-dist-git.conf tags: @@ -84,10 +84,10 @@ - reload httpd - name: Temporary logrotation fix until copr-dist-git 0.26 is released & deployed - copy: src="logrotate.d/copr-dist-git" dest="/etc/logrotate.d/copr-dist-git" + ansible.builtin.copy: src="logrotate.d/copr-dist-git" dest="/etc/logrotate.d/copr-dist-git" - name: Install /etc/dist-git/dist-git.conf file - copy: src="dist-git.conf" dest="/etc/dist-git/dist-git.conf" mode=0644 + ansible.builtin.copy: src="dist-git.conf" dest="/etc/dist-git/dist-git.conf" mode=0644 tags: - config @@ -98,7 +98,7 @@ seboolean: name=httpd_enable_cgi state=true persistent=true - name: Install robots.txt - copy: src="robots.txt" dest="/var/www/html/" mode=0644 + ansible.builtin.copy: src="robots.txt" dest="/var/www/html/" mode=0644 tags: - config @@ -117,7 +117,7 @@ ansible.builtin.file: path=/usr/local/share/selinux state=directory - name: Copy over our custom selinux policy for cgit - copy: src=git_script_t.pp dest=/usr/local/share/selinux/git_script_t.pp + ansible.builtin.copy: src=git_script_t.pp dest=/usr/local/share/selinux/git_script_t.pp register: cgit_selinux_module tags: - selinux @@ -138,7 +138,7 @@ template: src="copr.conf" dest="/home/copr-dist-git/.config/copr" owner=copr-dist-git group=copr-dist-git - name: Install the helper cron scripts - copy: + ansible.builtin.copy: src: "{{ item }}" dest: "/usr/local/bin/{{ item }}" mode: '0755' @@ -149,13 +149,13 @@ - test-too-soon - name: Install copr-dist-git.daily cron file - copy: src="copr-dist-git.daily" dest="/etc/cron.daily/copr-dist-git" mode=755 + ansible.builtin.copy: src="copr-dist-git.daily" dest="/etc/cron.daily/copr-dist-git" mode=755 tags: - config - cron - name: Install copr-dist-git.weekly cron file - copy: src="copr-dist-git.weekly" dest="/etc/cron.weekly/copr-dist-git" mode=755 + ansible.builtin.copy: src="copr-dist-git.weekly" dest="/etc/cron.weekly/copr-dist-git" mode=755 tags: - config - cron @@ -169,4 +169,4 @@ - cron - name: Install /etc/gitconfig file - copy: src="gitconfig" dest="/etc/gitconfig" + ansible.builtin.copy: src="gitconfig" dest="/etc/gitconfig" diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml index 5fc79f6792..db366195a5 100644 --- a/roles/copr/frontend/tasks/main.yml +++ b/roles/copr/frontend/tasks/main.yml @@ -11,17 +11,17 @@ when: pgsql_ls.stdout is defined and 'postgresql_db_t' not in pgsql_ls.stdout - name: Install weekly custom copr-frontend-crontab - copy: src=cron.weekly/copr-frontend-optional dest=/etc/cron.weekly/ + ansible.builtin.copy: src=cron.weekly/copr-frontend-optional dest=/etc/cron.weekly/ mode=0755 tags: [cron_tasks] - name: Install daily custom copr-frontend-crontab - copy: src=cron.daily/copr-frontend-optional dest=/etc/cron.daily/ + ansible.builtin.copy: src=cron.daily/copr-frontend-optional dest=/etc/cron.daily/ mode=0755 tags: [cron_tasks] - name: Install hourly custom copr-frontend-crontab - copy: src=cron.hourly/copr-frontend-optional dest=/etc/cron.hourly/ + ansible.builtin.copy: src=cron.hourly/copr-frontend-optional dest=/etc/cron.hourly/ mode=0755 tags: [cron_tasks] @@ -44,7 +44,7 @@ - cron_tasks - name: Deploy the prometheus monitoring script - copy: + ansible.builtin.copy: src: copr-frontend-prometheus-monitoring.py dest: /usr/bin/copr-frontend-prometheus-monitoring.py mode: "0750" @@ -93,7 +93,7 @@ - copr_infrastructure_password - name: Install config for 'copr-frontend chroots-template' - copy: src="chroots.conf" dest=/etc/copr/chroots.conf mode=600 + ansible.builtin.copy: src="chroots.conf" dest=/etc/copr/chroots.conf mode=600 owner=copr-fe group=copr-fe register: chroots_conf_installed tags: @@ -152,11 +152,11 @@ - name: Set dev banner for dev instance when: devel|bool - copy: src=banner-include.html dest=/var/lib/copr/ + ansible.builtin.copy: src=banner-include.html dest=/var/lib/copr/ - name: Disallow robots on dev instance when: devel|bool - copy: src=robots.txt dest=/var/www/html/ + ansible.builtin.copy: src=robots.txt dest=/var/www/html/ - name: Register whether indexes rebuild is required @@ -189,12 +189,12 @@ package_facts: manager=auto - name: Install custom systemd service files - copy: src=systemd dest=/etc + ansible.builtin.copy: src=systemd dest=/etc notify: - reload httpd - name: Compress rotated httpd logs - copy: src="httpd.logrotate" dest="/etc/logrotate.d/httpd" + ansible.builtin.copy: src="httpd.logrotate" dest="/etc/logrotate.d/httpd" tags: [logrotate_tasks] - name: Start logrotate service @@ -207,7 +207,7 @@ - not services_disabled|bool - name: Install bash_profile file to ease some admin tasks - copy: + ansible.builtin.copy: content: | export PGUSER=copr-fe export PGDATABASE=coprdb @@ -235,6 +235,6 @@ tags: copr_cdn - name: Install gai.conf - copy: src=gai.conf dest=/etc + ansible.builtin.copy: src=gai.conf dest=/etc notify: - reload httpd diff --git a/roles/copr/frontend/tasks/psql_setup.yml b/roles/copr/frontend/tasks/psql_setup.yml index e753aa0972..ad2cd79591 100644 --- a/roles/copr/frontend/tasks/psql_setup.yml +++ b/roles/copr/frontend/tasks/psql_setup.yml @@ -15,7 +15,7 @@ when: not postgres_initialized.stat.exists - name: Copy pg_hba.conf - copy: src="pg/pg_hba.conf" dest=/var/lib/pgsql/data/pg_hba.conf owner=postgres group=postgres mode=0600 + ansible.builtin.copy: src="pg/pg_hba.conf" dest=/var/lib/pgsql/data/pg_hba.conf owner=postgres group=postgres mode=0600 notify: - restart postgresql tags: @@ -29,7 +29,7 @@ # TODO: I think we missing user creation, check it we do it somewhere else ... - name: Copy over backup scriplet - copy: src="{{ files }}/../roles/postgresql_server/files/backup-database" dest=/usr/local/bin/backup-database mode=0755 + ansible.builtin.copy: src="{{ files }}/../roles/postgresql_server/files/backup-database" dest=/usr/local/bin/backup-database mode=0755 tags: - config @@ -120,7 +120,7 @@ - config - name: Install psqlrc file - copy: + ansible.builtin.copy: content: | \pset linestyle unicode \pset border 2 @@ -135,7 +135,7 @@ mode: "0600" - name: Install pgpass file - copy: + ansible.builtin.copy: content: | localhost:*:coprdb:copr-fe:{{ copr_database_password }} dest: "{{ copr_fe_homedir }}/.pgpass" diff --git a/roles/copr/hypervisor/tasks/main.yml b/roles/copr/hypervisor/tasks/main.yml index ce092368f4..070c191767 100644 --- a/roles/copr/hypervisor/tasks/main.yml +++ b/roles/copr/hypervisor/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: OpenStack package repository for RHEL8, noarch only - copy: + ansible.builtin.copy: content: | [openstack-for-rhel8] name = RHEL OpenStack RPMs @@ -27,7 +27,7 @@ # tags: swap - name: Install the default profile script - copy: src=profile.sh dest=/etc/profile.d/copr-hypervisor.sh + ansible.builtin.copy: src=profile.sh dest=/etc/profile.d/copr-hypervisor.sh tags: profile_scripts - name: Install libvirt packages @@ -46,7 +46,7 @@ - libvirtd - name: Install libvirtd.conf - copy: src="{{ files }}/virthost/libvirtd.conf" dest=/etc/libvirt/libvirtd.conf + ansible.builtin.copy: src="{{ files }}/virthost/libvirtd.conf" dest=/etc/libvirt/libvirtd.conf notify: - restart libvirtd tags: @@ -88,7 +88,7 @@ tags: libvirtd - name: Copy host-bridge config file to host - copy: src=libvirt-net-bridge.xml + ansible.builtin.copy: src=libvirt-net-bridge.xml dest=/root/.tmp-ansible-file.xml when: libvirt_bridge_exists.changed tags: libvirtd @@ -155,14 +155,14 @@ # todo: generate it's own key - name: Make sure hostA can ssh to hostB - copy: + ansible.builtin.copy: src: "{{ private }}/files/copr/buildsys.priv" dest: /home/copr/.ssh/id_rsa owner: copr mode: "0600" - name: Provide pub key, too, so we can install them to generated builder images - copy: src=buildsys.pub dest=/home/copr/.ssh/id_rsa.pub + ansible.builtin.copy: src=buildsys.pub dest=/home/copr/.ssh/id_rsa.pub owner=copr mode=0600 - name: Enable praiskup-helpers repo @@ -183,7 +183,7 @@ - packages - name: Install configuration for /bin/copr-image - copy: + ansible.builtin.copy: dest: /etc/eimg/eimg.sh content: | EIMG_COPR_PLAYBOOK_DIR=/home/copr/provision diff --git a/roles/copr/keygen/tasks/main.yml b/roles/copr/keygen/tasks/main.yml index abb571315b..fac03883cb 100644 --- a/roles/copr/keygen/tasks/main.yml +++ b/roles/copr/keygen/tasks/main.yml @@ -15,7 +15,7 @@ ansible.builtin.file: path=/var/lib/copr-keygen owner=copr-signer group=copr-signer recurse=yes - name: Put keygen vhost for httpd - copy: src="httpd/copr-keygen.conf" dest="/etc/httpd/conf.d/copr-keygen.conf" + ansible.builtin.copy: src="httpd/copr-keygen.conf" dest="/etc/httpd/conf.d/copr-keygen.conf" notify: - reload httpd tags: @@ -48,7 +48,7 @@ ansible.builtin.file: dest=/usr/local/share/copr state=directory - name: Copy over our custom selinux module - copy: src=selinux/copr_rules.pp dest=/usr/local/share/copr/copr_rules.pp + ansible.builtin.copy: src=selinux/copr_rules.pp dest=/usr/local/share/copr/copr_rules.pp register: selinux_module - name: Install our custom selinux module diff --git a/roles/copr/keygen/tasks/setup_backup.yml b/roles/copr/keygen/tasks/setup_backup.yml index b13fa283f2..21ffe235eb 100644 --- a/roles/copr/keygen/tasks/setup_backup.yml +++ b/roles/copr/keygen/tasks/setup_backup.yml @@ -3,7 +3,12 @@ ansible.builtin.file: path=/backup state=directory - name: Copy pubkey for backup encryption - copy: src="{{ private }}/files/copr/keygen/backup_key.asc" dest="/root/backup_key.asc" + ansible.builtin.copy: src="{{ private }}/files/copr/keygen/backup_key.asc" dest="/root/backup_key.asc" + register: pub_key_installed + +- name: Import pubkey for backup encryption + shell: gpg2 --import /root/backup_key.asc creates=/root/backupkeyimported + when: pub_key_installed.changed - name: Copy backup script - copy: src="backup_keyring.sh" dest="/etc/cron.hourly/backup_keyring.sh" owner=root group=root mode=755 + ansible.builtin.copy: src="backup_keyring.sh" dest="/etc/cron.hourly/backup_keyring.sh" owner=root group=root mode=755 diff --git a/roles/developer/build/tasks/main.yml b/roles/developer/build/tasks/main.yml index cfd35d1e64..fe896dbbdc 100644 --- a/roles/developer/build/tasks/main.yml +++ b/roles/developer/build/tasks/main.yml @@ -11,7 +11,7 @@ - name: Copy syncDeveloper script (stg) when: env == "staging" - copy: > + ansible.builtin.copy: > src=syncDeveloper.stg.sh dest=/usr/local/bin/syncDeveloper owner=root group=root mode=0755 tags: @@ -19,19 +19,19 @@ - name: Copy syncDeveloper script (prod) when: env == "production" - copy: > + ansible.builtin.copy: > src=syncDeveloper.sh dest=/usr/local/bin/syncDeveloper owner=root group=root mode=0755 tags: - developer.fedoraproject.org - name: Install rss.py script - copy: src=rss.py dest=/usr/local/bin/rss.py mode=0755 owner=root group=root + ansible.builtin.copy: src=rss.py dest=/usr/local/bin/rss.py mode=0755 owner=root group=root tags: - developer.fedoraproject.org - name: Install the syncDeveloper cron job - copy: > + ansible.builtin.copy: > src={{item}}.cron dest=/etc/cron.d/{{item}}.cron owner=root group=root mode=0644 with_items: diff --git a/roles/developer/website/tasks/main.yml b/roles/developer/website/tasks/main.yml index 98a1d93af2..abcc9af31a 100644 --- a/roles/developer/website/tasks/main.yml +++ b/roles/developer/website/tasks/main.yml @@ -1,11 +1,11 @@ --- - name: Copy in the sync-developer cronjob - copy: src=cron-sync-developer dest=/etc/cron.d/sync-developer + ansible.builtin.copy: src=cron-sync-developer dest=/etc/cron.d/sync-developer tags: - developer - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/dhcp_server/tasks/main.yml b/roles/dhcp_server/tasks/main.yml index 7c007b18ed..60432e57c2 100644 --- a/roles/dhcp_server/tasks/main.yml +++ b/roles/dhcp_server/tasks/main.yml @@ -7,7 +7,7 @@ - dhcp_server - name: Setup dhcpd.conf - copy: src=dhcpd.conf.{{ inventory_hostname }} dest=/etc/dhcp/dhcpd.conf mode=644 + ansible.builtin.copy: src=dhcpd.conf.{{ inventory_hostname }} dest=/etc/dhcp/dhcpd.conf mode=644 notify: - restart dhcpd tags: diff --git a/roles/distgit/pagure/tasks/main.yml b/roles/distgit/pagure/tasks/main.yml index aff87d5a09..752a9efe72 100644 --- a/roles/distgit/pagure/tasks/main.yml +++ b/roles/distgit/pagure/tasks/main.yml @@ -38,7 +38,7 @@ # Set-up stunnel for the event source server # - name: Install stunnel service definition -# copy: src=stunnel.service +# ansible.builtin.copy: src=stunnel.service # dest=/usr/lib/systemd/system/stunnel.service # owner=root group=root mode=0755 # notify: @@ -238,7 +238,7 @@ - pagure - name: Override the default pagure_worker.service file to change the user it is run under - copy: src={{ item }}.service + ansible.builtin.copy: src={{ item }}.service dest=/etc/systemd/system/{{ item }}.service owner=root group=root mode=0755 with_items: @@ -259,7 +259,7 @@ # Cron job to export extras information from the pagure DB - name: Install the apache configuration file for /extras - copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} + ansible.builtin.copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root mode=0644 with_items: - pagure_cron.conf @@ -341,7 +341,7 @@ - fedora-messaging - name: Deploy pagure/rabbitmq certificate - copy: src={{ item.src }} + ansible.builtin.copy: src={{ item.src }} dest=/etc/pki/rabbitmq/pagurecert/{{ item.dest }} owner={{ item.owner }} group={{ item.group}} mode={{ item.mode }} with_items: @@ -387,7 +387,7 @@ - postfix - name: Add SAR script for pagure - copy: src={{ roles_path }}/pagure/files/pagure_sar.py + ansible.builtin.copy: src={{ roles_path }}/pagure/files/pagure_sar.py dest=/usr/local/bin/pagure_sar.py owner=root mode=0700 tags: @@ -396,7 +396,7 @@ - pagure - name: Override the default syslog logrotate file - copy: src=syslog-logrotate dest=/etc/logrotate.d/syslog + ansible.builtin.copy: src=syslog-logrotate dest=/etc/logrotate.d/syslog tags: - pagure - logrotate diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml index e98f2addff..d6823393b4 100644 --- a/roles/distgit/tasks/main.yml +++ b/roles/distgit/tasks/main.yml @@ -6,7 +6,7 @@ # -- Common ---------------------------------------------- # This is very basic stuff that is needed by multiple of the next sections. - name: Enable the mod_auth_openidc module on rhel8 - copy: + ansible.builtin.copy: dest: /etc/dnf/modules.d/mod_auth_openidc.module content: | [mod_auth_openidc] @@ -47,7 +47,7 @@ - distgit - name: Install suexec wrappers - copy: + ansible.builtin.copy: src=suexec-{{item}}.sh dest=/var/www/bin/suexec-{{item}}.sh owner=pagure @@ -60,12 +60,12 @@ - distgit - name: Put in git service config - copy: src=git@.service dest=/etc/systemd/system/git@.service + ansible.builtin.copy: src=git@.service dest=/etc/systemd/system/git@.service tags: - distgit - name: Install the mod_ssl configuration - copy: src=ssl.conf dest=/etc/httpd/conf.d/ssl.conf + ansible.builtin.copy: src=ssl.conf dest=/etc/httpd/conf.d/ssl.conf notify: - reload httpd tags: @@ -81,7 +81,7 @@ - letsencrypt - name: Install the keytab - copy: src="{{ private }}/files/keytabs/{{env}}/pkgs" + ansible.builtin.copy: src="{{ private }}/files/keytabs/{{env}}/pkgs" dest=/etc/httpd.keytab owner=apache group=apache @@ -111,7 +111,7 @@ # do, this installs that wrapper (which is otherwise configured in sshd_config) - name: Install the ssh_wrapper wrapper script - copy: src=ssh_wrapper dest=/usr/local/bin/ssh_wrapper mode=0755 + ansible.builtin.copy: src=ssh_wrapper dest=/usr/local/bin/ssh_wrapper mode=0755 tags: - config - distgit @@ -129,7 +129,7 @@ - distgit - name: Install the dist-git config - copy: src=dist-git.conf dest=/etc/dist-git/dist-git.conf + ansible.builtin.copy: src=dist-git.conf dest=/etc/dist-git/dist-git.conf tags: - config - distgit @@ -188,7 +188,7 @@ - distgit - name: Install robots.txt files - copy: src={{item}} dest=/var/www/{{item}} + ansible.builtin.copy: src={{item}} dest=/var/www/{{item}} with_items: - robots-pkgs.txt - robots-src.txt @@ -196,14 +196,14 @@ - distgit - name: Install the DistGit related httpd config - copy: src=git-smart-http.conf dest=/etc/httpd/conf.d/dist-git/git-smart-http.conf + ansible.builtin.copy: src=git-smart-http.conf dest=/etc/httpd/conf.d/dist-git/git-smart-http.conf notify: - reload httpd tags: - distgit - name: Symlink pkgs-git-repos-list - copy: src=repolist.conf dest=/etc/httpd/conf.d/dist-git/repolist.conf + ansible.builtin.copy: src=repolist.conf dest=/etc/httpd/conf.d/dist-git/repolist.conf notify: - reload httpd tags: @@ -219,12 +219,12 @@ - distgit - name: Schedule the script to get retired packages - copy: src="retired-packages.cron" dest="/etc/cron.d/retired-packages.cron" mode=644 owner=root group=root + ansible.builtin.copy: src="retired-packages.cron" dest="/etc/cron.d/retired-packages.cron" mode=644 owner=root group=root tags: - distgit - name: Install the two scripts needed for mass-branching - copy: src={{item}} dest=/usr/local/bin/{{item}} owner=root group=root mode=0755 + ansible.builtin.copy: src={{item}} dest=/usr/local/bin/{{item}} owner=root group=root mode=0755 with_items: - mass-branching-git.py - mass-branching-gitolite.py @@ -288,12 +288,12 @@ - distgit - name: Install the fedora-ca.cert - copy: src={{private}}/files/fedora-ca.cert dest=/etc/httpd/conf/cacert.pem + ansible.builtin.copy: src={{private}}/files/fedora-ca.cert dest=/etc/httpd/conf/cacert.pem tags: - distgit - name: Install the pkgs cert - copy: src={{private}}/files/pkgs.fedoraproject.org_key_and_cert.pem + ansible.builtin.copy: src={{private}}/files/pkgs.fedoraproject.org_key_and_cert.pem dest=/etc/httpd/conf/pkgs.fedoraproject.org_key_and_cert.pem owner=apache mode=0400 when: env != "staging" @@ -301,7 +301,7 @@ - distgit - name: Install the pkgs.stg cert - copy: src={{private}}/files/pkgs.stg.fedoraproject.org_key_and_cert.pem + ansible.builtin.copy: src={{private}}/files/pkgs.stg.fedoraproject.org_key_and_cert.pem dest=/etc/httpd/conf/pkgs.fedoraproject.org_key_and_cert.pem owner=apache mode=0400 when: env == "staging" @@ -314,7 +314,7 @@ tags: selinux - name: Copy over our custom selinux policy - copy: src=upload_cgi.pp dest=/usr/local/share/selinux/upload_cgi.pp + ansible.builtin.copy: src=upload_cgi.pp dest=/usr/local/share/selinux/upload_cgi.pp register: selinux_module tags: selinux @@ -324,7 +324,7 @@ tags: selinux - name: Copy over our custom nfs selinux policy - copy: src=cgi-nfs.pp dest=/usr/local/share/selinux/cgi-nfs.pp + ansible.builtin.copy: src=cgi-nfs.pp dest=/usr/local/share/selinux/cgi-nfs.pp register: nfs_selinux_module tags: selinux diff --git a/roles/dns/tasks/main.yml b/roles/dns/tasks/main.yml index 01e9319d53..75157ce3e2 100644 --- a/roles/dns/tasks/main.yml +++ b/roles/dns/tasks/main.yml @@ -10,7 +10,7 @@ - dns - name: Copy rndc config - copy: src=rndc.conf dest=/etc/rndc.conf + ansible.builtin.copy: src=rndc.conf dest=/etc/rndc.conf notify: - restart named tags: @@ -18,7 +18,7 @@ - dns - name: Copy rndc key - copy: src={{ private }}/files/dns/rndc.key dest=/etc/rndc.key + ansible.builtin.copy: src={{ private }}/files/dns/rndc.key dest=/etc/rndc.key notify: - restart named tags: @@ -26,7 +26,7 @@ - dns - name: Copy named cache - copy: src=named.ca dest=/var/named/named.ca + ansible.builtin.copy: src=named.ca dest=/var/named/named.ca notify: - restart named tags: @@ -34,7 +34,7 @@ - dns - name: Copy geoip.py - copy: src=geoip.py dest=/usr/local/bin/geoip.py mode=0755 + ansible.builtin.copy: src=geoip.py dest=/usr/local/bin/geoip.py mode=0755 notify: - restart named tags: @@ -42,7 +42,7 @@ - dns - name: Copy GeoIP.sh - copy: src=GeoIP.sh dest=/var/named/GeoIP.sh mode=0755 + ansible.builtin.copy: src=GeoIP.sh dest=/var/named/GeoIP.sh mode=0755 notify: - restart named tags: @@ -58,7 +58,7 @@ # - dns - name: Copy update-dns - copy: src=update-dns dest=/usr/local/bin/update-dns mode=0755 + ansible.builtin.copy: src=update-dns dest=/usr/local/bin/update-dns mode=0755 notify: - restart named tags: @@ -66,7 +66,7 @@ - dns - name: Copy zones - copy: src=zones.conf dest=/etc/named/zones.conf owner=root group=root mode=0644 + ansible.builtin.copy: src=zones.conf dest=/etc/named/zones.conf owner=root group=root mode=0644 notify: - restart named tags: @@ -74,7 +74,7 @@ - dns - name: Copy named config - copy: src=named.conf dest=/etc/named.conf mode=0644 owner=root group=root + ansible.builtin.copy: src=named.conf dest=/etc/named.conf mode=0644 owner=root group=root notify: - restart named tags: diff --git a/roles/docker-distribution/tasks/main.yml b/roles/docker-distribution/tasks/main.yml index f9dad93b99..406a28c180 100644 --- a/roles/docker-distribution/tasks/main.yml +++ b/roles/docker-distribution/tasks/main.yml @@ -32,7 +32,7 @@ - docker-distribution - name: Install tls cert for docker - copy: + ansible.builtin.copy: src: "{{ cert.cert_src }}" dest: "{{ cert.dest_dir}}/{{ cert.cert_dest }}" when: tls.enabled @@ -40,7 +40,7 @@ - docker-distribution - name: Install tls key for docker - copy: + ansible.builtin.copy: src: "{{ cert.key_src }}" dest: "{{ cert.dest_dir}}/{{ cert.key_dest }}" when: tls.enabled @@ -48,7 +48,7 @@ - docker-distribution - name: Override the default syslog logrotate file - copy: + ansible.builtin.copy: src=syslog-logrotate dest=/etc/logrotate.d/rsyslog tags: diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml index fbf46b94d9..be1fee93b1 100644 --- a/roles/download/tasks/main.yml +++ b/roles/download/tasks/main.yml @@ -37,7 +37,7 @@ template: src=rsync/motd_fedora.j2 dest=/etc/motd_fedora - name: Configure logrotate for /var/log/rsyncd-fedora.log - copy: src=logrotate-rsync-fedora dest=/etc/logrotate.d/rsync-fedora + ansible.builtin.copy: src=logrotate-rsync-fedora dest=/etc/logrotate.d/rsync-fedora - name: Check the selinux context pubdir command: matchpathcon /srv/pub @@ -56,13 +56,13 @@ - selinux - name: Copy wildcard cert from puppet private - copy: src="{{private}}/files/httpd/wildcard-2024.fedoraproject.org.cert" dest=/etc/pki/tls/certs/wildcard-2024.fedoraproject.org.cert owner=root group=root mode=0644 + ansible.builtin.copy: src="{{private}}/files/httpd/wildcard-2024.fedoraproject.org.cert" dest=/etc/pki/tls/certs/wildcard-2024.fedoraproject.org.cert owner=root group=root mode=0644 - name: Copy wildcard key from puppet private - copy: src="{{private}}/files/httpd/wildcard-2024.fedoraproject.org.key" dest=/etc/pki/tls/private/wildcard-2024.fedoraproject.org.key owner=root group=root mode=0600 + ansible.builtin.copy: src="{{private}}/files/httpd/wildcard-2024.fedoraproject.org.key" dest=/etc/pki/tls/private/wildcard-2024.fedoraproject.org.key owner=root group=root mode=0600 - name: Copy intermediate wildcard cert from puppet private - copy: src="{{private}}/files/httpd/wildcard-2024.fedoraproject.org.intermediate.cert" dest=/etc/pki/tls/certs/wildcard-2024.fedoraproject.org.intermediate.cert owner=root group=root mode=0644 + ansible.builtin.copy: src="{{private}}/files/httpd/wildcard-2024.fedoraproject.org.intermediate.cert" dest=/etc/pki/tls/certs/wildcard-2024.fedoraproject.org.intermediate.cert owner=root group=root mode=0644 - name: Configure httpd dl main conf template: src=httpd/dl.fedoraproject.org.conf dest=/etc/httpd/conf.d/dl.fedoraproject.org.conf @@ -74,7 +74,7 @@ - reload httpd - name: Make sure apache autoindex.conf is replaced with ours - copy: src=httpd/dl.fedoraproject.org/autoindex.conf dest=/etc/httpd/conf.d/autoindex.conf + ansible.builtin.copy: src=httpd/dl.fedoraproject.org/autoindex.conf dest=/etc/httpd/conf.d/autoindex.conf tags: - httpd - config @@ -82,7 +82,7 @@ - reload httpd - name: Configure httpd dl sub conf - copy: src=httpd/dl.fedoraproject.org/ dest=/etc/httpd/conf.d/dl.fedoraproject.org/ + ansible.builtin.copy: src=httpd/dl.fedoraproject.org/ dest=/etc/httpd/conf.d/dl.fedoraproject.org/ tags: - httpd - config diff --git a/roles/easyfix/gather/tasks/main.yml b/roles/easyfix/gather/tasks/main.yml index 9d6f9afc7a..1e90e09c4d 100644 --- a/roles/easyfix/gather/tasks/main.yml +++ b/roles/easyfix/gather/tasks/main.yml @@ -32,7 +32,7 @@ ## Install all files - name: Install the easyfix js/css files - copy: > + ansible.builtin.copy: > src={{ item }} dest=/srv/web/easyfix/{{ item }} owner=root group=root mode=0644 with_items: @@ -45,7 +45,7 @@ - easyfix - name: Install the easyfix template - copy: > + ansible.builtin.copy: > src=template.html dest=/etc/fedora-gather-easyfix/template.html owner=root group=root mode=0644 tags: @@ -63,7 +63,7 @@ ## Install the cron job - name: Install the easyfix cronjob - copy: > + ansible.builtin.copy: > src=easyfix.cron dest=/etc/cron.d/easyfix.cron owner=root group=root mode=0644 tags: diff --git a/roles/easyfix/proxy/tasks/main.yml b/roles/easyfix/proxy/tasks/main.yml index bf1d7e2702..a79cc009fa 100644 --- a/roles/easyfix/proxy/tasks/main.yml +++ b/roles/easyfix/proxy/tasks/main.yml @@ -17,7 +17,7 @@ - easyfix/proxy - name: Install the sync-easyfix cronjob to pull content from gatherer - copy: > + ansible.builtin.copy: > src=sync-easyfix.cron dest=/etc/cron.d/sync-easyfix.cron owner=root group=root mode=0644 tags: diff --git a/roles/fasjson/tasks/main.yml b/roles/fasjson/tasks/main.yml index d5b71b4ee0..f299cda5fb 100644 --- a/roles/fasjson/tasks/main.yml +++ b/roles/fasjson/tasks/main.yml @@ -21,14 +21,14 @@ when: fasjson_aliases is defined - name: Fasjson-aliases cron job - copy: src=fasjson-aliases.cron dest=/etc/cron.d/fasjson-aliases owner=root mode=0644 + ansible.builtin.copy: src=fasjson-aliases.cron dest=/etc/cron.d/fasjson-aliases owner=root mode=0644 tags: - config - fasjson when: fasjson_aliases is defined - name: Fasjson-aliases base static file - copy: src=aliases.static dest=/etc/aliases.static owner=root mode=0644 + ansible.builtin.copy: src=aliases.static dest=/etc/aliases.static owner=root mode=0644 tags: - config - fasjson diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index f008fc0f7c..c664f2d967 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -188,7 +188,7 @@ - restart fedmsg-relay - name: Overwrite standard config with local fedmsg debugging loopback - copy: src=relay-debug-loopback.py dest=/etc/fedmsg.d/relay.py + ansible.builtin.copy: src=relay-debug-loopback.py dest=/etc/fedmsg.d/relay.py when: fedmsg_debug_loopback == true tags: - fedmsg_loopback @@ -214,7 +214,7 @@ - fedmsg/base - name: Install fedmsg ca.cert - copy: > + ansible.builtin.copy: > src="{{ private }}/files/fedmsg-certs/keys/ca.crt" dest=/etc/pki/fedmsg/ca.crt owner=root @@ -225,7 +225,7 @@ - fedmsg/base - name: Fedmsg certs - copy: > + ansible.builtin.copy: > src="{{ private }}/files/fedmsg-certs/keys/{{item['service']}}-{{fedmsg_fqdn | default(inventory_hostname)}}.crt" dest=/etc/pki/fedmsg/ mode=644 @@ -239,7 +239,7 @@ - fedmsg/base - name: Fedmsg keys - copy: > + ansible.builtin.copy: > src="{{ private }}/files/fedmsg-certs/keys/{{item['service']}}-{{fedmsg_fqdn | default(inventory_hostname)}}.key" dest=/etc/pki/fedmsg/ mode=0640 @@ -259,7 +259,7 @@ - fedmsg/base - name: Copy over our custom selinux module - copy: src=selinux/fedmsg.pp dest=/usr/local/share/fedmsg/fedmsg.pp + ansible.builtin.copy: src=selinux/fedmsg.pp dest=/usr/local/share/fedmsg/fedmsg.pp register: selinux_module tags: - fedmsg/base diff --git a/roles/fedmsg/crl/tasks/main.yml b/roles/fedmsg/crl/tasks/main.yml index 45f5634115..82e852b273 100644 --- a/roles/fedmsg/crl/tasks/main.yml +++ b/roles/fedmsg/crl/tasks/main.yml @@ -12,7 +12,7 @@ - fedmsg/proxy - name: Copy over our crl from the private repo - copy: > + ansible.builtin.copy: > src={{private}}/files/fedmsg-certs/keys/crl.pem dest=/srv/web/fedmsg/crl.pem owner=root group=root mode=0644 tags: @@ -24,7 +24,7 @@ # End users (fedmsg-notify) need it to be able to validate our outbound # messages. - name: Copy over our CA cert from the private repo - copy: > + ansible.builtin.copy: > src={{private}}/files/fedmsg-certs/keys/ca.crt dest=/srv/web/fedmsg/ca.crt owner=root group=root mode=0644 tags: diff --git a/roles/fedmsg/gateway/slave/tasks/main.yml b/roles/fedmsg/gateway/slave/tasks/main.yml index 72590ffb05..f4a524d7d7 100644 --- a/roles/fedmsg/gateway/slave/tasks/main.yml +++ b/roles/fedmsg/gateway/slave/tasks/main.yml @@ -35,7 +35,7 @@ # - patch - name: Copy in empty endpoints.py and gateway.py - copy: src={{item}} dest=/etc/fedmsg.d/{{item}} + ansible.builtin.copy: src={{item}} dest=/etc/fedmsg.d/{{item}} with_items: - endpoints.py - gateway.py @@ -69,7 +69,7 @@ - fedmsg/gateway/slave - name: Install stunnel service definition - copy: src=stunnel.service + ansible.builtin.copy: src=stunnel.service dest=/usr/lib/systemd/system/stunnel.service owner=root group=root mode=0644 notify: @@ -97,7 +97,7 @@ - fedmsg/gateway/slave - name: Put our combined cert in place - copy: > + ansible.builtin.copy: > src={{private}}/files/httpd/wildcard-2024.fedoraproject.org.combined.cert dest=/etc/pki/tls/certs/wildcard-2024.fedoraproject.org.combined.cert owner=root group=root mode=0644 diff --git a/roles/fedmsg/gateway/tasks/main.yml b/roles/fedmsg/gateway/tasks/main.yml index 241a30ace9..3788a5ac54 100644 --- a/roles/fedmsg/gateway/tasks/main.yml +++ b/roles/fedmsg/gateway/tasks/main.yml @@ -17,7 +17,7 @@ - fedmsgmonitor - name: Setup fedmsg-gateway config file - copy: src=gateway.py dest=/etc/fedmsg.d/gateway.py + ansible.builtin.copy: src=gateway.py dest=/etc/fedmsg.d/gateway.py tags: - config - fedmsg/gateway @@ -32,7 +32,7 @@ - fedmsg/gateway - name: Bump fs limits by installing a drop-in systemd config - copy: > + ansible.builtin.copy: > src=fs-limits.conf dest=/etc/systemd/system/fedmsg-gateway.service.d/fs-limits.conf tags: diff --git a/roles/fedmsg/hub/tasks/main.yml b/roles/fedmsg/hub/tasks/main.yml index 84f51901af..8fa398b171 100644 --- a/roles/fedmsg/hub/tasks/main.yml +++ b/roles/fedmsg/hub/tasks/main.yml @@ -30,7 +30,7 @@ when: "'python34_fedmsg' in group_names" - name: Enable the websocket server if we should - copy: src=websockets.py dest=/etc/fedmsg.d/websockets.py + ansible.builtin.copy: src=websockets.py dest=/etc/fedmsg.d/websockets.py when: enable_websocket_server notify: restart fedmsg-hub diff --git a/roles/fedora-budget/build/tasks/main.yml b/roles/fedora-budget/build/tasks/main.yml index b360cf600e..99a6892ad4 100644 --- a/roles/fedora-budget/build/tasks/main.yml +++ b/roles/fedora-budget/build/tasks/main.yml @@ -8,17 +8,23 @@ - fedora-budget - fedora-budget/build -- copy: > - src=cron-budget-sync dest=/etc/cron.d/budget-sync - owner=root group=root mode=0644 +- ansible.builtin.copy: + src: cron-budget-sync + dest: /etc/cron.d/budget-sync + owner: root + group: root + mode: "0644" tags: - fedora-budget - fedora-budget/build when: env == "production" -- copy: > - src=cron-budget-sync.stg dest=/etc/cron.d/budget-sync - owner=root group=root mode=0644 +- ansible.builtin.copy: + src: cron-budget-sync.stg + dest: /etc/cron.d/budget-sync + owner: root + group: root + mode: "0644" tags: - fedora-budget - fedora-budget/build diff --git a/roles/fedora-budget/proxy/tasks/main.yml b/roles/fedora-budget/proxy/tasks/main.yml index d9add06158..2492c84aca 100644 --- a/roles/fedora-budget/proxy/tasks/main.yml +++ b/roles/fedora-budget/proxy/tasks/main.yml @@ -1,20 +1,20 @@ --- - name: Copy in the sync-budget cronjob - copy: src=cron-sync-budget dest=/etc/cron.d/sync-budget + ansible.builtin.copy: src=cron-sync-budget dest=/etc/cron.d/sync-budget tags: - fedora-web - fedora-web/budget when: env != "staging" - name: Copy in the sync-budget cronjob (stg) - copy: src=cron-sync-budget.stg dest=/etc/cron.d/sync-budget + ansible.builtin.copy: src=cron-sync-budget.stg dest=/etc/cron.d/sync-budget tags: - fedora-web - fedora-web/budget when: env == "staging" - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-docs/build/tasks/main.yml b/roles/fedora-docs/build/tasks/main.yml index 11e51cb073..ee240e4121 100644 --- a/roles/fedora-docs/build/tasks/main.yml +++ b/roles/fedora-docs/build/tasks/main.yml @@ -6,17 +6,23 @@ - fedora-docs - fedora-docs/build -- copy: > - src=cron-docs-sync dest=/etc/cron.d/docs-sync - owner=root group=root mode=0644 +- ansible.builtin.copy: + src: cron-docs-sync + dest: /etc/cron.d/docs-sync + owner: root + group: root + mode: "0644" tags: - fedora-docs - fedora-docs/build when: env == "production" -- copy: > - src=cron-docs-sync.stg dest=/etc/cron.d/docs-sync - owner=root group=root mode=0644 +- ansible.builtin.copy: + src: cron-docs-sync.stg + dest: /etc/cron.d/docs-sync + owner: root + group: root + mode: "0644" tags: - fedora-docs - fedora-docs/build diff --git a/roles/fedora-docs/proxy/tasks/main.yml b/roles/fedora-docs/proxy/tasks/main.yml index 42ecb66f25..d922c56cf8 100644 --- a/roles/fedora-docs/proxy/tasks/main.yml +++ b/roles/fedora-docs/proxy/tasks/main.yml @@ -1,5 +1,5 @@ --- -- copy: > +- ansible.builtin.copy: > src=docs-rsync.stg dest=/usr/local/bin/docs-rsync owner=root group=root mode=0755 tags: @@ -7,7 +7,7 @@ - fedora-docs/proxy when: env == "staging" -- copy: > +- ansible.builtin.copy: > src=docs-rsync dest=/usr/local/bin/docs-rsync owner=root group=root mode=0755 tags: @@ -15,7 +15,7 @@ - fedora-docs/proxy when: env == "production" -- copy: > +- ansible.builtin.copy: > src=cron-docs-rsync dest=/etc/cron.d/docs-rsync owner=root group=root mode=0644 tags: @@ -23,7 +23,7 @@ - fedora-docs/proxy when: env == "production" -- copy: > +- ansible.builtin.copy: > src=cron-docs-rsync.stg dest=/etc/cron.d/docs-rsync owner=root group=root mode=0644 tags: @@ -31,7 +31,7 @@ - fedora-docs/proxy when: env == "staging" -- copy: > +- ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: @@ -44,7 +44,7 @@ - fedora-docs/proxy when: env == "production" -- copy: > +- ansible.builtin.copy: > src={{item}}.stg dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-docs/translation/tasks/main.yml b/roles/fedora-docs/translation/tasks/main.yml index e7834084d5..d2687338f1 100644 --- a/roles/fedora-docs/translation/tasks/main.yml +++ b/roles/fedora-docs/translation/tasks/main.yml @@ -49,7 +49,7 @@ debug: var: user_result.ssh_public_key -- copy: +- ansible.builtin.copy: src: ssh_config dest: ~_update_docs_trans/.ssh/config owner: _update_docs_trans @@ -58,7 +58,7 @@ tags: - fedora-docs-translation -- copy: +- ansible.builtin.copy: src: docs-translation-update dest: /usr/local/bin/docs-translation-update owner: root @@ -67,7 +67,7 @@ tags: - fedora-docs-translation -- copy: +- ansible.builtin.copy: src: cron-docs-translation-update dest: /etc/cron.d/cron-docs-translation-update owner: root diff --git a/roles/fedora-messaging-utils/tasks/main.yml b/roles/fedora-messaging-utils/tasks/main.yml index 1096876d76..de28bb674d 100644 --- a/roles/fedora-messaging-utils/tasks/main.yml +++ b/roles/fedora-messaging-utils/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install messaging script for our improvized tracing - copy: src=simple_message_to_bus dest=/usr/local/bin/ mode=0755 + ansible.builtin.copy: src=simple_message_to_bus dest=/usr/local/bin/ mode=0755 tags: - fedora-messaging diff --git a/roles/fedora-web/alt/tasks/main.yml b/roles/fedora-web/alt/tasks/main.yml index 3a6c748195..bba14c2fe3 100644 --- a/roles/fedora-web/alt/tasks/main.yml +++ b/roles/fedora-web/alt/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Copy in the sync-alt cronjob - copy: src=cron-sync-alt dest=/etc/cron.d/sync-alt + ansible.builtin.copy: src=cron-sync-alt dest=/etc/cron.d/sync-alt tags: - fedora-web - fedora-web/alt - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/build/tasks/main.yml b/roles/fedora-web/build/tasks/main.yml index e75b2c13ca..d169342b11 100644 --- a/roles/fedora-web/build/tasks/main.yml +++ b/roles/fedora-web/build/tasks/main.yml @@ -50,7 +50,7 @@ when: ansible_distribution_major_version|int >= 9 - name: Create file to indicate we want live fedimg data - copy: + ansible.builtin.copy: dest: /var/fedora_websites_live_fedimg content: "Indicator file" tags: diff --git a/roles/fedora-web/candidate-registry/tasks/main.yml b/roles/fedora-web/candidate-registry/tasks/main.yml index 1c987717cf..7455d6f1bf 100644 --- a/roles/fedora-web/candidate-registry/tasks/main.yml +++ b/roles/fedora-web/candidate-registry/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Copy over the registry passwd - copy: src="{{private}}/files/docker-registry/{{env}}/candidate-htpasswd" dest=/etc/httpd/conf.d/candidate-registry.fedoraproject.org/passwd + ansible.builtin.copy: src="{{private}}/files/docker-registry/{{env}}/candidate-htpasswd" dest=/etc/httpd/conf.d/candidate-registry.fedoraproject.org/passwd owner=root group=root mode=0644 notify: - reload proxyhttpd diff --git a/roles/fedora-web/codecs/tasks/main.yml b/roles/fedora-web/codecs/tasks/main.yml index ff446f78a6..54fe507599 100644 --- a/roles/fedora-web/codecs/tasks/main.yml +++ b/roles/fedora-web/codecs/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Copy in the sync-labs cronjob - copy: src=cron-sync-codecs dest=/etc/cron.d/sync-codecs + ansible.builtin.copy: src=cron-sync-codecs dest=/etc/cron.d/sync-codecs tags: - fedora-web - fedora-web/codecs - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/community/tasks/main.yml b/roles/fedora-web/community/tasks/main.yml index f0dec4bc9c..5e7583fe72 100644 --- a/roles/fedora-web/community/tasks/main.yml +++ b/roles/fedora-web/community/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Copy in the sync-community cronjob - copy: src=cron-sync-community dest=/etc/cron.d/sync-community + ansible.builtin.copy: src=cron-sync-community dest=/etc/cron.d/sync-community tags: - fedora-web - fedora-web/community - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/fedora.im/tasks/main.yml b/roles/fedora-web/fedora.im/tasks/main.yml index a6af6ad546..1220bddc00 100644 --- a/roles/fedora-web/fedora.im/tasks/main.yml +++ b/roles/fedora-web/fedora.im/tasks/main.yml @@ -12,7 +12,7 @@ - fedora-web/fedora.im - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: @@ -24,7 +24,7 @@ - fedora-web/fedora.im - name: Copy in some matrix files - copy: > + ansible.builtin.copy: > src={{item}} dest=/srv/web/fedora.im/{{item}} owner=root group=root mode=0644 with_items: @@ -35,7 +35,7 @@ - fedora-web/fedora.im - name: Grab some images from design - copy: > + ansible.builtin.copy: > src={{item.src_name}} dest=/srv/web/fedora.im/{{item.dest}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/flocktofedora/tasks/main.yml b/roles/fedora-web/flocktofedora/tasks/main.yml index 87ee4e16aa..5619869e48 100644 --- a/roles/fedora-web/flocktofedora/tasks/main.yml +++ b/roles/fedora-web/flocktofedora/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Copy in the sync-flocktofedora cronjob - copy: src=cron-sync-flocktofedora dest=/etc/cron.d/sync-flocktofedora + ansible.builtin.copy: src=cron-sync-flocktofedora dest=/etc/cron.d/sync-flocktofedora tags: - fedora-web - fedora-web/flocktofedora - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/getfedora/tasks/main.yml b/roles/fedora-web/getfedora/tasks/main.yml index c887f87f0a..b2c60db48e 100644 --- a/roles/fedora-web/getfedora/tasks/main.yml +++ b/roles/fedora-web/getfedora/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Copy in the sync-getfedora cronjob - copy: src=cron-sync-getfedora dest=/etc/cron.d/sync-getfedora + ansible.builtin.copy: src=cron-sync-getfedora dest=/etc/cron.d/sync-getfedora tags: - fedora-web - fedora-web/getfedora - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/iot/tasks/main.yml b/roles/fedora-web/iot/tasks/main.yml index 345b8206f0..ef1fea4953 100644 --- a/roles/fedora-web/iot/tasks/main.yml +++ b/roles/fedora-web/iot/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Copy in the sync-iot cronjob - copy: src=cron-sync-iot dest=/etc/cron.d/sync-iot + ansible.builtin.copy: src=cron-sync-iot dest=/etc/cron.d/sync-iot tags: - fedora-web - fedora-web/iot - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/labs/tasks/main.yml b/roles/fedora-web/labs/tasks/main.yml index a39e74bcb7..ba95eeb2a4 100644 --- a/roles/fedora-web/labs/tasks/main.yml +++ b/roles/fedora-web/labs/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Copy in the sync-labs cronjob - copy: src=cron-sync-labs dest=/etc/cron.d/sync-labs + ansible.builtin.copy: src=cron-sync-labs dest=/etc/cron.d/sync-labs tags: - fedora-web - fedora-web/labs - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/main/tasks/main.yml b/roles/fedora-web/main/tasks/main.yml index 7ebf9638f7..d2d0e96642 100644 --- a/roles/fedora-web/main/tasks/main.yml +++ b/roles/fedora-web/main/tasks/main.yml @@ -17,7 +17,7 @@ - fedora-web/main - name: Copy in the sync-fedora-web-v3 cronjob - copy: + ansible.builtin.copy: src: cron-sync-fedora-web-v3 dest: /etc/cron.d/sync-fedora-web tags: @@ -46,7 +46,7 @@ - fedora-web/google-site-verification - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: @@ -87,7 +87,7 @@ - fedora-web/hotspot - name: Create a file for hotspot - copy: dest=/srv/web/hotspot.txt content="OK" + ansible.builtin.copy: dest=/srv/web/hotspot.txt content="OK" owner=root group=root mode=0644 setype=httpd_sys_content_t tags: @@ -98,7 +98,7 @@ # create google validation for mattdm. See https://pagure.io/fedora-websites/issue/729 - name: Create a file for google validation - copy: dest=/srv/web/google4ddeb43aa58b0de1.html src=google4ddeb43aa58b0de1.html + ansible.builtin.copy: dest=/srv/web/google4ddeb43aa58b0de1.html src=google4ddeb43aa58b0de1.html owner=root group=root mode=0644 setype=httpd_sys_content_t tags: @@ -118,7 +118,7 @@ # TODO -- turn these into redirects in playbooks/groups/proxies-redirect.yml - name: Copy over some miscellaneous redirects (for stg) - copy: > + ansible.builtin.copy: > src=redirects.conf.stg dest=/etc/httpd/conf.d/{{website}}/redirects.conf owner=root group=root mode=0644 when: env == "staging" @@ -130,7 +130,7 @@ # TODO -- turn these into redirects in playbooks/groups/proxies-redirect.yml - name: Copy over some miscellaneous redirects (for prod) - copy: > + ansible.builtin.copy: > src=redirects.conf.prod dest=/etc/httpd/conf.d/{{website}}/redirects.conf owner=root group=root mode=0644 when: env != "staging" @@ -143,7 +143,7 @@ # setup some well-known files for matrix - name: Create a file for matrix clients - copy: dest=/srv/web/.well-known-matrix-client-fedoraproject-org src=.well-known-matrix-client-fedoraproject-org + ansible.builtin.copy: dest=/srv/web/.well-known-matrix-client-fedoraproject-org src=.well-known-matrix-client-fedoraproject-org owner=root group=root mode=0644 setype=httpd_sys_content_t tags: @@ -152,7 +152,7 @@ - fedora-web/matrix - name: Create a file for matrix servers - copy: dest=/srv/web/.well-known-matrix-server-fedoraproject-org src=.well-known-matrix-server-fedoraproject-org + ansible.builtin.copy: dest=/srv/web/.well-known-matrix-server-fedoraproject-org src=.well-known-matrix-server-fedoraproject-org owner=root group=root mode=0644 setype=httpd_sys_content_t tags: @@ -162,7 +162,7 @@ # setup well-known for flathub verification - name: Create a file for flathub verification - copy: + ansible.builtin.copy: dest: /srv/web/.well-known-org.flathub.VerifiedApps.txt src: .well-known-org.flathub.VerifiedApps.txt owner: root diff --git a/roles/fedora-web/mirrors/tasks/main.yml b/roles/fedora-web/mirrors/tasks/main.yml index eef555b68b..2c281da4dc 100644 --- a/roles/fedora-web/mirrors/tasks/main.yml +++ b/roles/fedora-web/mirrors/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Copy in the sync-mirrors cronjob - copy: src=cron-sync-mirrors dest=/etc/cron.d/sync-mirrors + ansible.builtin.copy: src=cron-sync-mirrors dest=/etc/cron.d/sync-mirrors tags: - fedora-web - fedora-web/mirrors - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/ols/tasks/main.yml b/roles/fedora-web/ols/tasks/main.yml index 57db90038f..b549e83af5 100644 --- a/roles/fedora-web/ols/tasks/main.yml +++ b/roles/fedora-web/ols/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/ostree/tasks/main.yml b/roles/fedora-web/ostree/tasks/main.yml index 130fd0a1d2..041dd57616 100644 --- a/roles/fedora-web/ostree/tasks/main.yml +++ b/roles/fedora-web/ostree/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Copy ostree config file - copy: src=ostree.conf dest=/etc/httpd/conf.d/ostree.fedoraproject.org/ostree.conf + ansible.builtin.copy: src=ostree.conf dest=/etc/httpd/conf.d/ostree.fedoraproject.org/ostree.conf notify: - reload proxyhttpd tags: @@ -34,7 +34,7 @@ when: env == 'staging' - name: Copy over the static files - copy: src={{item}} dest=/srv/web/ostree/{{item}} mode=0644 + ansible.builtin.copy: src={{item}} dest=/srv/web/ostree/{{item}} mode=0644 with_items: - config - mirrorlist @@ -69,7 +69,7 @@ when: env == 'staging' - name: Copy over the static IoT files - copy: src=iot_{{item}} dest=/srv/web/ostree/iot/{{item}} mode=0644 + ansible.builtin.copy: src=iot_{{item}} dest=/srv/web/ostree/iot/{{item}} mode=0644 with_items: - config - mirrorlist @@ -78,7 +78,7 @@ - ostree - name: Copy in the sync-summary cron job - copy: src=cron-sync-ostree-summary dest=/etc/cron.d/sync-ostree-summary + ansible.builtin.copy: src=cron-sync-ostree-summary dest=/etc/cron.d/sync-ostree-summary tags: - fedora-web - ostree diff --git a/roles/fedora-web/registry/tasks/main.yml b/roles/fedora-web/registry/tasks/main.yml index aca9ad7e95..83105351b7 100644 --- a/roles/fedora-web/registry/tasks/main.yml +++ b/roles/fedora-web/registry/tasks/main.yml @@ -10,7 +10,7 @@ - fedora-web - name: Copy over the Fedora Server CA cert - copy: src="{{ private }}/files/fedora-ca.cert" dest=/etc/pki/httpd/fedora-server-ca.cert + ansible.builtin.copy: src="{{ private }}/files/fedora-ca.cert" dest=/etc/pki/httpd/fedora-server-ca.cert owner=root group=root mode=0644 notify: - reload proxyhttpd @@ -25,7 +25,7 @@ - fedora-web/registry - name: Copy over the registry CA - copy: src="{{private}}/files/docker-registry/{{env}}/pki/ca.crt" + ansible.builtin.copy: src="{{private}}/files/docker-registry/{{env}}/pki/ca.crt" dest="/etc/pki/httpd/registry-ca-{{env}}.cert" owner=root group=root mode=0644 notify: @@ -35,7 +35,7 @@ - fedora-web/registry - name: Copy over the registry passwd - copy: src="passwd-{{env}}" dest=/etc/httpd/conf.d/registry.fedoraproject.org/passwd + ansible.builtin.copy: src="passwd-{{env}}" dest=/etc/httpd/conf.d/registry.fedoraproject.org/passwd owner=root group=root mode=0644 notify: - reload proxyhttpd diff --git a/roles/fedora-web/src/tasks/main.yml b/roles/fedora-web/src/tasks/main.yml index 5fe2cb9a2a..c9ebadea5f 100644 --- a/roles/fedora-web/src/tasks/main.yml +++ b/roles/fedora-web/src/tasks/main.yml @@ -10,7 +10,7 @@ - fedora-web/src - name: Install the pkgs keytab - copy: src="{{ private }}/files/keytabs/{{env}}/pkgs" + ansible.builtin.copy: src="{{ private }}/files/keytabs/{{env}}/pkgs" dest=/etc/pkgs.keytab owner=apache group=apache @@ -22,7 +22,7 @@ - fedora-web/src - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/start/tasks/main.yml b/roles/fedora-web/start/tasks/main.yml index 72899d168a..367d47991c 100644 --- a/roles/fedora-web/start/tasks/main.yml +++ b/roles/fedora-web/start/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Copy in the sync-start cronjob - copy: src=cron-sync-start dest=/etc/cron.d/sync-start + ansible.builtin.copy: src=cron-sync-start dest=/etc/cron.d/sync-start tags: - fedora-web - fedora-web/start - name: Copy some config files for {{website}} - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/translation/tasks/main.yml b/roles/fedora-web/translation/tasks/main.yml index b132f5fde5..9177b00cc3 100644 --- a/roles/fedora-web/translation/tasks/main.yml +++ b/roles/fedora-web/translation/tasks/main.yml @@ -23,7 +23,7 @@ var: user_result.ssh_public_key - name: Create gitconfig for user - copy: + ansible.builtin.copy: content: | [user] name = ♪ I'm a bot, bot, bot ♪ @@ -37,7 +37,7 @@ tags: - fedora-web-translation -- copy: +- ansible.builtin.copy: src: ssh_config dest: ~_update_web_trans/.ssh/config owner: _update_web_trans @@ -46,7 +46,7 @@ tags: - fedora-web-translation -- copy: +- ansible.builtin.copy: src: web-translation-update dest: /usr/local/bin/web-translation-update owner: root @@ -55,7 +55,7 @@ tags: - fedora-web-translation -- copy: +- ansible.builtin.copy: src: cron-web-translation-update dest: /etc/cron.d/cron-web-translation-update owner: root diff --git a/roles/fedora_nightlies/tasks/main.yml b/roles/fedora_nightlies/tasks/main.yml index 40945782db..8dfc2a8b96 100644 --- a/roles/fedora_nightlies/tasks/main.yml +++ b/roles/fedora_nightlies/tasks/main.yml @@ -117,7 +117,7 @@ # We always use the openQA production cert and key here for now; we # don't really need a separate identity for fedora_nightlies. - name: Deploy the Fedora infra fedora-messaging cert (openQA production) - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/production/pki/issued/openqa.crt" dest: /etc/pki/fedora-messaging/openqa-cert.pem mode: "0644" @@ -132,7 +132,7 @@ # on the same box as openQA, in fact we need to keep the ownership in # line. This needs making cleaner somehow. - name: Deploy the Fedora infra fedora-messaging key - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/production/pki/private/openqa.key" dest: /etc/pki/fedora-messaging/openqa-key.pem mode: "0640" diff --git a/roles/fedoraloveskde/build/tasks/main.yml b/roles/fedoraloveskde/build/tasks/main.yml index 4d60a9eba5..a6faefb66f 100644 --- a/roles/fedoraloveskde/build/tasks/main.yml +++ b/roles/fedoraloveskde/build/tasks/main.yml @@ -15,7 +15,7 @@ - name: Copy syncfedoraloveskde script (stg) when: env == "staging" - copy: + ansible.builtin.copy: src: sync{{item}}.stg.sh dest: /usr/local/bin/sync{{item}} owner: root @@ -28,7 +28,7 @@ - name: Copy syncfedoraloveskde script (prod) when: env == "production" - copy: + ansible.builtin.copy: src: "{{item}}.sh" dest: "/usr/local/bin/{{item}}" owner: root @@ -40,7 +40,7 @@ - fedoraloveskde - name: Install the syncfedoraloveskde cron job - copy: + ansible.builtin.copy: src: "{{item}}.cron" dest: "/etc/cron.d/{{item}}.cron" owner: root diff --git a/roles/fedoraloveskde/website/tasks/main.yml b/roles/fedoraloveskde/website/tasks/main.yml index 3f4eb6ff75..da86e0b22e 100644 --- a/roles/fedoraloveskde/website/tasks/main.yml +++ b/roles/fedoraloveskde/website/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Copy in the sync-fedoraloveskde cronjob - copy: + ansible.builtin.copy: src: "cron-sync-{{item}}" dest: "/etc/cron.d/sync-{{item}}" with_items: @@ -9,7 +9,7 @@ - fedoraloveskde - name: Copy some config files for {{website}} - copy: + ansible.builtin.copy: src: "{{item}}" dest: "/etc/httpd/conf.d/{{website}}/{{item}}" owner: root diff --git a/roles/flatpak-cache/tasks/main.yml b/roles/flatpak-cache/tasks/main.yml index cb2268f441..e493264b60 100644 --- a/roles/flatpak-cache/tasks/main.yml +++ b/roles/flatpak-cache/tasks/main.yml @@ -39,7 +39,7 @@ - config - name: Install SSL Certificates - copy: + ansible.builtin.copy: src: "{{ item }}" dest: /etc/pki/squid/ owner: squid diff --git a/roles/freemedia/tasks/main.yml b/roles/freemedia/tasks/main.yml index 7716c8c4da..654ede0519 100644 --- a/roles/freemedia/tasks/main.yml +++ b/roles/freemedia/tasks/main.yml @@ -17,7 +17,7 @@ - config - name: Install /etc/httpd/conf.d/freemedia-app.conf file - copy: > + ansible.builtin.copy: > src="freemedia-app.conf" dest="/etc/httpd/conf.d/freemedia-app.conf" owner=root @@ -29,7 +29,7 @@ - config - name: Install /srv/web/freemedia/FreeMedia-form.html file - copy: > + ansible.builtin.copy: > src="FreeMedia-close.html" dest="/srv/web/freemedia/FreeMedia-form.html" owner=root @@ -39,7 +39,7 @@ - config - name: Install /srv/web/freemedia/process.php file - copy: > + ansible.builtin.copy: > src="process.php" dest="/srv/web/freemedia/process.php" owner=root @@ -49,7 +49,7 @@ - config - name: Install /srv/web/freemedia/FreeMedia-error.html file - copy: > + ansible.builtin.copy: > src="FreeMedia-error.html" dest="/srv/web/freemedia/FreeMedia-error.html" owner=root @@ -59,7 +59,7 @@ - config - name: Install /srv/web/freemedia/FreeMedia-error-embargoed-destination.html file - copy: > + ansible.builtin.copy: > src="FreeMedia-error-embargoed-destination.html" dest="/srv/web/freemedia/FreeMedia-error-embargoed-destination.html" owner=root diff --git a/roles/geoip-city-wsgi/app/tasks/main.yml b/roles/geoip-city-wsgi/app/tasks/main.yml index fa269bcc3c..fb59c7b399 100644 --- a/roles/geoip-city-wsgi/app/tasks/main.yml +++ b/roles/geoip-city-wsgi/app/tasks/main.yml @@ -26,7 +26,7 @@ - name: Install geoip-city-wsgi.conf file - copy: > + ansible.builtin.copy: > src="geoip-city-wsgi.conf" dest="/etc/httpd/conf.d/geoip-city-wsgi.conf" owner=root @@ -54,7 +54,7 @@ - geoip-city-wsgi/app - name: Install geoip-city.wsgi file - copy: > + ansible.builtin.copy: > src="geoip-city.wsgi" dest="/usr/share/geoip-city-wsgi/geoip-city.wsgi" owner=root diff --git a/roles/geoip-city-wsgi/proxy/tasks/main.yml b/roles/geoip-city-wsgi/proxy/tasks/main.yml index e8e0bf550f..af363efc8b 100644 --- a/roles/geoip-city-wsgi/proxy/tasks/main.yml +++ b/roles/geoip-city-wsgi/proxy/tasks/main.yml @@ -17,7 +17,7 @@ - geoip-city-wsgi/proxy - name: "Copy in the fancy about page stuff. It's like wsgi with geoip aioli" - copy: src={{item}} dest=/srv/web/geoip/{{item}} mode=0644 owner=root group=root + ansible.builtin.copy: src={{item}} dest=/srv/web/geoip/{{item}} mode=0644 owner=root group=root with_items: - index.html - globe.png diff --git a/roles/geoip/tasks/main.yml b/roles/geoip/tasks/main.yml index 3b04cf0f07..ca0d7e305f 100644 --- a/roles/geoip/tasks/main.yml +++ b/roles/geoip/tasks/main.yml @@ -23,14 +23,14 @@ - geoip - name: Push over the older geoip db - copy: src={{ item }} dest=/usr/share/GeoIP/ + ansible.builtin.copy: src={{ item }} dest=/usr/share/GeoIP/ with_fileglob: - "{{ bigfiles }}/geoip/*.dat" tags: - geoip - name: Push over the newer geoip db - copy: src={{ item }} dest=/usr/share/GeoIP/ + ansible.builtin.copy: src={{ item }} dest=/usr/share/GeoIP/ with_fileglob: - "{{ bigfiles }}/geoip/*.mmdb" tags: @@ -38,4 +38,4 @@ # comment out 2022-05-19. Script does not work since 2018. # - name: Geoip syncing script via cron -# copy: src=geoip_sync dest=/etc/cron.d/geoip_sync mode=0644 +# ansible.builtin.copy: src=geoip_sync dest=/etc/cron.d/geoip_sync mode=0644 diff --git a/roles/git/checks/tasks/main.yml b/roles/git/checks/tasks/main.yml index 8228e50439..0ca020ba05 100644 --- a/roles/git/checks/tasks/main.yml +++ b/roles/git/checks/tasks/main.yml @@ -12,7 +12,7 @@ - git/checks - name: Install the script - copy: > + ansible.builtin.copy: > src=check-perms.py dest=/usr/local/bin/git-check-perms owner=root group=root mode=0755 tags: @@ -20,7 +20,7 @@ - git/checks - name: Install post-receive check script - copy: > + ansible.builtin.copy: > src=distgit_check_hook.py dest=/usr/local/bin/distgit_check_hook.py owner=root group=root mode=0755 tags: diff --git a/roles/git/hooks/tasks/main.yml b/roles/git/hooks/tasks/main.yml index b28e5001a5..054b917226 100644 --- a/roles/git/hooks/tasks/main.yml +++ b/roles/git/hooks/tasks/main.yml @@ -18,7 +18,7 @@ - name: Install the git hooks - copy: src={{item}} dest=/usr/share/git-core/ mode=0755 + ansible.builtin.copy: src={{item}} dest=/usr/share/git-core/ mode=0755 with_items: - post-receive-chained - post-receive-chained-forks @@ -29,7 +29,7 @@ - git/hooks - name: Install the git mail hooks - copy: src={{item}} dest=/usr/share/git-core/mail-hooks/ mode=0755 + ansible.builtin.copy: src={{item}} dest=/usr/share/git-core/mail-hooks/ mode=0755 with_items: - util.py - git.py diff --git a/roles/git/make_checkout_seed/tasks/main.yml b/roles/git/make_checkout_seed/tasks/main.yml index 8a5a342ff4..a26caace0b 100644 --- a/roles/git/make_checkout_seed/tasks/main.yml +++ b/roles/git/make_checkout_seed/tasks/main.yml @@ -12,11 +12,11 @@ when: env != 'staging' - name: Install the production version of the script and schedule its execution - copy: src=make-git-checkout-seed.sh dest=/usr/local/bin/make-git-checkout-seed.sh mode=0755 + ansible.builtin.copy: src=make-git-checkout-seed.sh dest=/usr/local/bin/make-git-checkout-seed.sh mode=0755 when: env != 'staging' - name: Install the alternative arch report script - copy: src=alternative_arch_report.py dest=/usr/local/bin/alternative_arch_report.py mode=0755 + ansible.builtin.copy: src=alternative_arch_report.py dest=/usr/local/bin/alternative_arch_report.py mode=0755 when: env != 'staging' - name: Install cron job. diff --git a/roles/github2fedmsg/tasks/main.yml b/roles/github2fedmsg/tasks/main.yml index e484d7ff53..6fbf3e693c 100644 --- a/roles/github2fedmsg/tasks/main.yml +++ b/roles/github2fedmsg/tasks/main.yml @@ -33,7 +33,7 @@ - restart apache - name: Copy github2fedmsg wsgi script - copy: > + ansible.builtin.copy: > src={{ item }} dest="/usr/share/github2fedmsg/{{ item }}" owner=apache group=apache mode=0644 with_items: @@ -57,7 +57,7 @@ - restart apache - name: Hotfix - allow velruse to do stateless openid - copy: > + ansible.builtin.copy: > src=openid.py dest=/usr/lib/python2.7/site-packages/velruse/providers/openid.py owner=root group=root mode=0644 diff --git a/roles/grobisplitter/tasks/main.yml b/roles/grobisplitter/tasks/main.yml index 5a625f1b45..0599a63f22 100644 --- a/roles/grobisplitter/tasks/main.yml +++ b/roles/grobisplitter/tasks/main.yml @@ -16,7 +16,7 @@ - grobi - name: Copy local/bin files - copy: src={{item}} dest=/usr/local/bin/ mode=0755 + ansible.builtin.copy: src={{item}} dest=/usr/local/bin/ mode=0755 with_items: - splitter.py - rhel8-split.sh @@ -24,7 +24,7 @@ - grobi - name: Daily cron job to split and merge repos - copy: src={{item}} dest=/etc/cron.d/ mode=0644 + ansible.builtin.copy: src={{item}} dest=/etc/cron.d/ mode=0644 with_items: - rhel8-split.cron tags: diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml index 70cc68415f..c0043bfe5c 100644 --- a/roles/haproxy/tasks/main.yml +++ b/roles/haproxy/tasks/main.yml @@ -22,7 +22,7 @@ - haproxy - name: Install limits.conf and 503.http - copy: src={{ item.file }} + ansible.builtin.copy: src={{ item.file }} dest={{ item.dest }} owner=root group=root mode=0600 with_items: @@ -32,7 +32,7 @@ - haproxy - name: Install pem cert - copy: src={{ item.file }} + ansible.builtin.copy: src={{ item.file }} dest={{ item.dest }} owner=root group=root mode=0600 with_items: @@ -42,7 +42,7 @@ - haproxy - name: Install ocp api pem cert - copy: src={{ private }}/files/httpd/api-int.ocp{{ env_suffix }}.fedoraproject.org.pem + ansible.builtin.copy: src={{ private }}/files/httpd/api-int.ocp{{ env_suffix }}.fedoraproject.org.pem dest=/etc/haproxy/ocp4.pem owner=root group=root mode=0600 tags: @@ -85,7 +85,7 @@ - selinux - name: Copy over our general haproxy selinux module - copy: src=selinux/fi-haproxy.pp dest=/usr/share/haproxy/fi-haproxy.pp + ansible.builtin.copy: src=selinux/fi-haproxy.pp dest=/usr/share/haproxy/fi-haproxy.pp register: fi_haproxy_module tags: - haproxy diff --git a/roles/hosts/tasks/main.yml b/roles/hosts/tasks/main.yml index b059b5e7af..727305a2c1 100644 --- a/roles/hosts/tasks/main.yml +++ b/roles/hosts/tasks/main.yml @@ -10,7 +10,7 @@ # Note that if it's not set it will just skip this play and do nothing. # - name: Setup /etc/hosts for some clients that are not on the vpn or are and in iad2 - copy: src={{ item }} dest=/etc/hosts + ansible.builtin.copy: src={{ item }} dest=/etc/hosts with_first_found: - "{{ inventory_hostname }}-hosts" - "{{ ansible_hostname }}-hosts" @@ -24,7 +24,7 @@ - hosts - name: Setup /etc/hosts for some clients on the vpn, that are not in iad2 - copy: src={{ item }} dest=/etc/hosts + ansible.builtin.copy: src={{ item }} dest=/etc/hosts with_first_found: - "{{ inventory_hostname }}-hosts" - "{{ ansible_hostname }}-hosts" diff --git a/roles/httpd/certificate/tasks/main.yml b/roles/httpd/certificate/tasks/main.yml index 0553ff9856..de5a503f28 100644 --- a/roles/httpd/certificate/tasks/main.yml +++ b/roles/httpd/certificate/tasks/main.yml @@ -6,7 +6,7 @@ --- - name: Copy over SSLCertificateChainFile if defined - copy: > + ansible.builtin.copy: > src={{private}}/files/httpd/{{SSLCertificateChainFile}} dest=/etc/pki/tls/certs/{{SSLCertificateChainFile}} owner=root @@ -20,7 +20,7 @@ - httpd/certificate - name: Copy {{certname}}.cert - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/pki/tls/certs/{{item | basename}} owner=root @@ -36,7 +36,7 @@ - httpd/certificate - name: Copy {{certname}}.key - copy: > + ansible.builtin.copy: > src={{item}} dest=/etc/pki/tls/private/{{item | basename}} owner=root diff --git a/roles/httpd/fingerprints/tasks/main.yml b/roles/httpd/fingerprints/tasks/main.yml index 36f4c27c1d..b902a53bb1 100644 --- a/roles/httpd/fingerprints/tasks/main.yml +++ b/roles/httpd/fingerprints/tasks/main.yml @@ -1,5 +1,5 @@ --- -- copy: src=fingerprints.html dest=/srv/web/fingerprints.html +- ansible.builtin.copy: src=fingerprints.html dest=/srv/web/fingerprints.html notify: - reload proxyhttpd tags: @@ -7,7 +7,7 @@ - httpd - httpd/fingerprints -- copy: src=fingerprints.conf dest=/etc/httpd/conf.d/{{website}}/fingerprints.conf +- ansible.builtin.copy: src=fingerprints.conf dest=/etc/httpd/conf.d/{{website}}/fingerprints.conf notify: - reload proxyhttpd tags: @@ -15,6 +15,6 @@ - httpd - httpd/fingerprints -- copy: src=/etc/ssh/ssh_known_hosts dest=/etc/ssh/ssh_known_hosts +- ansible.builtin.copy: src=/etc/ssh/ssh_known_hosts dest=/etc/ssh/ssh_known_hosts tags: - fingerprints diff --git a/roles/httpd/mod_ssl/tasks/main.yml b/roles/httpd/mod_ssl/tasks/main.yml index f43056956a..73715fa560 100644 --- a/roles/httpd/mod_ssl/tasks/main.yml +++ b/roles/httpd/mod_ssl/tasks/main.yml @@ -8,7 +8,7 @@ - httpd/mod_ssl - name: Copy over SSLCertificateChainFile if defined - copy: > + ansible.builtin.copy: > src=ssl.conf dest=/etc/httpd/conf.d/ssl.conf owner=root diff --git a/roles/httpd/proxy/tasks/main.yml b/roles/httpd/proxy/tasks/main.yml index f70489cabf..dc13480892 100644 --- a/roles/httpd/proxy/tasks/main.yml +++ b/roles/httpd/proxy/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Make sure the ticketkey is deployed - copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey_{{env}}.tkey + ansible.builtin.copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey_{{env}}.tkey owner=root group=root mode=0600 notify: - reload proxyhttpd @@ -46,7 +46,7 @@ - httpd/proxy - name: Set the apache mpm to use event MPM - copy: src=00-mpm.conf dest=/etc/httpd/conf.modules.d/00-mpm.conf + ansible.builtin.copy: src=00-mpm.conf dest=/etc/httpd/conf.modules.d/00-mpm.conf notify: - reload proxyhttpd tags: @@ -107,7 +107,7 @@ - httpdoverride - name: Create systemd drop in dir for httpd - copy: src=httpdoverride.conf dest=/etc/systemd/system/httpd.service.d/httpdoverride.conf + ansible.builtin.copy: src=httpdoverride.conf dest=/etc/systemd/system/httpd.service.d/httpdoverride.conf tags: - httpd - httpd/proxy diff --git a/roles/ipsilon/tasks/main.yml b/roles/ipsilon/tasks/main.yml index 6604f0f8a3..abfec3510a 100644 --- a/roles/ipsilon/tasks/main.yml +++ b/roles/ipsilon/tasks/main.yml @@ -132,7 +132,7 @@ - restart apache - name: Copy ipsilon OIDC client config - copy: + ansible.builtin.copy: src: "{{ private }}/files/ipsilon/openidc.{{env}}.static" dest: /etc/ipsilon/root/openidc.static.cfg owner: ipsilon @@ -156,7 +156,7 @@ - restart apache - name: Copy OIDC private key - copy: + ansible.builtin.copy: src: "{{ private }}/files/ipsilon/openidc{{ env_suffix }}.key" dest: /etc/ipsilon/root/openidc.key owner: ipsilon @@ -177,7 +177,7 @@ - ipsilon - name: Copy SAML2 private key - copy: + ansible.builtin.copy: src: "{{ private }}/files/saml2/{{ env }}/keys/idp.key" dest: /etc/ipsilon/root/saml2/idp.key owner: ipsilon @@ -187,7 +187,7 @@ - ipsilon - name: Copy SAML2 public key - copy: + ansible.builtin.copy: src: "{{ private }}/files/saml2/{{ env }}/keys/idp.crt" dest: /etc/ipsilon/root/saml2/idp.crt owner: ipsilon diff --git a/roles/ipsilon/tasks/patches.yml b/roles/ipsilon/tasks/patches.yml index 273d6c7a36..a722ddfdfc 100644 --- a/roles/ipsilon/tasks/patches.yml +++ b/roles/ipsilon/tasks/patches.yml @@ -11,7 +11,7 @@ state: directory - name: Download patches - copy: > + ansible.builtin.copy: > src=/srv/web/infra/bigfiles/hotfixes/ipsilon/{{ item }} dest=/opt/ipsilon-patches/{{item}}.patch owner=root group=root mode=0644 loop: "{{ ipsilon_patches }}" diff --git a/roles/iscsi_client/tasks/main.yml b/roles/iscsi_client/tasks/main.yml index 09ef20ac78..7fd37a6524 100644 --- a/roles/iscsi_client/tasks/main.yml +++ b/roles/iscsi_client/tasks/main.yml @@ -44,7 +44,7 @@ - services - name: Setup multipath.conf file - copy: src=multipath.conf dest=/etc/multipath.conf + ansible.builtin.copy: src=multipath.conf dest=/etc/multipath.conf tags: - config diff --git a/roles/keepalived/tasks/main.yml b/roles/keepalived/tasks/main.yml index 1ac3ca011d..859f438eb5 100644 --- a/roles/keepalived/tasks/main.yml +++ b/roles/keepalived/tasks/main.yml @@ -23,7 +23,7 @@ - restart keepalived - name: Install keepalived failover script for host (or default) - copy: src={{ item }} dest=/usr/local/bin/keepalived-notify.sh mode=755 + ansible.builtin.copy: src={{ item }} dest=/usr/local/bin/keepalived-notify.sh mode=755 with_first_found: - keepalived-notify.sh.{{ inventory_hostname }} - keepalived-notify.sh diff --git a/roles/keytab/service/tasks/main.yml b/roles/keytab/service/tasks/main.yml index 9f899e91f8..fe6263bf9e 100644 --- a/roles/keytab/service/tasks/main.yml +++ b/roles/keytab/service/tasks/main.yml @@ -116,7 +116,7 @@ when: not keytab_status.stat.exists - name: Deploy base64 keytab - copy: dest={{kt_location}}.b64 + ansible.builtin.copy: dest={{kt_location}}.b64 content={{keytab.stdout}} owner={{owner_user}} group={{owner_group}} mode=0600 tags: diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index a60720f85d..9a4bb05f32 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -29,7 +29,7 @@ - koji_builder - name: Add mock ssh keys - copy: src=mock_auth_keys dest=/var/lib/mock/.ssh/authorized_keys mode=640 owner=mock group=mock + ansible.builtin.copy: src=mock_auth_keys dest=/var/lib/mock/.ssh/authorized_keys mode=640 owner=mock group=mock tags: - koji_builder @@ -49,7 +49,7 @@ - koji_builder - name: Mockbuilder ssh key - copy: src=ftbfs_auth_keys dest=/home/mockbuilder/.ssh/authorized_keys mode=644 owner=mockbuilder group=mockbuilder + ansible.builtin.copy: src=ftbfs_auth_keys dest=/home/mockbuilder/.ssh/authorized_keys mode=644 owner=mockbuilder group=mockbuilder tags: - koji_builder @@ -188,7 +188,7 @@ - koji_builder - name: Override kojid.service file to set TasksMax to unlimited - copy: src=kojid.service dest=/etc/systemd/system/kojid.service + ansible.builtin.copy: src=kojid.service dest=/etc/systemd/system/kojid.service notify: - reload systemd - restart kojid @@ -207,13 +207,13 @@ - koji_builder - name: Copy over /root/.psphere/config.yaml - copy: src={{ private }}/files/koji/config.yaml dest=/root/.psphere/config.yaml + ansible.builtin.copy: src={{ private }}/files/koji/config.yaml dest=/root/.psphere/config.yaml tags: - koji_builder # done oz/imagefactory - name: Copy over /etc/security/limits.conf - copy: src=limits.conf dest=/etc/security/limits.conf + ansible.builtin.copy: src=limits.conf dest=/etc/security/limits.conf tags: - koji_builder @@ -230,7 +230,7 @@ # This is useful in the oz/imagefactory context for debugging - name: Install libvirtd.conf - copy: src="{{ files }}/virthost/libvirtd.conf" dest=/etc/libvirt/libvirtd.conf + ansible.builtin.copy: src="{{ files }}/virthost/libvirtd.conf" dest=/etc/libvirt/libvirtd.conf tags: - koji_builder when: env != "staging" @@ -244,7 +244,7 @@ # anymore. - name: Install libvirt/network.conf - copy: src=network.conf dest=/etc/libvirt/network.conf + ansible.builtin.copy: src=network.conf dest=/etc/libvirt/network.conf notify: - restart virtnetworkd tags: diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index 79fb8d7934..175d2e48cf 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -57,7 +57,7 @@ when: env == 'staging' - name: Set the apache mpm to use event MPM - copy: src=00-mpm.conf dest=/etc/httpd/conf.modules.d/00-mpm.conf + ansible.builtin.copy: src=00-mpm.conf dest=/etc/httpd/conf.modules.d/00-mpm.conf notify: - reload proxyhttpd tags: @@ -126,7 +126,7 @@ - fedora-messaging - name: Deploy koji/rabbitmq certificate - copy: src={{ item.src }} + ansible.builtin.copy: src={{ item.src }} dest=/etc/pki/rabbitmq/kojicert/{{ item.dest }} owner={{ item.owner }} group=root mode={{ item.mode }} with_items: @@ -163,7 +163,7 @@ - name: Install the configuration file for the sidetag plugin - copy: + ansible.builtin.copy: src: sidetag.conf dest: /etc/koji-hub/plugins/sidetag.conf tags: @@ -205,7 +205,7 @@ # - name: Install koji-hub keytab - copy: src={{ private }}/files/keytabs/{{ env }}/koji-hub-{{ fedmsg_koji_instance }} dest=/etc/koji-hub/koji-hub.keytab + ansible.builtin.copy: src={{ private }}/files/keytabs/{{ env }}/koji-hub-{{ fedmsg_koji_instance }} dest=/etc/koji-hub/koji-hub.keytab owner=apache group=apache mode=0600 notify: - reload httpd @@ -214,7 +214,7 @@ - koji_hub - name: Install GSSAPI keytab - copy: src={{ private }}/files/keytabs/{{ env }}/koji-gssapi dest=/etc/koji-hub/gssapi.keytab + ansible.builtin.copy: src={{ private }}/files/keytabs/{{ env }}/koji-gssapi dest=/etc/koji-hub/gssapi.keytab owner=apache group=apache mode=0600 notify: - reload httpd @@ -226,7 +226,7 @@ # install production certs and keys # - name: Install kojiweb_cert_key.pem - copy: src={{ private }}/files/koji/kojiweb_cert_key.pem dest=/etc/pki/tls/private/kojiweb_cert_key.pem owner=apache mode=600 + ansible.builtin.copy: src={{ private }}/files/koji/kojiweb_cert_key.pem dest=/etc/pki/tls/private/kojiweb_cert_key.pem owner=apache mode=600 notify: - reload httpd tags: @@ -235,7 +235,7 @@ when: env != 'staging' and ansible_hostname.startswith('koji') - name: Install production koji_cert.pem - copy: src={{ private }}/files/koji/koji_cert.pem dest=/etc/pki/tls/certs/koji_cert.pem owner=apache mode=600 + ansible.builtin.copy: src={{ private }}/files/koji/koji_cert.pem dest=/etc/pki/tls/certs/koji_cert.pem owner=apache mode=600 notify: - reload httpd tags: @@ -244,7 +244,7 @@ when: env != 'staging' and ansible_hostname.startswith('koji') - name: Install production koji_key.pem - copy: src={{ private }}/files/koji/koji_key.pem dest=/etc/pki/tls/private/koji_key.pem owner=apache mode=600 + ansible.builtin.copy: src={{ private }}/files/koji/koji_key.pem dest=/etc/pki/tls/private/koji_key.pem owner=apache mode=600 notify: - reload httpd tags: @@ -253,7 +253,7 @@ when: env != 'staging' and ansible_hostname.startswith('koji') - name: Instaall fedora-ca.cert in various places - copy: src={{ private }}/files/fedora-ca.cert dest={{ item }} owner=apache + ansible.builtin.copy: src={{ private }}/files/fedora-ca.cert dest={{ item }} owner=apache with_items: - /etc/kojira/extras_cacert.pem - /etc/pki/tls/certs/extras_cacert.pem @@ -264,13 +264,13 @@ - koji_hub - name: Install kojira_cert_key - copy: src={{ private }}/files/koji/kojira_cert_key.pem dest=/etc/kojira/kojira_cert_key.pem owner=apache mode=600 + ansible.builtin.copy: src={{ private }}/files/koji/kojira_cert_key.pem dest=/etc/kojira/kojira_cert_key.pem owner=apache mode=600 tags: - config - koji_hub - name: Koji web common config files - copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root + ansible.builtin.copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root with_items: - mash.conf - rel-eng.conf @@ -291,7 +291,7 @@ notify: reload httpd - name: Koji web staging config files - copy: src=kojiweb.conf.stg dest=/etc/httpd/conf.d/kojiweb-stg.conf owner=root group=root + ansible.builtin.copy: src=kojiweb.conf.stg dest=/etc/httpd/conf.d/kojiweb-stg.conf owner=root group=root tags: - config - koji_hub @@ -299,7 +299,7 @@ when: env == "staging" - name: Koji robots.txt config - copy: src=robots.txt dest=/var/www/html/robots.txt + ansible.builtin.copy: src=robots.txt dest=/var/www/html/robots.txt tags: - config - koji_hub @@ -381,7 +381,7 @@ - koji_hub - name: Set httpd service override for fedora-messaging to work - copy: src=httpd-override.conf dest=/etc/systemd/system/httpd.service.d/override.conf + ansible.builtin.copy: src=httpd-override.conf dest=/etc/systemd/system/httpd.service.d/override.conf notify: - reload httpd tags: @@ -416,7 +416,7 @@ - koji_hub - name: Install cron jobs in /usr/local/etc/ - copy: src={{ item }} dest=/usr/local/etc/{{ item }} + ansible.builtin.copy: src={{ item }} dest=/usr/local/etc/{{ item }} with_items: - koji-directory-cleanup - koji-gc @@ -427,7 +427,7 @@ - koji_hub - name: Enable crons on koji02 normally. - copy: src={{ item }} dest=/etc/cron.d/{{ item }} + ansible.builtin.copy: src={{ item }} dest=/etc/cron.d/{{ item }} with_items: - koji-directory-cleanup - koji-gc diff --git a/roles/kojipkgs/tasks/main.yml b/roles/kojipkgs/tasks/main.yml index 81178651c6..3c68b66d86 100644 --- a/roles/kojipkgs/tasks/main.yml +++ b/roles/kojipkgs/tasks/main.yml @@ -5,7 +5,7 @@ - kojipkgs - name: Install apache config files for local apache - copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root mode=644 + ansible.builtin.copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root mode=644 with_items: - infrastructure.conf notify: @@ -35,7 +35,7 @@ - kojipkgs - name: Disable welcome.conf giving a 403 on / (needed for monitoring) - copy: content="# welcome.conf disabled" dest=/etc/httpd/conf.d/welcome.conf + ansible.builtin.copy: content="# welcome.conf disabled" dest=/etc/httpd/conf.d/welcome.conf tags: - kojipkgs @@ -48,7 +48,7 @@ - kojipkgs - name: Override varnish service to restart on failure - copy: dest=/etc/systemd/system/varnish.service.d/restart-on-fail.conf + ansible.builtin.copy: dest=/etc/systemd/system/varnish.service.d/restart-on-fail.conf src=restart-on-fail.conf notify: - reload systemd diff --git a/roles/letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml index a5a8c70d8a..ed4fe5cfb9 100644 --- a/roles/letsencrypt/tasks/main.yml +++ b/roles/letsencrypt/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Setup defaults file delegate_to: "certgetter01.iad2.fedoraproject.org" - copy: > + ansible.builtin.copy: > dest=/etc/letsencrypt/cli.ini src=cli.ini owner=root @@ -60,7 +60,7 @@ - letsencrypt - name: Install the certificate - copy: > + ansible.builtin.copy: > dest=/etc/pki/tls/certs/{{site_name}}.cert content="{{certbot_certificate.stdout}}" owner=root @@ -72,7 +72,7 @@ - letsencrypt - name: Install the intermediate/chain certificate - copy: > + ansible.builtin.copy: > dest=/etc/pki/tls/certs/{{site_name}}.intermediate.cert content="{{certbot_chain.stdout}}" owner=root @@ -84,7 +84,7 @@ - letsencrypt - name: Install the key - copy: > + ansible.builtin.copy: > dest=/etc/pki/tls/private/{{site_name}}.key content="{{certbot_key.stdout}}" owner=root @@ -96,7 +96,7 @@ - letsencrypt - name: Install the certificate (additional host) - copy: > + ansible.builtin.copy: > dest=/etc/pki/tls/certs/{{site_name}}.cert content="{{certbot_certificate.stdout}}" owner=root @@ -111,7 +111,7 @@ - certbot_addhost is defined - name: Install the intermediate/chain certificate (additional host) - copy: > + ansible.builtin.copy: > dest=/etc/pki/tls/certs/{{site_name}}.intermediate.cert content="{{certbot_chain.stdout}}" owner=root @@ -126,7 +126,7 @@ - certbot_addhost is defined - name: Install the key (additional host) - copy: > + ansible.builtin.copy: > dest=/etc/pki/tls/private/{{site_name}}.key content="{{certbot_key.stdout}}" owner=root diff --git a/roles/logging/tasks/main.yml b/roles/logging/tasks/main.yml index 2794e6a8cd..c17c1c1d86 100644 --- a/roles/logging/tasks/main.yml +++ b/roles/logging/tasks/main.yml @@ -12,7 +12,7 @@ - fedora-messaging - name: Deploy the fedora-messaging CA - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{ env }}/pki/ca.crt" dest: /etc/pki/fedora-messaging/rabbitmq-ca.crt mode: "0644" @@ -24,7 +24,7 @@ - fedora-messaging - name: Deploy the fedora-messaging cert - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{ env }}/pki/issued/logging{{ env_suffix }}.crt" dest: /etc/pki/fedora-messaging/logging.crt mode: "0644" @@ -36,7 +36,7 @@ - fedora-messaging - name: Deploy the fedora-messaging key - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{ env }}/pki/private/logging{{ env_suffix }}.key" dest: /etc/pki/fedora-messaging/logging.key mode: "0640" diff --git a/roles/mariadb_server/tasks/main.yml b/roles/mariadb_server/tasks/main.yml index c94612ecf3..a466a28a47 100644 --- a/roles/mariadb_server/tasks/main.yml +++ b/roles/mariadb_server/tasks/main.yml @@ -14,7 +14,7 @@ when: ansible_distribution_major_version|int >= 8 - name: Copy my.cnf - copy: src={{ item }} dest=/etc/my.cnf owner=root group=root mode=0644 + ansible.builtin.copy: src={{ item }} dest=/etc/my.cnf owner=root group=root mode=0644 with_first_found: - "{{ mariadb_config }}" - my.cnf.{{ inventory_hostname }} @@ -49,7 +49,7 @@ - mariadb-server - name: Copy over backup scriplet - copy: src=backup-database dest=/usr/local/bin/backup-database mode=0755 + ansible.builtin.copy: src=backup-database dest=/usr/local/bin/backup-database mode=0755 tags: - mariadb-server diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml index a394158e23..4cd9bd0b67 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -85,7 +85,7 @@ - fedora-messaging - name: Deploy the fedora-messaging CA - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/ca.crt" dest: /etc/pki/fedora-messaging/cacert.pem mode: "0644" @@ -97,7 +97,7 @@ - fedora-messaging - name: Deploy the Fedora wiki fedora-messaging cert - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/mediawiki{{env_suffix}}.crt" dest: /etc/pki/fedora-messaging/mediawiki{{env_suffix}}-cert.pem mode: "0644" @@ -109,7 +109,7 @@ - fedora-messaging - name: Deploy the Fedora wiki fedora-messaging key - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/mediawiki{{env_suffix}}.key" dest: /etc/pki/fedora-messaging/mediawiki{{env_suffix}}-key.pem mode: "0640" @@ -138,7 +138,7 @@ - mediawiki - name: Fedora branding - copy: src=skins/ dest=/usr/share/{{ wikiver }}/skins owner=root group=root mode=775 + ansible.builtin.copy: src=skins/ dest=/usr/share/{{ wikiver }}/skins owner=root group=root mode=775 tags: - config - mediawiki @@ -272,7 +272,7 @@ tags: selinux - name: Copy over our custom selinux policy - copy: src=selinux/mediawiki.pp dest=/usr/local/share/selinux/mediawiki.pp + ansible.builtin.copy: src=selinux/mediawiki.pp dest=/usr/local/share/selinux/mediawiki.pp register: selinux_module tags: - selinux diff --git a/roles/memcached/tasks/main.yml b/roles/memcached/tasks/main.yml index 7dd45ec558..39145c1dd1 100644 --- a/roles/memcached/tasks/main.yml +++ b/roles/memcached/tasks/main.yml @@ -27,7 +27,7 @@ when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 - name: Make systemd override config - copy: src=memcached-systemdoverride.conf dest=/etc/systemd/system/memcached.service.d/ + ansible.builtin.copy: src=memcached-systemdoverride.conf dest=/etc/systemd/system/memcached.service.d/ tags: - memcached notify: diff --git a/roles/messaging/base/tasks/main.yml b/roles/messaging/base/tasks/main.yml index 81134ab0b7..083ab4e331 100644 --- a/roles/messaging/base/tasks/main.yml +++ b/roles/messaging/base/tasks/main.yml @@ -19,24 +19,24 @@ tags: - fedora-messaging -- name: "Copy fedora messaging key" - copy: src={{ private }}/files/rabbitmq/{{ env }}/pki/private/{{ item.key }}{% if env == 'staging' %}.stg{% endif %}.key +- name: "copy fedora messaging key" + ansible.builtin.copy: src={{ private }}/files/rabbitmq/{{ env }}/pki/private/{{ item.key }}{% if env == 'staging' %}.stg{% endif %}.key dest=/etc/pki/rabbitmq/{{ item.username }}/{{ item.key }}.key owner={{ item.username }} group=root mode=0600 with_items: "{{ messaging.certificates }}" tags: - fedora-messaging -- name: "Copy fedora messaging certificate" - copy: src={{ private }}/files/rabbitmq/{{ env }}/pki/issued/{{ item.key }}{% if env == 'staging' %}.stg{% endif %}.crt +- name: "copy fedora messaging certificate" + ansible.builtin.copy: src={{ private }}/files/rabbitmq/{{ env }}/pki/issued/{{ item.key }}{% if env == 'staging' %}.stg{% endif %}.crt dest=/etc/pki/rabbitmq/{{ item.username }}/{{ item.key }}.crt owner={{ item.username }} group=root mode=0644 with_items: "{{ messaging.certificates }}" tags: - fedora-messaging -- name: "Copy fedora messaging ca.crt for readers" - copy: src={{ private }}/files/rabbitmq/{{ env }}/pki/ca.crt +- name: "copy fedora messaging ca.crt for readers" + ansible.builtin.copy: src={{ private }}/files/rabbitmq/{{ env }}/pki/ca.crt dest=/etc/pki/rabbitmq/{{ item.username }}/ca.crt owner={{ item.username }} group=root mode=0644 with_items: "{{ messaging.certificates }}" diff --git a/roles/mirror_pagure_ansible/tasks/main.yml b/roles/mirror_pagure_ansible/tasks/main.yml index 1eb4bcc858..07b19019b5 100644 --- a/roles/mirror_pagure_ansible/tasks/main.yml +++ b/roles/mirror_pagure_ansible/tasks/main.yml @@ -43,7 +43,7 @@ - mirror_pagure_ansible - name: Deploy pagure/rabbitmq certificate - copy: src={{ item.src }} + ansible.builtin.copy: src={{ item.src }} dest=/etc/pki/fedora-messaging/{{ item.dest }} owner={{ item.owner }} group={{ item.group}} mode={{ item.mode }} with_items: diff --git a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml index dd07997d53..5487271589 100644 --- a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml +++ b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml @@ -37,7 +37,7 @@ - mirrorlist_proxy - name: Push over the newer geoip db - copy: src={{ item }} dest=/usr/share/GeoIP/ + ansible.builtin.copy: src={{ item }} dest=/usr/share/GeoIP/ with_fileglob: - "{{ bigfiles }}/geoip/*.mmdb" tags: @@ -81,7 +81,7 @@ - mirrorlist_proxy - name: Setup logrotate log for mirrormanager log files - copy: src=logrotate-mirrormanager dest=/etc/logrotate.d/mirrormanager + ansible.builtin.copy: src=logrotate-mirrormanager dest=/etc/logrotate.d/mirrormanager tags: - mirrorlist_proxy @@ -118,7 +118,7 @@ # install our cron script to handle hourly new protbuf cache changes. - name: Install script to restart mirrorlist processes on protobuf cache changes - copy: src=restart-mirrorlist-processes dest=/usr/local/bin/restart-mirrorlist-processes mode=0755 + ansible.builtin.copy: src=restart-mirrorlist-processes dest=/usr/local/bin/restart-mirrorlist-processes mode=0755 tags: - mirrorlist_proxy @@ -145,7 +145,7 @@ - mirrorlist_proxy - name: Copy over our custom selinux module - copy: src=selinux/mirrorlist-logrotate.pp dest=/usr/local/share/mirrorlist-logrotate/mirrorlist-logrotate.pp + ansible.builtin.copy: src=selinux/mirrorlist-logrotate.pp dest=/usr/local/share/mirrorlist-logrotate/mirrorlist-logrotate.pp register: selinux_module tags: - selinux diff --git a/roles/mod_limitipconn/tasks/main.yml b/roles/mod_limitipconn/tasks/main.yml index df68c83449..fcc604d7f5 100644 --- a/roles/mod_limitipconn/tasks/main.yml +++ b/roles/mod_limitipconn/tasks/main.yml @@ -3,4 +3,4 @@ package: name=mod_limitipconn state=present - name: Configuration file - copy: src=limitipconn.conf dest=/etc/httpd/conf.d/limitipconn.conf + ansible.builtin.copy: src=limitipconn.conf dest=/etc/httpd/conf.d/limitipconn.conf diff --git a/roles/mod_wsgi/tasks/main.yml b/roles/mod_wsgi/tasks/main.yml index 91a14b350b..301c738f15 100644 --- a/roles/mod_wsgi/tasks/main.yml +++ b/roles/mod_wsgi/tasks/main.yml @@ -25,7 +25,7 @@ when: ansible_distribution == 'Fedora' - name: Wsgi.conf - copy: src="wsgi.conf" dest=/etc/httpd/conf.d/wsgi.conf + ansible.builtin.copy: src="wsgi.conf" dest=/etc/httpd/conf.d/wsgi.conf notify: - restart apache tags: diff --git a/roles/mote/tasks/main.yml b/roles/mote/tasks/main.yml index 30ce3740c4..4137cb8999 100644 --- a/roles/mote/tasks/main.yml +++ b/roles/mote/tasks/main.yml @@ -11,7 +11,7 @@ - mote - name: Set the memcached sysconfig file - copy: + ansible.builtin.copy: src: memcached.sysconfig dest: /etc/sysconfig/memcached tags: @@ -30,7 +30,7 @@ - mote - name: Make systemd override config - copy: + ansible.builtin.copy: src: memcached.override dest: /etc/systemd/system/memcached.service.d/override.conf tags: diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index 538feaa243..c874c9aacc 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -38,7 +38,7 @@ when: "'mailman' in group_names or 'mirrorlist_proxies' in group_names" - name: Install local nrpe check scripts that are not packaged - copy: src="scripts/{{ item }}" dest="{{ libdir }}/nagios/plugins/{{ item }}" mode=0755 owner=nagios group=nagios + ansible.builtin.copy: src="scripts/{{ item }}" dest="{{ libdir }}/nagios/plugins/{{ item }}" mode=0755 owner=nagios group=nagios with_items: - check_haproxy_conns.py - check_postfix_queue @@ -65,7 +65,7 @@ - nagios_client - name: Install nrpe check for systemd unit - copy: src="scripts/{{ item }}" dest="{{ libdir }}/nagios/plugins/{{ item }}" mode=0775 owner=nagios group=nagios + ansible.builtin.copy: src="scripts/{{ item }}" dest="{{ libdir }}/nagios/plugins/{{ item }}" mode=0775 owner=nagios group=nagios with_items: - check_systemd_units when: inventory_hostname.startswith('pagure') @@ -89,7 +89,7 @@ - nagios_client - name: Copy over our custom selinux module - copy: src=selinux/fi-nrpe.pp dest=/usr/share/nrpe/fi-nrpe.pp + ansible.builtin.copy: src=selinux/fi-nrpe.pp dest=/usr/share/nrpe/fi-nrpe.pp register: selinux_module tags: - config @@ -105,7 +105,7 @@ - selinux - name: Copy over our custom selinux module for mirrorlist - copy: src=selinux/fi-nrpe.pp dest=/usr/share/nrpe/mirrormanager_container.pp + ansible.builtin.copy: src=selinux/fi-nrpe.pp dest=/usr/share/nrpe/mirrormanager_container.pp register: selinux_module_mirrorlist when: "'proxy' in inventory_hostname" tags: diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index 5a32747c43..c2f3d3507a 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -72,7 +72,7 @@ # ## Copy over the httpd SSL certs for external # - name: Install the SSL cert so that we can use https -# copy: > +# ansible.builtin.copy: > # src={{ private}}/files/httpd/{{ item }} dest=/etc/pki/tls/certs/{{ item }} # owner=root group=root mode=0600 # when: env == "production" and nagios_location == "external" @@ -113,7 +113,7 @@ ## Copy over the nagios configs - name: Copy /etc/nagios/conf.d/cfg files - copy: src=nagios/configs/{{ item }} dest=/etc/nagios/conf.d/{{ item }} + ansible.builtin.copy: src=nagios/configs/{{ item }} dest=/etc/nagios/conf.d/{{ item }} with_items: - escalations.cfg - timeperiods.cfg @@ -122,7 +122,7 @@ - nagios_server - name: Copy over the main conf file - copy: src=nagios/configs/nagios.cfg dest=/etc/nagios mode=0644 group=root owner=root + ansible.builtin.copy: src=nagios/configs/nagios.cfg dest=/etc/nagios mode=0644 group=root owner=root tags: - config - nagios_server @@ -130,7 +130,7 @@ ## Copy over the command scripts - name: Copy /etc/nagios/commands - copy: src=nagios/commands/{{ item }} dest=/etc/nagios/commands/{{ item }} + ansible.builtin.copy: src=nagios/commands/{{ item }} dest=/etc/nagios/commands/{{ item }} with_items: - disk.cfg - dns.cfg @@ -173,7 +173,7 @@ ## Copy over the hosts - name: Copy /etc/nagios/hosts - copy: src=nagios/hosts/ dest=/etc/nagios/hosts/ + ansible.builtin.copy: src=nagios/hosts/ dest=/etc/nagios/hosts/ tags: - nagios_config - nagios_server @@ -181,7 +181,7 @@ ## Copy over the services - name: Copy /etc/nagios/services (PHX2 specific files) - copy: src=nagios/services/iad2_internal/{{ item }} dest=/etc/nagios/services/{{ item }} + ansible.builtin.copy: src=nagios/services/iad2_internal/{{ item }} dest=/etc/nagios/services/{{ item }} with_items: - basset.cfg - certgetter.cfg @@ -202,7 +202,7 @@ notify: restart nagios - name: Copy /etc/nagios/services (IAD2 specific files) - copy: src=nagios/services/iad2_internal/{{ item }} dest=/etc/nagios/services/{{ item }} + ansible.builtin.copy: src=nagios/services/iad2_internal/{{ item }} dest=/etc/nagios/services/{{ item }} with_items: - basset.cfg - certgetter.cfg @@ -224,7 +224,7 @@ notify: restart nagios - name: Copy /etc/nagios/services (internal files) - copy: src=nagios/services/{{ item }} dest=/etc/nagios/services/{{ item }} + ansible.builtin.copy: src=nagios/services/{{ item }} dest=/etc/nagios/services/{{ item }} with_items: - copr.cfg - dns.cfg @@ -252,7 +252,7 @@ ## Copy over the services - name: Copy /etc/nagios/services (External) - copy: src=nagios/services/{{ item }} dest=/etc/nagios/services/{{ item }} + ansible.builtin.copy: src=nagios/services/{{ item }} dest=/etc/nagios/services/{{ item }} with_items: - dns.cfg - smtp-mm.cfg @@ -286,7 +286,7 @@ ## Copy over the servicegroups - name: Copy /etc/nagios/servicegroups - copy: src=nagios/servicegroups/{{item}} dest=/etc/nagios/servicegroups/{{item}} + ansible.builtin.copy: src=nagios/servicegroups/{{item}} dest=/etc/nagios/servicegroups/{{item}} with_items: - bodhi.cfg - fas.cfg @@ -301,24 +301,24 @@ ## Copy over the plugins - name: Copy plugins - copy: src=nagios/plugins/ dest=/usr/lib64/nagios/plugins/ mode=0755 owner=root group=root + ansible.builtin.copy: src=nagios/plugins/ dest=/usr/lib64/nagios/plugins/ mode=0755 owner=root group=root tags: - nagios_server ## Copy over the programs - name: Copy irc-colorize.py - copy: src=nagios/scripts/irc-colorize.py dest=/usr/local/bin/irc-colorize.py mode=0755 group=root owner=root + ansible.builtin.copy: src=nagios/scripts/irc-colorize.py dest=/usr/local/bin/irc-colorize.py mode=0755 group=root owner=root tags: - nagios_server - name: Copy check_nagios_notifications.py - copy: src=nagios/scripts/check_nagios_notifications.py dest=/usr/local/bin/check_nagios_notifications.py mode=0755 group=root owner=root + ansible.builtin.copy: src=nagios/scripts/check_nagios_notifications.py dest=/usr/local/bin/check_nagios_notifications.py mode=0755 group=root owner=root tags: - nagios_server - name: Copy robots.txt - copy: src=httpd/robots.txt dest=/var/www/robots.txt + ansible.builtin.copy: src=httpd/robots.txt dest=/var/www/robots.txt tags: - nagios_server @@ -527,7 +527,7 @@ - nagios_server - name: Copy over our custom selinux module - copy: src=selinux/nagios_hostname.pp dest=/usr/local/share/nagios-policy/nagios_hostname.pp + ansible.builtin.copy: src=selinux/nagios_hostname.pp dest=/usr/local/share/nagios-policy/nagios_hostname.pp register: selinux_module tags: - nagios_server @@ -539,7 +539,7 @@ - nagios_server - name: Copy over our custom selinux module - copy: src=selinux/nagios_nrpe.pp dest=/usr/local/share/nagios-policy/nagios_nrpe.pp + ansible.builtin.copy: src=selinux/nagios_nrpe.pp dest=/usr/local/share/nagios-policy/nagios_nrpe.pp register: selinux_module2 tags: - nagios_server diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml index 1943b29d66..9b5ea80628 100644 --- a/roles/nfs/client/tasks/main.yml +++ b/roles/nfs/client/tasks/main.yml @@ -1,7 +1,7 @@ # Setup our idmapd.conf file. It should be loaded automagically. --- - name: Idmapd.conf - copy: src=idmapd.conf dest=/etc/idmapd.conf + ansible.builtin.copy: src=idmapd.conf dest=/etc/idmapd.conf tags: - nfs/client diff --git a/roles/nfs/server/tasks/main.yml b/roles/nfs/server/tasks/main.yml index 819712edd9..fbedafca3c 100644 --- a/roles/nfs/server/tasks/main.yml +++ b/roles/nfs/server/tasks/main.yml @@ -11,7 +11,7 @@ - nfs/server - name: Setup /etc/exports - copy: src={{ inventory_hostname }}-exports dest=/etc/exports + ansible.builtin.copy: src={{ inventory_hostname }}-exports dest=/etc/exports register: exports tags: - nfs/server diff --git a/roles/opendkim/tasks/main.yml b/roles/opendkim/tasks/main.yml index 334e80a742..abfb088ab4 100644 --- a/roles/opendkim/tasks/main.yml +++ b/roles/opendkim/tasks/main.yml @@ -6,49 +6,49 @@ - package - name: Install opendkim.conf - copy: src=opendkim.conf dest=/etc/opendkim.conf + ansible.builtin.copy: src=opendkim.conf dest=/etc/opendkim.conf tags: - opendkim - config - base - name: Install opendkim KeyTable file - copy: src=KeyTable dest=/etc/opendkim/KeyTable mode=644 owner=opendkim group=opendkim + ansible.builtin.copy: src=KeyTable dest=/etc/opendkim/KeyTable mode=644 owner=opendkim group=opendkim tags: - opendkim - config - base - name: Install opendkim SigningTable file - copy: src=SigningTable dest=/etc/opendkim/SigningTable mode=644 owner=opendkim group=opendkim + ansible.builtin.copy: src=SigningTable dest=/etc/opendkim/SigningTable mode=644 owner=opendkim group=opendkim tags: - opendkim - config - base - name: Install opendkim trusted hosts file - copy: src=TrustedHosts dest=/etc/opendkim/TrustedHosts + ansible.builtin.copy: src=TrustedHosts dest=/etc/opendkim/TrustedHosts tags: - opendkim - config - base - name: Install bastion opendkim key from private - copy: src={{ private }}/files/opendkim/bastion.key dest=/etc/opendkim/keys/bastion.key mode=0600 owner=opendkim group=opendkim + ansible.builtin.copy: src={{ private }}/files/opendkim/bastion.key dest=/etc/opendkim/keys/bastion.key mode=0600 owner=opendkim group=opendkim tags: - opendkim - 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 + ansible.builtin.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 + ansible.builtin.copy: src={{ private }}/files/opendkim/pagure.key dest=/etc/opendkim/keys/pagure.key mode=0600 owner=opendkim group=opendkim tags: - opendkim - config diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml index 8c3915fc06..edbe2646b2 100644 --- a/roles/openqa/dispatcher/tasks/main.yml +++ b/roles/openqa/dispatcher/tasks/main.yml @@ -258,7 +258,7 @@ ansible.builtin.file: path=/root/.openidc state=directory owner=root group=root mode=0700 - name: Write wikitcms token file for root - copy: src={{ wikitcms_token }} dest=/root/.openidc/oidc_wikitcms.json owner=root group=root mode=0600 + ansible.builtin.copy: src={{ wikitcms_token }} dest=/root/.openidc/oidc_wikitcms.json owner=root group=root mode=0600 when: "wikitcms_token is defined" tags: - config @@ -275,7 +275,7 @@ - config - name: Deploy the Fedora infra fedora-messaging cert - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{ openqa_env }}/pki/issued/{{ openqa_amqp_this_username }}.crt" dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_this_username }}-cert.pem" mode: "0644" @@ -286,7 +286,7 @@ - config - name: Deploy the Fedora infra fedora-messaging key - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{ openqa_env }}/pki/private/{{ openqa_amqp_this_username }}.key" dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_this_username }}-key.pem" mode: "0640" @@ -297,7 +297,7 @@ - config - name: Deploy the Fedora infra fedora-messaging prod cert on stg (for stg consumers that listen on prod) - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/production/pki/issued/{{ openqa_amqp_prod_username }}.crt" dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_prod_username }}-cert.pem" mode: "0644" @@ -308,7 +308,7 @@ - config - name: Deploy the Fedora infra fedora-messaging prod key on stg (for stg consumers that listen on prod) - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/production/pki/private/{{ openqa_amqp_prod_username }}.key" dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_prod_username }}-key.pem" mode: "0640" @@ -361,10 +361,10 @@ # near-instantly; this avoids huge floods of errors when resultsdb # or the wiki go down for a bit - name: Consumer service config drop-in to slow down restarts - copy: src=fmconsumer.restartsec.conf dest=/etc/systemd/system/fm-consumer@.service.d/10-restartsec.conf owner=root group=root mode=0644 + ansible.builtin.copy: src=fmconsumer.restartsec.conf dest=/etc/systemd/system/fm-consumer@.service.d/10-restartsec.conf owner=root group=root mode=0644 - name: Set up cron job to schedule live-respins jobs - copy: src=schedule-live-respins.cron dest=/etc/cron.hourly/schedule-live-respins owner=root group=root mode=0755 + ansible.builtin.copy: src=schedule-live-respins.cron dest=/etc/cron.hourly/schedule-live-respins owner=root group=root mode=0755 tags: - config @@ -375,7 +375,7 @@ # really be tied to the dispatcher role, but separating it out would # be a pain, it's easier just to stuff it here - name: Set up cron job to restart all running fm-consumer services - copy: src=restart-consumers.cron dest=/etc/cron.daily/restart-consumers owner=root group=root mode=0755 + ansible.builtin.copy: src=restart-consumers.cron dest=/etc/cron.daily/restart-consumers owner=root group=root mode=0755 tags: - config @@ -384,4 +384,4 @@ # to get blocked. the subcommand tries to find such cases and send # the missing reports - name: Set up cron job to find and submit missing results to resultsdb - copy: src=report-blocked.cron dest=/etc/cron.daily/report-blocked owner=root group=root mode=0755 + ansible.builtin.copy: src=report-blocked.cron dest=/etc/cron.daily/report-blocked owner=root group=root mode=0755 diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index 9f42a3dbbf..cac0209799 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -107,11 +107,11 @@ ansible.builtin.file: path=/etc/yum.repos.d/scratchrepo.repo state=absent - name: Write lab side repo config - copy: src=openqa-lab-repo.repo dest=/etc/yum.repos.d/openqa-lab-repo.repo owner=root group=root mode=0644 + ansible.builtin.copy: src=openqa-lab-repo.repo dest=/etc/yum.repos.d/openqa-lab-repo.repo owner=root group=root mode=0644 when: "deployment_type is defined and deployment_type == 'stg'" - name: Write prod side repo config - copy: src=openqa-prod-repo.repo dest=/etc/yum.repos.d/openqa-prod-repo.repo owner=root group=root mode=0644 + ansible.builtin.copy: src=openqa-prod-repo.repo dest=/etc/yum.repos.d/openqa-prod-repo.repo owner=root group=root mode=0644 when: "deployment_type is defined and deployment_type == 'prod'" # this is separate from the step below so we can use openqa_repo just @@ -191,10 +191,10 @@ - /var/lib/openqa/share/factory/other - name: Copy in meta-data for cloud-init ISO creation - copy: src=meta-data dest=/var/tmp/meta-data owner=root group=root mode=0644 + ansible.builtin.copy: src=meta-data dest=/var/tmp/meta-data owner=root group=root mode=0644 - name: Copy in user-data for cloud-init ISO creation - copy: src=user-data dest=/var/tmp/user-data owner=root group=root mode=0644 + ansible.builtin.copy: src=user-data dest=/var/tmp/user-data owner=root group=root mode=0644 - name: Create cloud-init ISO command: genisoimage -output cloudinit.iso -volid cidata -joliet -rock /var/tmp/user-data /var/tmp/meta-data @@ -272,7 +272,7 @@ mode: '0755' - name: Copy over custom SELinux module allowing httpd to connect to openQA - copy: src=httpd-openqa.pp dest=/usr/local/share/selinux/httpd-openqa.pp owner=root group=root mode=0644 + ansible.builtin.copy: src=httpd-openqa.pp dest=/usr/local/share/selinux/httpd-openqa.pp owner=root group=root mode=0644 register: selinux_module - name: Load our custom SELinux module diff --git a/roles/openqa/worker/tasks/createhdds.yml b/roles/openqa/worker/tasks/createhdds.yml index 78b897e203..b0da183c6d 100644 --- a/roles/openqa/worker/tasks/createhdds.yml +++ b/roles/openqa/worker/tasks/createhdds.yml @@ -59,7 +59,7 @@ createhddsbranch.stdout.find('Changes not staged') == -1) - name: Set up createhdds cron job - copy: src=createhdds dest=/etc/cron.daily/createhdds owner=root group=root mode=0755 + ansible.builtin.copy: src=createhdds dest=/etc/cron.daily/createhdds owner=root group=root mode=0755 - name: Check if any hard disk images need (re)building command: "/root/createhdds/createhdds.py check" diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml index 788e460f9d..960773a610 100644 --- a/roles/openqa/worker/tasks/main.yml +++ b/roles/openqa/worker/tasks/main.yml @@ -69,11 +69,11 @@ ansible.builtin.file: path=/etc/yum.repos.d/scratchrepo.conf state=absent - name: Write lab side repo config - copy: src=openqa-lab-repo.repo dest=/etc/yum.repos.d/openqa-lab-repo.repo owner=root group=root mode=0644 + ansible.builtin.copy: src=openqa-lab-repo.repo dest=/etc/yum.repos.d/openqa-lab-repo.repo owner=root group=root mode=0644 when: "deployment_type is defined and deployment_type == 'stg'" - name: Write prod side repo config - copy: src=openqa-prod-repo.repo dest=/etc/yum.repos.d/openqa-prod-repo.repo owner=root group=root mode=0644 + ansible.builtin.copy: src=openqa-prod-repo.repo dest=/etc/yum.repos.d/openqa-prod-repo.repo owner=root group=root mode=0644 when: "deployment_type is defined and deployment_type == 'prod'" - name: Install required packages @@ -151,11 +151,11 @@ when: "openqa_rngd is defined and openqa_rngd" - name: Install script to set /dev/kvm perms and disable SMT (ppc64 only) - copy: src=openqa-ppc64-prep.sh dest=/etc/cron.hourly/openqa-ppc64-prep owner=root group=root mode=0755 + ansible.builtin.copy: src=openqa-ppc64-prep.sh dest=/etc/cron.hourly/openqa-ppc64-prep owner=root group=root mode=0755 when: "ansible_architecture is defined and ansible_architecture == 'ppc64le'" - name: Install systemd service to run boot script (ppc64 only) - copy: src=openqa-ppc64-prep.service dest=/etc/systemd/system/openqa-ppc64-prep.service + ansible.builtin.copy: src=openqa-ppc64-prep.service dest=/etc/systemd/system/openqa-ppc64-prep.service when: "ansible_architecture is defined and ansible_architecture == 'ppc64le'" register: prepservice @@ -173,7 +173,7 @@ when: "openqa_rngd is defined and openqa_rngd" - name: Install cron job to kill stuck qemu processes - copy: src=kill-stuck-qemu.sh dest=/etc/cron.daily/kill-stuck-qemu owner=root group=root mode=0755 + ansible.builtin.copy: src=kill-stuck-qemu.sh dest=/etc/cron.daily/kill-stuck-qemu owner=root group=root mode=0755 - include_tasks: nfs-client.yml when: openqa_nfs_worker|bool @@ -182,7 +182,7 @@ when: openqa_tap - name: Tell git it's OK for _openqa-worker to run 'git' on the test dir - copy: src=gitconfig dest=/etc/gitconfig owner=root group=root mode=0644 + ansible.builtin.copy: src=gitconfig dest=/etc/gitconfig owner=root group=root mode=0644 # this is kinda lazy - we could have a separate openqa_swtpm var so we # we could potentially separate tap worker hosts from swtpm ones - but @@ -215,7 +215,7 @@ when: openqa_hdds_worker|bool - name: Override kernel scheduler configuration - rhbz#2009585 - copy: src=60-block-scheduler.rules dest=/etc/udev/rules.d/60-block-scheduler.rules owner=root group=root mode=0644 + ansible.builtin.copy: src=60-block-scheduler.rules dest=/etc/udev/rules.d/60-block-scheduler.rules owner=root group=root mode=0644 when: "deployment_type is defined" - name: Remove wrongly-named kernel scheduler config file diff --git a/roles/openqa/worker/tasks/tap-setup.yml b/roles/openqa/worker/tasks/tap-setup.yml index e2c8a7313e..4e7a35a742 100644 --- a/roles/openqa/worker/tasks/tap-setup.yml +++ b/roles/openqa/worker/tasks/tap-setup.yml @@ -67,7 +67,7 @@ when: tapsexist.rc > 0 - name: Install openvswitch sysconfig file - copy: src=os-autoinst-openvswitch.sysconfig dest=/etc/sysconfig/os-autoinst-openvswitch owner=root group=root mode=0644 + ansible.builtin.copy: src=os-autoinst-openvswitch.sysconfig dest=/etc/sysconfig/os-autoinst-openvswitch owner=root group=root mode=0644 - name: Enable and start os-autoinst openvswitch service service: name=os-autoinst-openvswitch enabled=yes state=started diff --git a/roles/openshift/object/tasks/main.yml b/roles/openshift/object/tasks/main.yml index a0647d8409..74c9f4a42a 100644 --- a/roles/openshift/object/tasks/main.yml +++ b/roles/openshift/object/tasks/main.yml @@ -10,7 +10,7 @@ register: object_template_fullpath_result - name: Copy file {{object_file}} to temporary file ({{tmpfile.path}}) - copy: src={{roles_path}}/openshift-apps/{{object_app}}/files/{{object_file}} dest=/etc/openshift_apps/{{object_os_app}}/{{object_objectname}} + ansible.builtin.copy: src={{roles_path}}/openshift-apps/{{object_app}}/files/{{object_file}} dest=/etc/openshift_apps/{{object_os_app}}/{{object_objectname}} when: object_file is defined and object_template is not defined and object_template_fullpath is not defined register: object_file_result diff --git a/roles/openshift/secret-file/tasks/main.yml b/roles/openshift/secret-file/tasks/main.yml index af3bc19079..989efa2d85 100644 --- a/roles/openshift/secret-file/tasks/main.yml +++ b/roles/openshift/secret-file/tasks/main.yml @@ -5,12 +5,12 @@ register: secret_template - name: Copy file {{secret_file_file}} - copy: src={{roles_path}}/openshift-apps/{{secret_file_app}}/files/{{secret_file_file}} dest=/etc/openshift_apps/{{os_app}}/{{secret_file_key}} + ansible.builtin.copy: src={{roles_path}}/openshift-apps/{{secret_file_app}}/files/{{secret_file_file}} dest=/etc/openshift_apps/{{os_app}}/{{secret_file_key}} when: secret_file_file is defined register: secret_file - name: Copy private file {{secret_file_privatefile}} - copy: src={{private}}/files/{{secret_file_privatefile}} dest=/etc/openshift_apps/{{os_app}}/{{secret_file_key}} + ansible.builtin.copy: src={{private}}/files/{{secret_file_privatefile}} dest=/etc/openshift_apps/{{os_app}}/{{secret_file_key}} when: secret_file_privatefile is defined register: secret_privatefile diff --git a/roles/openshift/secret-tls/tasks/main.yml b/roles/openshift/secret-tls/tasks/main.yml index 600dfcc273..b3605066af 100644 --- a/roles/openshift/secret-tls/tasks/main.yml +++ b/roles/openshift/secret-tls/tasks/main.yml @@ -1,10 +1,10 @@ --- - name: Copy private tlscert {{secret_tls_privatefile}} - copy: src={{private}}/files/{{ secret_tls_private_cert }} dest=/etc/openshift_apps/{{secret_tls_app}}/{{secret_tls_key}}.crt + ansible.builtin.copy: src={{private}}/files/{{ secret_tls_private_cert }} dest=/etc/openshift_apps/{{secret_tls_app}}/{{secret_tls_key}}.crt register: secret_privatecert - name: Copy private tlskey {{secret_tls_privatefile}} - copy: src={{private}}/files/{{ secret_tls_private_key }} dest=/etc/openshift_apps/{{secret_tls_app}}/{{secret_tls_key}}.key + ansible.builtin.copy: src={{private}}/files/{{ secret_tls_private_key }} dest=/etc/openshift_apps/{{secret_tls_app}}/{{secret_tls_key}}.key register: secret_privatekey - name: Delete existing secrets diff --git a/roles/openvpn/base/tasks/main.yml b/roles/openvpn/base/tasks/main.yml index fa8e816aab..59f0b57373 100644 --- a/roles/openvpn/base/tasks/main.yml +++ b/roles/openvpn/base/tasks/main.yml @@ -11,7 +11,7 @@ - packages - name: Install ca for client - copy: src={{ private }}/files/vpn/pki/ca.crt + ansible.builtin.copy: src={{ private }}/files/vpn/pki/ca.crt dest=/etc/openvpn/client/ca.crt owner=root group=root mode=0600 tags: @@ -19,7 +19,7 @@ - openvpn - name: Install ca for server - copy: src={{ private }}/files/vpn/pki/ca.crt + ansible.builtin.copy: src={{ private }}/files/vpn/pki/ca.crt dest=/etc/openvpn/server/ca.crt owner=root group=root mode=0600 tags: @@ -29,7 +29,7 @@ # - restart openvpn (Fedora) - name: Install certificate and key (rhel or fedora) for server - copy: src={{ private }}/files/vpn/pki/ca.crt + ansible.builtin.copy: src={{ private }}/files/vpn/pki/ca.crt dest=/etc/openvpn/server/ca.crt owner=root group=root mode=0600 tags: @@ -40,7 +40,7 @@ when: inventory_hostname.startswith('bastion0') - name: Install fix-routes.sh script - copy: src=fix-routes.sh + ansible.builtin.copy: src=fix-routes.sh dest=/etc/openvpn/fix-routes.sh owner=root group=root mode=0755 tags: diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml index f0fd0ea263..dec85e2a86 100644 --- a/roles/openvpn/client/tasks/main.yml +++ b/roles/openvpn/client/tasks/main.yml @@ -21,7 +21,7 @@ # - restart openvpn (Fedora) - name: Install configuration files (rhel and fedora) - copy: src={{ item.file }} + ansible.builtin.copy: src={{ item.file }} dest={{ item.dest }} owner=root group=root mode={{ item.mode }} with_items: @@ -59,7 +59,7 @@ - openvpn - name: Deploy postvpn.conf for post-vpn services - copy: src=postvpn.conf dest="/etc/systemd/system/{{item}}.service.d/postvpn.conf" + ansible.builtin.copy: src=postvpn.conf dest="/etc/systemd/system/{{item}}.service.d/postvpn.conf" with_items: "{{postvpnservices}}" when: is_fedora is defined or (ansible_distribution_major_version|int >= 8 and ansible_distribution == 'RedHat') tags: diff --git a/roles/openvpn/server/tasks/main.yml b/roles/openvpn/server/tasks/main.yml index 2360230a07..dd9a4bee67 100644 --- a/roles/openvpn/server/tasks/main.yml +++ b/roles/openvpn/server/tasks/main.yml @@ -19,7 +19,7 @@ - openvpn - name: Install configuration files - copy: src={{ item.file }} + ansible.builtin.copy: src={{ item.file }} dest={{ item.dest }} owner=root group=root mode={{ item.mode }} with_items: diff --git a/roles/packager_alias/tasks/main.yml b/roles/packager_alias/tasks/main.yml index f045a11ff5..c1ae127e5f 100644 --- a/roles/packager_alias/tasks/main.yml +++ b/roles/packager_alias/tasks/main.yml @@ -1,7 +1,7 @@ --- # Email alias set-up - name: Install the Python script to get the -owner email alias - copy: + ansible.builtin.copy: src: owner-email-from-pagure.py dest: /usr/local/bin/owner-email.py owner: root @@ -12,7 +12,7 @@ - packager_alias - name: Install the script to generate the -owner email alias - copy: + ansible.builtin.copy: src: package-owner-aliases.sh dest: /usr/local/bin/package-owner-aliases.sh owner: root @@ -42,7 +42,7 @@ # - name: Install modified logrotate syslog script to compress maillog on mailhub - copy: src=syslog dest=/etc/logrotate.d/syslog owner=root group=root + ansible.builtin.copy: src=syslog dest=/etc/logrotate.d/syslog owner=root group=root tags: - install - packager_alias diff --git a/roles/packages3/bugz.fp.o/tasks/main.yml b/roles/packages3/bugz.fp.o/tasks/main.yml index 52eadb5fb6..1f174eabcf 100644 --- a/roles/packages3/bugz.fp.o/tasks/main.yml +++ b/roles/packages3/bugz.fp.o/tasks/main.yml @@ -1,5 +1,5 @@ --- -- copy: > +- ansible.builtin.copy: > src=bugz.conf dest=/etc/httpd/conf.d/{{website}}/bugz.conf owner=root group=root mode=0644 notify: diff --git a/roles/packages3/web/tasks/main.yml b/roles/packages3/web/tasks/main.yml index c505c132c7..6c9e9e8ca7 100644 --- a/roles/packages3/web/tasks/main.yml +++ b/roles/packages3/web/tasks/main.yml @@ -46,7 +46,7 @@ - packages/web - name: Copy over the httpd config - copy: > + ansible.builtin.copy: > src=packages-httpd.conf dest=/etc/httpd/conf.d/fedora-packages.conf owner=root group=root mode=644 @@ -68,7 +68,7 @@ - packages/web - name: Copy over certs/public-keys, probably for talking with koji. - copy: > + ansible.builtin.copy: > src="{{private}}/files/packages/fedora-ca.cert" dest="/etc/pki/fedoracommunity/{{item}}" owner=apache @@ -82,7 +82,7 @@ - packages/web - name: Permanently hotfix the distmappings file - copy: > + ansible.builtin.copy: > src=distmappings.py dest="{{pythonsitelib}}/fedoracommunity/search/distmappings.py" owner=root group=root mode=0644 @@ -119,7 +119,7 @@ - packages/web - name: Copy over the default icon - copy: > + ansible.builtin.copy: > src=package_128x128.png dest=/var/cache/fedoracommunity/packages/icons/package_128x128.png owner=root mode=644 setype=fusefs_t @@ -130,7 +130,7 @@ - icon - name: Hotfix the fedmsg-hub executable to pick up forward compat packages - copy: src=fedmsg-hub-forward-compat dest=/usr/bin/fedmsg-hub + ansible.builtin.copy: src=fedmsg-hub-forward-compat dest=/usr/bin/fedmsg-hub tags: - packages - packages/web diff --git a/roles/pager_server/tasks/main.yml b/roles/pager_server/tasks/main.yml index 0fbc0a290c..2935501ee2 100644 --- a/roles/pager_server/tasks/main.yml +++ b/roles/pager_server/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Setup pager app config - copy: src=pager-app.conf dest=/etc/httpd/conf.d/pager-app.conf mode=644 + ansible.builtin.copy: src=pager-app.conf dest=/etc/httpd/conf.d/pager-app.conf mode=644 notify: - reload httpd tags: @@ -8,7 +8,7 @@ - pager_server - name: Install pager app - copy: src={{ private}}/pager/pager.py dest=/srv/web/pager.py mode=755 setype=httpd_sys_script_exec_t + ansible.builtin.copy: src={{ private}}/pager/pager.py dest=/srv/web/pager.py mode=755 setype=httpd_sys_script_exec_t tags: - config - pager_server diff --git a/roles/pagure/tasks/main.yml b/roles/pagure/tasks/main.yml index 13f4f3704c..fc06eac5ac 100644 --- a/roles/pagure/tasks/main.yml +++ b/roles/pagure/tasks/main.yml @@ -201,7 +201,7 @@ # Set-up postfix and the milter for postfix - name: Add the /etc/aliases file - copy: src=aliases dest=/etc/aliases owner=root mode=644 + ansible.builtin.copy: src=aliases dest=/etc/aliases owner=root mode=644 tags: - config - pagure @@ -213,7 +213,7 @@ # Override pagure_ev systemd service file - name: Install pagure_ev service definition - copy: src=pagure_ev.service + ansible.builtin.copy: src=pagure_ev.service dest=/usr/lib/systemd/system/pagure_ev.service owner=root group=root mode=0644 notify: @@ -226,7 +226,7 @@ # Set-up stunnel for the event source server - name: Install stunnel service definition - copy: src=stunnel.service + ansible.builtin.copy: src=stunnel.service dest=/usr/lib/systemd/system/stunnel.service owner=root group=root mode=0644 notify: @@ -249,7 +249,7 @@ - config - name: Add the different service files for the different services - copy: src={{ item }}.service + ansible.builtin.copy: src={{ item }}.service dest=/etc/systemd/system/{{ item }}.service owner=root group=root mode=0755 with_items: @@ -293,7 +293,7 @@ - fedora-messaging - name: Deploy pagure/rabbitmq certificate - copy: src={{ item.src }} + ansible.builtin.copy: src={{ item.src }} dest=/etc/pki/rabbitmq/pagurecert/{{ item.dest }} owner={{ item.owner }} group={{ item.group}} mode={{ item.mode }} when: env == 'pagure-staging' @@ -318,7 +318,7 @@ - fedora-messaging - name: Deploy pagure/rabbitmq certificate - copy: src={{ item.src }} + ansible.builtin.copy: src={{ item.src }} dest=/etc/pki/rabbitmq/pagurecert/{{ item.dest }} owner={{ item.owner }} group={{ item.group}} mode={{ item.mode }} when: env != 'pagure-staging' @@ -449,7 +449,7 @@ # Hotfix(es) - name: Install the python3-only version of the stream_server so it works - copy: src=pagure_stream_server.py + ansible.builtin.copy: src=pagure_stream_server.py dest=/usr/libexec/pagure-ev/pagure_stream_server.py owner=root mode=0755 tags: @@ -492,20 +492,20 @@ - postfix - name: Setup logrotate to our needs - copy: src="{{ files }}/httpd/httpd.logrotate" dest=/etc/logrotate.d/httpd + ansible.builtin.copy: src="{{ files }}/httpd/httpd.logrotate" dest=/etc/logrotate.d/httpd tags: - config - apache - name: Add SAR script for pagure - copy: src=pagure_sar.py dest=/usr/local/bin/pagure_sar.py owner=git mode=0700 + ansible.builtin.copy: src=pagure_sar.py dest=/usr/local/bin/pagure_sar.py owner=git mode=0700 tags: - SAR - GDPR - pagure - name: Override the default syslog logrotate file - copy: src=syslog-logrotate dest=/etc/logrotate.d/syslog + ansible.builtin.copy: src=syslog-logrotate dest=/etc/logrotate.d/syslog tags: - pagure - logrotate diff --git a/roles/people/tasks/main.yml b/roles/people/tasks/main.yml index c8983686b1..ee65477c69 100644 --- a/roles/people/tasks/main.yml +++ b/roles/people/tasks/main.yml @@ -24,7 +24,7 @@ - sslciphers - name: Install httpd config - copy: src={{item}} dest=/etc/httpd/conf.d/{{item}} + ansible.builtin.copy: src={{item}} dest=/etc/httpd/conf.d/{{item}} with_items: - cgit.conf - ssl.conf @@ -55,7 +55,7 @@ - httpd/proxy - name: Empty default welcome.conf - copy: dest=/etc/httpd/conf.d/welcome.conf content="" + ansible.builtin.copy: dest=/etc/httpd/conf.d/welcome.conf content="" tags: - people @@ -251,47 +251,47 @@ - people - name: Setup script to grab download stats for some groups. - copy: src=grab-daily-logs.sh dest=/usr/local/bin/grab-daily-logs.sh mode=0755 + ansible.builtin.copy: src=grab-daily-logs.sh dest=/usr/local/bin/grab-daily-logs.sh mode=0755 tags: - people - name: Setup cron job to gather download stats - copy: src=grab-daily-logs.cron dest=/etc/cron.daily/grab-daily-logs mode=0755 + ansible.builtin.copy: src=grab-daily-logs.cron dest=/etc/cron.daily/grab-daily-logs mode=0755 tags: - people - name: Copy robots.txt for fedorapeople.org - copy: src=robots.txt dest=/srv/people/site/robots.txt + ansible.builtin.copy: src=robots.txt dest=/srv/people/site/robots.txt tags: - people - name: Copy static files to make main fedorapeople.org index page - copy: src=static/ dest=/srv/people/site/static + ansible.builtin.copy: src=static/ dest=/srv/people/site/static tags: - people - name: Copy static files for user pages - copy: src=userdefs/ dest=/srv/people/site/userdefs + ansible.builtin.copy: src=userdefs/ dest=/srv/people/site/userdefs tags: - people - name: Setup script to make main fedorapeople.org index page - copy: src=make-people-page.py dest=/usr/local/bin/make-people-page.py mode=755 + ansible.builtin.copy: src=make-people-page.py dest=/usr/local/bin/make-people-page.py mode=755 tags: - people - name: Setup script check for broken planet confs - copy: src=check-broken-planet.py dest=/usr/local/bin/check-broken-planet.py mode=755 + ansible.builtin.copy: src=check-broken-planet.py dest=/usr/local/bin/check-broken-planet.py mode=755 tags: - people - name: Setup cron to run make fedorapeople.org main index page - copy: src=make-people-page.cron dest=/etc/cron.d/make-people-page.cron mode=644 + ansible.builtin.copy: src=make-people-page.cron dest=/etc/cron.d/make-people-page.cron mode=644 tags: - people - name: Setup cron to run the check for broken planet confs - copy: src=check-broken-planet.cron dest=/etc/cron.d/check-broken-planet.cron mode=644 + ansible.builtin.copy: src=check-broken-planet.cron dest=/etc/cron.d/check-broken-planet.cron mode=644 tags: - people diff --git a/roles/pkgdb-proxy/tasks/main.yml b/roles/pkgdb-proxy/tasks/main.yml index 97dd3eef02..6e683d7e39 100644 --- a/roles/pkgdb-proxy/tasks/main.yml +++ b/roles/pkgdb-proxy/tasks/main.yml @@ -1,13 +1,13 @@ --- # Install static JSON file needed by gnome-software, on proxies. - name: Copy static JSON file into place - copy: src=pkgdb-gnome-software-collections.json dest=/srv/web/pkgdb-gnome-software-collections.json owner=root group=root mode=755 + ansible.builtin.copy: src=pkgdb-gnome-software-collections.json dest=/srv/web/pkgdb-gnome-software-collections.json owner=root group=root mode=755 tags: - gnome-software - pkgdb2 - name: Copy httpd config - copy: src=pkgdb-gnome-software.conf dest=/etc/httpd/conf.d/admin.fedoraproject.org/pkgdb.conf owner=root group=root mode=755 + ansible.builtin.copy: src=pkgdb-gnome-software.conf dest=/etc/httpd/conf.d/admin.fedoraproject.org/pkgdb.conf owner=root group=root mode=755 notify: - reload apache tags: diff --git a/roles/planet/tasks/main.yml b/roles/planet/tasks/main.yml index 44595735cb..b0bfbd3ffa 100644 --- a/roles/planet/tasks/main.yml +++ b/roles/planet/tasks/main.yml @@ -37,12 +37,12 @@ - sslciphers - name: Copy the run planet-config script into /usr/local/bin - copy: src=pull-run-planet-config.sh dest=/usr/local/bin/pull-run-planet-config.sh mode=755 + ansible.builtin.copy: src=pull-run-planet-config.sh dest=/usr/local/bin/pull-run-planet-config.sh mode=755 tags: - planet_server - name: Copy the planetconfigbuilder.py script into /usr/local/bin - copy: src=planetconfigbuilder.py dest=/usr/local/bin/planetconfigbuilder.py mode=755 + ansible.builtin.copy: src=planetconfigbuilder.py dest=/usr/local/bin/planetconfigbuilder.py mode=755 tags: - planet_server @@ -72,7 +72,7 @@ - planet_server - name: Copy the run-planet script - copy: src=run-planet dest=/srv/planet/config/run-planet + ansible.builtin.copy: src=run-planet dest=/srv/planet/config/run-planet tags: - planet_server @@ -87,12 +87,12 @@ - /srv/planet/config/people - name: Base planet config files - copy: src=people_base_config dest=/etc/planet/people_base_config mode=0644 owner=root group=root + ansible.builtin.copy: src=people_base_config dest=/etc/planet/people_base_config mode=0644 owner=root group=root tags: - planet_server - name: Copy the planet cron job (people) - copy: src=planet-cron dest=/etc/cron.d/planet-cron + ansible.builtin.copy: src=planet-cron dest=/etc/cron.d/planet-cron tags: - planet_server @@ -109,17 +109,17 @@ - /srv/planet/site/design - name: Copy the planet cron job (design) - copy: src=sub-planets/design/planet-group.cron dest=/etc/cron.d/planet-design.cron + ansible.builtin.copy: src=sub-planets/design/planet-group.cron dest=/etc/cron.d/planet-design.cron tags: - planet_server - name: Copy the planet fpbulder.conf (design) - copy: src=sub-planets/design/fpbuilder.conf dest=/etc/planet/design/fpbuilder.conf + ansible.builtin.copy: src=sub-planets/design/fpbuilder.conf dest=/etc/planet/design/fpbuilder.conf tags: - planet_server - name: Copy the planet base_config (design) - copy: src=sub-planets/design/base_config dest=/etc/planet/design/base_config mode=0644 owner=root group=root + ansible.builtin.copy: src=sub-planets/design/base_config dest=/etc/planet/design/base_config mode=0644 owner=root group=root tags: - planet_server @@ -136,17 +136,17 @@ - /srv/planet/site/desktop - name: Copy the planet cron job (desktop) - copy: src=sub-planets/desktop/planet-group.cron dest=/etc/cron.d/planet-desktop.cron + ansible.builtin.copy: src=sub-planets/desktop/planet-group.cron dest=/etc/cron.d/planet-desktop.cron tags: - planet_server - name: Copy the planet fpbulder.conf (desktop) - copy: src=sub-planets/desktop/fpbuilder.conf dest=/etc/planet/desktop/fpbuilder.conf + ansible.builtin.copy: src=sub-planets/desktop/fpbuilder.conf dest=/etc/planet/desktop/fpbuilder.conf tags: - planet_server - name: Copy the planet base_config (desktop) - copy: src=sub-planets/desktop/base_config dest=/etc/planet/desktop/base_config mode=0644 owner=root group=root + ansible.builtin.copy: src=sub-planets/desktop/base_config dest=/etc/planet/desktop/base_config mode=0644 owner=root group=root tags: - planet_server @@ -163,17 +163,17 @@ - /srv/planet/site/edited - name: Copy the planet cron job (edited) - copy: src=sub-planets/edited/planet-group.cron dest=/etc/cron.d/planet-edited.cron + ansible.builtin.copy: src=sub-planets/edited/planet-group.cron dest=/etc/cron.d/planet-edited.cron tags: - planet_server - name: Copy the planet fpbulder.conf (edited) - copy: src=sub-planets/edited/fpbuilder.conf dest=/etc/planet/edited/fpbuilder.conf + ansible.builtin.copy: src=sub-planets/edited/fpbuilder.conf dest=/etc/planet/edited/fpbuilder.conf tags: - planet_server - name: Copy the planet base_config (edited) - copy: src=sub-planets/edited/base_config dest=/etc/planet/edited/base_config mode=0644 owner=root group=root + ansible.builtin.copy: src=sub-planets/edited/base_config dest=/etc/planet/edited/base_config mode=0644 owner=root group=root tags: - planet_server @@ -190,7 +190,7 @@ - /srv/planet/site/people - name: Copy templates (people) - copy: src=sub-planets/people/{{ item }} dest=/srv/planet/config/people/ owner=planet-user group=planet-user + ansible.builtin.copy: src=sub-planets/people/{{ item }} dest=/srv/planet/config/people/ owner=planet-user group=planet-user with_items: - templates tags: @@ -205,7 +205,7 @@ - planet_server - name: Copy the planet fpbulder.conf (people) - copy: src=fpbuilder.conf dest=/etc/planet/fpbuilder.conf + ansible.builtin.copy: src=fpbuilder.conf dest=/etc/planet/fpbuilder.conf tags: - planet_server @@ -222,17 +222,17 @@ - /srv/planet/site/security - name: Copy the planet cron job (security) - copy: src=sub-planets/security/planet-group.cron dest=/etc/cron.d/planet-security.cron + ansible.builtin.copy: src=sub-planets/security/planet-group.cron dest=/etc/cron.d/planet-security.cron tags: - planet_server - name: Copy the planet fpbulder.conf (security) - copy: src=sub-planets/security/fpbuilder.conf dest=/etc/planet/security/fpbuilder.conf + ansible.builtin.copy: src=sub-planets/security/fpbuilder.conf dest=/etc/planet/security/fpbuilder.conf tags: - planet_server - name: Copy the planet base_config (security) - copy: src=sub-planets/security/base_config dest=/etc/planet/security/base_config mode=0644 owner=root group=root + ansible.builtin.copy: src=sub-planets/security/base_config dest=/etc/planet/security/base_config mode=0644 owner=root group=root tags: - planet_server @@ -249,17 +249,17 @@ - /srv/planet/site/summer-coding - name: Copy the planet cron job (summer-coding) - copy: src=sub-planets/summer-coding/planet-group.cron dest=/etc/cron.d/planet-summer-coding.cron + ansible.builtin.copy: src=sub-planets/summer-coding/planet-group.cron dest=/etc/cron.d/planet-summer-coding.cron tags: - planet_server - name: Copy the planet fpbulder.conf (summer-coding) - copy: src=sub-planets/summer-coding/fpbuilder.conf dest=/etc/planet/summer-coding/fpbuilder.conf + ansible.builtin.copy: src=sub-planets/summer-coding/fpbuilder.conf dest=/etc/planet/summer-coding/fpbuilder.conf tags: - planet_server - name: Copy the planet base_config (summer-coding) - copy: src=sub-planets/summer-coding/base_config dest=/etc/planet/summer-coding/base_config mode=0644 owner=root group=root + ansible.builtin.copy: src=sub-planets/summer-coding/base_config dest=/etc/planet/summer-coding/base_config mode=0644 owner=root group=root tags: - planet_server # @@ -276,17 +276,17 @@ - /srv/planet/site/quality - name: Copy the planet cron job (quality) - copy: src=sub-planets/quality/planet-group.cron dest=/etc/cron.d/planet-quality.cron + ansible.builtin.copy: src=sub-planets/quality/planet-group.cron dest=/etc/cron.d/planet-quality.cron tags: - planet_server - name: Copy the planet fpbulder.conf (quality) - copy: src=sub-planets/quality/fpbuilder.conf dest=/etc/planet/quality/fpbuilder.conf + ansible.builtin.copy: src=sub-planets/quality/fpbuilder.conf dest=/etc/planet/quality/fpbuilder.conf tags: - planet_server - name: Copy the planet base_config (quality) - copy: src=sub-planets/quality/base_config dest=/etc/planet/quality/base_config mode=0644 owner=root group=root + ansible.builtin.copy: src=sub-planets/quality/base_config dest=/etc/planet/quality/base_config mode=0644 owner=root group=root tags: - planet_server @@ -302,7 +302,7 @@ - planet_server - name: Deploy the fedora-messaging CA - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/ca.crt" dest: /etc/pki/fedora-messaging/rabbitmq-ca.crt mode: "0644" @@ -313,7 +313,7 @@ - planet_server - name: Deploy the fedora-messaging cert - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/planet{{env_suffix}}.crt" dest: /etc/pki/fedora-messaging/planet.crt mode: "0644" @@ -324,7 +324,7 @@ - planet_server - name: Deploy the fedora-messaging key - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/planet{{env_suffix}}.key" dest: /etc/pki/fedora-messaging/planet.key mode: "0600" diff --git a/roles/postfix_logreport/tasks/main.yml b/roles/postfix_logreport/tasks/main.yml index 1615fecadd..18a225b228 100644 --- a/roles/postfix_logreport/tasks/main.yml +++ b/roles/postfix_logreport/tasks/main.yml @@ -9,7 +9,7 @@ - packages - name: Install /usr/sbin/pflogsumm - copy: src={{ item }} dest="/usr/sbin/{{ item }}" mode=0755 + ansible.builtin.copy: src={{ item }} dest="/usr/sbin/{{ item }}" mode=0755 with_item: - pflogsumm tags: @@ -17,7 +17,7 @@ - config - name: Install /etc/cron.d/postfix-log.cron - copy: src={{ item }} dest="/etc/cron.d/{{ item }}" + ansible.builtin.copy: src={{ item }} dest="/etc/cron.d/{{ item }}" with_item: - postfix-log.cron tags: diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml index e3b3767cf2..014cff5470 100644 --- a/roles/postgresql_server/tasks/main.yml +++ b/roles/postgresql_server/tasks/main.yml @@ -3,7 +3,7 @@ # Setup postgresql server. # - name: On rhel8 hosts enable the postgresql 12 module. - copy: + ansible.builtin.copy: dest: /etc/dnf/modules.d/postgresql.module content: | [postgresql] @@ -14,7 +14,7 @@ when: ansible_distribution_major_version|int == 8 - name: On db-koji01 and db-riscv-koji01 and db01.stg and db-fas01 and db01 and db-openqa01 enable the postgresql 15 module. - copy: + ansible.builtin.copy: dest: /etc/dnf/modules.d/postgresql.module content: | [postgresql] @@ -92,7 +92,7 @@ - postgresql - name: Add our postgres config file. - copy: > + ansible.builtin.copy: > src={{ item }} dest=/var/lib/pgsql/data/{{ item }} owner=postgres @@ -137,31 +137,31 @@ - postgresql - name: Copy over backup scriplet - copy: src=backup-database dest=/usr/local/bin/backup-database mode=0755 + ansible.builtin.copy: src=backup-database dest=/usr/local/bin/backup-database mode=0755 when: not inventory_hostname.startswith(('db-koji01.iad2','db-datanommer')) tags: - postgresql - name: Copy over backup scriplet - copy: src=backup-database.db-koji01 dest=/usr/local/bin/backup-database mode=0755 + ansible.builtin.copy: src=backup-database.db-koji01 dest=/usr/local/bin/backup-database mode=0755 when: inventory_hostname.startswith('db-koji01.iad2') tags: - postgresql - name: Copy over backup scriplet - copy: src=backup-database.db-datanommer02 dest=/usr/local/bin/backup-database mode=0755 + ansible.builtin.copy: src=backup-database.db-datanommer02 dest=/usr/local/bin/backup-database mode=0755 when: inventory_hostname.startswith('db-datanommer02.iad2') tags: - postgresql - name: Copy over anitya public backup scriplet - copy: src=backup-database.anitya dest=/usr/local/bin/backup-database.anitya mode=0755 + ansible.builtin.copy: src=backup-database.anitya dest=/usr/local/bin/backup-database.anitya mode=0755 tags: - postgresql when: inventory_hostname.startswith('db01.phx2') or inventory_hostname.startswith('db01.iad2') - name: Copy over anitya public backup cron - copy: src=cron-backup-anitya-public dest=/etc/cron.d/cron-backup-anitya-public mode=0644 + ansible.builtin.copy: src=cron-backup-anitya-public dest=/etc/cron.d/cron-backup-anitya-public mode=0644 tags: - postgresql when: inventory_hostname.startswith('db01.iad2') @@ -178,7 +178,7 @@ - postgresql - name: Set up datanommer/datagrepper SAR script - copy: > + ansible.builtin.copy: > src=datagrepper_sar.py dest=/usr/local/bin/datagrepper_sar.py mode=0700 when: inventory_hostname.startswith('db-datanommer01') diff --git a/roles/push-container-registry/tasks/main.yml b/roles/push-container-registry/tasks/main.yml index 4bc8985eaf..ec7e8ef210 100644 --- a/roles/push-container-registry/tasks/main.yml +++ b/roles/push-container-registry/tasks/main.yml @@ -22,7 +22,7 @@ - push-container-registry - name: Install client cert for registry - copy: + ansible.builtin.copy: src: "{{cert_src}}" dest: "{{cert_dest_dir}}/client.cert" owner: root @@ -32,7 +32,7 @@ - push-container-registry - name: Install client key for registry - copy: + ansible.builtin.copy: src: "{{key_src}}" dest: "{{cert_dest_dir}}/client.key" group: "{{ certs_group }}" diff --git a/roles/rabbitmq/tasks/main.yml b/roles/rabbitmq/tasks/main.yml index 662bf05a0e..ab5b88951f 100644 --- a/roles/rabbitmq/tasks/main.yml +++ b/roles/rabbitmq/tasks/main.yml @@ -8,7 +8,7 @@ - packages - name: Install the configuration - copy: src={{item}} dest=/etc/rabbitmq/{{item}} owner=root group=root mode=0644 + ansible.builtin.copy: src={{item}} dest=/etc/rabbitmq/{{item}} owner=root group=root mode=0644 with_items: - rabbitmq.config - enabled_plugins diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml index c9cb7bc88e..6e441d9571 100644 --- a/roles/rabbitmq_cluster/tasks/main.yml +++ b/roles/rabbitmq_cluster/tasks/main.yml @@ -1,7 +1,7 @@ --- # Openstack has a newer version of rabbitmq - name: Install RHOSP13 repo file - copy: src="{{ files }}/common/rhos13.repo" dest=/etc/yum.repos.d/rhos13.repo + ansible.builtin.copy: src="{{ files }}/common/rhos13.repo" dest=/etc/yum.repos.d/rhos13.repo tags: - rabbitmq_cluster - config @@ -10,7 +10,7 @@ when: ansible_distribution_major_version|int == 7 - name: Install RHOSP16 repo file - copy: src="{{ files }}/common/rhos16.repo" dest=/etc/yum.repos.d/rhos16.repo + ansible.builtin.copy: src="{{ files }}/common/rhos16.repo" dest=/etc/yum.repos.d/rhos16.repo tags: - rabbitmq_cluster - config @@ -29,7 +29,7 @@ - packages - name: Deploy CA certificate - copy: src="{{private}}/files/rabbitmq/{{env}}/pki/ca.crt" + ansible.builtin.copy: src="{{private}}/files/rabbitmq/{{env}}/pki/ca.crt" dest=/etc/rabbitmq/ca.crt owner=root group=root mode=0644 tags: @@ -43,7 +43,7 @@ - config - name: Deploy node certificate - copy: src="{{private}}/files/rabbitmq/{{env}}/pki/issued/{{inventory_hostname}}.crt" + ansible.builtin.copy: src="{{private}}/files/rabbitmq/{{env}}/pki/issued/{{inventory_hostname}}.crt" dest=/etc/rabbitmq/nodecert/node.crt owner=root group=root mode=0644 tags: @@ -51,7 +51,7 @@ - config - name: Deploy node private key - copy: src="{{private}}/files/rabbitmq/{{env}}/pki/private/{{inventory_hostname}}.key" + ansible.builtin.copy: src="{{private}}/files/rabbitmq/{{env}}/pki/private/{{inventory_hostname}}.key" dest=/etc/rabbitmq/nodecert/node.key owner=rabbitmq group=rabbitmq mode=0600 tags: @@ -77,7 +77,7 @@ - config - name: Deploy staging cookie - copy: content="{{rabbitmq_cluster_cookie_staging}}" dest=/var/lib/rabbitmq/.erlang.cookie + ansible.builtin.copy: content="{{rabbitmq_cluster_cookie_staging}}" dest=/var/lib/rabbitmq/.erlang.cookie owner=rabbitmq group=rabbitmq mode=0400 when: "env == 'staging'" notify: @@ -87,7 +87,7 @@ - config - name: Deploy production cookie - copy: content="{{rabbitmq_cluster_cookie_production}}" dest=/var/lib/rabbitmq/.erlang.cookie + ansible.builtin.copy: content="{{rabbitmq_cluster_cookie_production}}" dest=/var/lib/rabbitmq/.erlang.cookie owner=rabbitmq group=rabbitmq mode=0400 when: "env == 'production'" notify: @@ -105,7 +105,7 @@ - config - name: Override file limit on rabbitmq - copy: + ansible.builtin.copy: content: "[Service]\nLimitNOFILE={{rabbitmq_cluster_file_limit}}\n" dest: /etc/systemd/system/rabbitmq-server.service.d/override.conf notify: @@ -225,7 +225,7 @@ - config - name: Dump the admin password in a file for administrative operations - copy: + ansible.builtin.copy: dest: /root/.rabbitmqpass content: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}" mode: "0600" @@ -405,7 +405,7 @@ - config - name: Deploy pubsub_federation certificate - copy: src="{{private}}/files/rabbitmq/{{env}}/pki/issued/pubsub_federation.crt" + ansible.builtin.copy: src="{{private}}/files/rabbitmq/{{env}}/pki/issued/pubsub_federation.crt" dest=/etc/rabbitmq/pubsub_federation/client_cert.pem owner=root group=root mode=0644 tags: @@ -413,7 +413,7 @@ - config - name: Deploy node private key - copy: src="{{private}}/files/rabbitmq/{{env}}/pki/private/pubsub_federation.key" + ansible.builtin.copy: src="{{private}}/files/rabbitmq/{{env}}/pki/private/pubsub_federation.key" dest=/etc/rabbitmq/pubsub_federation/client_key.pem owner=rabbitmq group=rabbitmq mode=0600 tags: @@ -462,13 +462,13 @@ # SELinux: allow the Nagios NRPE plugin to access the management interface - name: Install the selinux module compilation script - copy: + ansible.builtin.copy: src: selinux-load.sh dest: /etc/nagios/selinux-load.sh mode: "0755" - name: Copy over our custom selinux module - copy: + ansible.builtin.copy: src: nrpe_rabbitmq.te dest: /etc/nagios/nrpe_rabbitmq.te register: selinux_module diff --git a/roles/rabbitmq_cluster/tasks/vhost-centos-odcs.yml b/roles/rabbitmq_cluster/tasks/vhost-centos-odcs.yml index 634237e6f2..6cb5eadf5d 100644 --- a/roles/rabbitmq_cluster/tasks/vhost-centos-odcs.yml +++ b/roles/rabbitmq_cluster/tasks/vhost-centos-odcs.yml @@ -56,7 +56,7 @@ - name: Dump the admin password in a file for administrative operations run_once: true delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" - copy: + ansible.builtin.copy: dest: /root/.centos-odcs-rabbitmqpass content: "{{ (env == 'production')|ternary(rabbitmq_centos_odcs_admin_password_production, rabbitmq_centos_odcs_admin_password_staging) }}" mode: "0600" diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml index 2f0b1d84b2..5b71f4cb67 100644 --- a/roles/relvalconsumer/tasks/main.yml +++ b/roles/relvalconsumer/tasks/main.yml @@ -130,7 +130,7 @@ ansible.builtin.file: path=/root/.openidc state=directory owner=root group=root mode=0700 # - name: Write wikitcms token file for root -# copy: src={{ wikitcms_token }} dest=/root/.openidc/oidc_wikitcms.json owner=root group=root mode=0600 +# ansible.builtin.copy: src={{ wikitcms_token }} dest=/root/.openidc/oidc_wikitcms.json owner=root group=root mode=0600 # when: "wikitcms_token is defined" # tags: # - config @@ -169,7 +169,7 @@ # convenience while the roles are all run on the same system, and # stg uses the prod account and credentials to listen on prod - name: Deploy the Fedora infra fedora-messaging cert (openQA production) - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/production/pki/issued/{{ openqa_amqp_prod_username }}.crt" dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_prod_username }}-cert.pem" mode: "0644" @@ -184,7 +184,7 @@ # on the same box as openQA, in fact we need to keep the ownership in # line. This needs making cleaner somehow. - name: Deploy the Fedora infra fedora-messaging key (openQA production) - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/production/pki/private/{{ openqa_amqp_prod_username }}.key" dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_prod_username }}-key.pem" mode: "0640" diff --git a/roles/repo2json/tasks/main.yml b/roles/repo2json/tasks/main.yml index 581f021f2a..738380611f 100644 --- a/roles/repo2json/tasks/main.yml +++ b/roles/repo2json/tasks/main.yml @@ -16,7 +16,7 @@ - repo2json - name: Install the rhel_to_json script and cron - copy: src={{ item.file }} dest={{ item.dest }} + ansible.builtin.copy: src={{ item.file }} dest={{ item.dest }} owner=root group=root mode={{ item.mode }} with_items: - { file: rhel_to_json.py, dest: /usr/bin/local/rhel_to_json.py, mode: 755 } diff --git a/roles/review-stats/proxy/tasks/main.yml b/roles/review-stats/proxy/tasks/main.yml index ca4385fa8b..6944aab64d 100644 --- a/roles/review-stats/proxy/tasks/main.yml +++ b/roles/review-stats/proxy/tasks/main.yml @@ -17,7 +17,7 @@ - review-stats/proxy - name: Install the sync-review-stats cronjob to pull content from builder - copy: > + ansible.builtin.copy: > src=sync-review-stats.cron dest=/etc/cron.d/sync-review-stats.cron owner=root group=root mode=0644 tags: diff --git a/roles/rkhunter/tasks/main.yml b/roles/rkhunter/tasks/main.yml index 5b9d6d269f..b2674032b1 100644 --- a/roles/rkhunter/tasks/main.yml +++ b/roles/rkhunter/tasks/main.yml @@ -16,7 +16,7 @@ - config - name: Rkhunter sysconfig - copy: src=rkhunter.sysconfig dest=/etc/sysconfig/rkhunter mode=0640 + ansible.builtin.copy: src=rkhunter.sysconfig dest=/etc/sysconfig/rkhunter mode=0640 notify: - run rkhunter tags: diff --git a/roles/robosignatory/tasks/main.yml b/roles/robosignatory/tasks/main.yml index ba13339db5..00aedc42c2 100644 --- a/roles/robosignatory/tasks/main.yml +++ b/roles/robosignatory/tasks/main.yml @@ -58,7 +58,7 @@ - robosignatory - name: Install sigul configuration - copy: + ansible.builtin.copy: src: sigul.{{env}}.conf dest: /etc/sigul/client.conf owner: robosignatory @@ -90,7 +90,7 @@ - robosignatory - name: Install koji CA certificate - copy: + ansible.builtin.copy: src: "{{ private }}/files/fedora-ca.cert" dest: /etc/robosignatory/serverca.cert owner: robosignatory @@ -116,7 +116,7 @@ - robosignatory - name: Deploy the fedora-messaging CA - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/ca.crt" dest: /etc/pki/fedora-messaging/cacert.pem mode: "0644" @@ -127,7 +127,7 @@ - robosignatory - name: Deploy the fedora-messaging cert - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/robosignatory{{env_suffix}}.crt" dest: /etc/pki/fedora-messaging/robosignatory-cert.pem mode: "0644" @@ -140,7 +140,7 @@ - robosignatory - name: Deploy the fedora-messaging key - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/robosignatory{{env_suffix}}.key" dest: /etc/pki/fedora-messaging/robosignatory-key.pem mode: "0600" @@ -179,7 +179,7 @@ - robosignatory - name: Configure fm-consumer@.service to run as robosignatory (staging) - copy: + ansible.builtin.copy: src: fm-consumer@.service dest: /etc/systemd/system/fm-consumer@.service.d/local.conf owner: root @@ -204,7 +204,7 @@ - robosignatory - name: Configure key add script - copy: + ansible.builtin.copy: src: sigul-add-key dest: /usr/local/bin/sigul-add-key owner: root @@ -218,7 +218,7 @@ - robosignatory - name: Configure robosignatory.service - copy: + ansible.builtin.copy: src: robosignatory.service dest: /etc/systemd/system/robosignatory.service owner: root @@ -232,7 +232,7 @@ - robosignatory - name: Allow robosignatory to use systemd-ask-password - copy: + ansible.builtin.copy: src: ask-password-robosignatory.conf dest: /etc/tmpfiles.d/ask-password-robosignatory.conf owner: root diff --git a/roles/rsyncd/tasks/main.yml b/roles/rsyncd/tasks/main.yml index d7c92f48b9..f0fb1a6e3a 100644 --- a/roles/rsyncd/tasks/main.yml +++ b/roles/rsyncd/tasks/main.yml @@ -39,7 +39,7 @@ when: ansible_distribution == 'Fedora' or (ansible_distribution == 'RedHat' and ansible_distribution_major_version|int > 8) - name: Rsyncd.conf file for non download servers - copy: src={{ item }} dest=/etc/rsyncd.conf mode=0644 + ansible.builtin.copy: src={{ item }} dest=/etc/rsyncd.conf mode=0644 with_first_found: - "{{ rsyncd_conf }}" - rsyncd.conf.{{ inventory_hostname }} @@ -64,7 +64,7 @@ - rsyncd - name: Xinetd rsync file for rhel8 - copy: src={{ item }} dest=/etc/xinetd.d/rsync mode=0644 + ansible.builtin.copy: src={{ item }} dest=/etc/xinetd.d/rsync mode=0644 with_first_found: - "{{ rsync }}" - rsync.{{ inventory_hostname }} @@ -79,7 +79,7 @@ - rsyncd - name: Systemd rsync file for fedora and rhel9 - copy: src=rsyncd.service dest=/usr/lib/systemd/system/rsyncd.service mode=0644 + ansible.builtin.copy: src=rsyncd.service dest=/usr/lib/systemd/system/rsyncd.service mode=0644 when: ansible_distribution == 'Fedora' or (ansible_distribution == 'RedHat' and ansible_distribution_major_version|int > 8) notify: - restart daemon diff --git a/roles/security.txt/tasks/main.yml b/roles/security.txt/tasks/main.yml index 9ef4f1651d..317a1e24fd 100644 --- a/roles/security.txt/tasks/main.yml +++ b/roles/security.txt/tasks/main.yml @@ -1,12 +1,12 @@ --- # Install static security.txt file on proxies. - name: Copy static security.txt file into place - copy: src=security.txt dest=/srv/web/security.txt owner=root group=root mode=755 + ansible.builtin.copy: src=security.txt dest=/srv/web/security.txt owner=root group=root mode=755 tags: - security.txt - name: Copy httpd config - copy: src=security-txt.conf dest=/etc/httpd/conf.d/admin.fedoraproject.org/security-txt.conf owner=root group=root mode=755 + ansible.builtin.copy: src=security-txt.conf dest=/etc/httpd/conf.d/admin.fedoraproject.org/security-txt.conf owner=root group=root mode=755 notify: - reload apache tags: diff --git a/roles/selinux/module/tasks/main.yml b/roles/selinux/module/tasks/main.yml index fbc361f51c..3f72f2963c 100644 --- a/roles/selinux/module/tasks/main.yml +++ b/roles/selinux/module/tasks/main.yml @@ -12,7 +12,7 @@ # install. - name: Copy over our custom selinux module for {{ policy_name }} - copy: src="{{ policy_file }}" dest="/usr/local/share/{{ policy_name }}.te" + ansible.builtin.copy: src="{{ policy_file }}" dest="/usr/local/share/{{ policy_name }}.te" register: selinux_module tags: - selinux diff --git a/roles/sigul/server/tasks/main.yml b/roles/sigul/server/tasks/main.yml index a6dbd14650..83b6a0d3db 100644 --- a/roles/sigul/server/tasks/main.yml +++ b/roles/sigul/server/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Put rhel AH repos on rhel systems - copy: src="{{ files }}/common/rhel7ah.repo" dest="/etc/yum.repos.d/rhel7ah.repo" + ansible.builtin.copy: src="{{ files }}/common/rhel7ah.repo" dest="/etc/yum.repos.d/rhel7ah.repo" when: ansible_distribution == 'RedHat' tags: - config @@ -62,12 +62,12 @@ when: ansible_distribution_major_version|int == 7 and ansible_distribution == 'RedHat' - name: Add polkit rules to allow sigul user to access the smartcard/yubikey - copy: src=00-sigul.rules dest=/etc/polkit-1/rules.d/00-sigul.rules + ansible.builtin.copy: src=00-sigul.rules dest=/etc/polkit-1/rules.d/00-sigul.rules tags: - config - name: Deploy public yubikey certs - copy: src="{{private}}/files/sigul/{{item}}" dest=/etc/sigul/{{item}} mode=0644 owner=root group=root + ansible.builtin.copy: src="{{private}}/files/sigul/{{item}}" dest=/etc/sigul/{{item}} mode=0644 owner=root group=root with_items: - yubikey_sv03.pem - yubikey_sv04.pem diff --git a/roles/smtp-auth-relay/tasks/main.yml b/roles/smtp-auth-relay/tasks/main.yml index 86113f269d..0ba16dc0a1 100644 --- a/roles/smtp-auth-relay/tasks/main.yml +++ b/roles/smtp-auth-relay/tasks/main.yml @@ -9,7 +9,7 @@ - smtp_auth_relay - name: Create the password file - copy: + ansible.builtin.copy: dest: /etc/postfix/sasl_passwd content: "{{ smtp_auth_relay_host }} {{ smtp_auth_relay_user }}:{{ smtp_auth_relay_password }}" mode: "0600" diff --git a/roles/spamassassin/tasks/main.yml b/roles/spamassassin/tasks/main.yml index 98771c7068..de4e5e544b 100644 --- a/roles/spamassassin/tasks/main.yml +++ b/roles/spamassassin/tasks/main.yml @@ -20,21 +20,21 @@ - config - name: Setup the sysconfig file - copy: src=sysconfig dest=/etc/sysconfig/spamassassin + ansible.builtin.copy: src=sysconfig dest=/etc/sysconfig/spamassassin notify: - restart spamassassin tags: - config - name: Setup the config file - copy: src=local.cf dest=/etc/mail/spamassassin/local.cf + ansible.builtin.copy: src=local.cf dest=/etc/mail/spamassassin/local.cf notify: - restart spamassassin tags: - config - name: Setup the cron job - copy: src=sa-update dest=/etc/cron.d/sa-update + ansible.builtin.copy: src=sa-update dest=/etc/cron.d/sa-update tags: - config @@ -44,6 +44,6 @@ - service - name: Setup logrotate to our needs - copy: src="spamassassin.logrotate" dest=/etc/logrotate.d/spamassassin + ansible.builtin.copy: src="spamassassin.logrotate" dest=/etc/logrotate.d/spamassassin tags: - config diff --git a/roles/sudo/tasks/main.yml b/roles/sudo/tasks/main.yml index 468f02c966..c873d584a8 100644 --- a/roles/sudo/tasks/main.yml +++ b/roles/sudo/tasks/main.yml @@ -7,7 +7,7 @@ # Put in place the default sysadmin-main sudoers file. # - name: Setup /etc/sudoers.d/01-sysadmin-main - copy: src="{{ private }}/files/sudo/sysadmin-main" dest=/etc/sudoers.d/01-sysadmin-main owner=root group=root mode=0600 + ansible.builtin.copy: src="{{ private }}/files/sudo/sysadmin-main" dest=/etc/sudoers.d/01-sysadmin-main owner=root group=root mode=0600 when: "sudoers_main is not defined and (primary_auth_source | default('fas')) == 'fas'" tags: - config @@ -18,7 +18,7 @@ # Put in place the default sysadmin-main sudoers file. (nopasswd edition) # - name: Setup /etc/sudoers.d/01-sysadmin-main (nopasswd) - copy: src="{{ private }}/files/sudo/sysadmin-main-nopasswd" dest=/etc/sudoers.d/01-sysadmin-main owner=root group=root mode=0600 + ansible.builtin.copy: src="{{ private }}/files/sudo/sysadmin-main-nopasswd" dest=/etc/sudoers.d/01-sysadmin-main owner=root group=root mode=0600 when: sudoers_main is defined and sudoers_main == 'nopasswd' tags: - config @@ -36,7 +36,7 @@ # This will move a /etc/sudoers.d/ file in place # - name: Setup /etc/sudoers.d/sudoer file for client use - copy: src={{ item }} dest=/etc/sudoers.d/{{ item | basename | replace('.', '_') }} + ansible.builtin.copy: src={{ item }} dest=/etc/sudoers.d/{{ item | basename | replace('.', '_') }} owner=root group=root mode=0600 with_first_found: - "{{ sudoers }}" diff --git a/roles/supybot/tasks/main.yml b/roles/supybot/tasks/main.yml index 793dd9e668..9229a5e4cd 100644 --- a/roles/supybot/tasks/main.yml +++ b/roles/supybot/tasks/main.yml @@ -33,7 +33,7 @@ tags: supybot - name: Setup meetings_by_team script - copy: src=meetings_by_team.sh dest=/usr/local/bin/meetings_by_team.sh mode=755 + ansible.builtin.copy: src=meetings_by_team.sh dest=/usr/local/bin/meetings_by_team.sh mode=755 tags: supybot - name: Teams cron job @@ -47,7 +47,7 @@ tags: supybot - name: Setup archive script - copy: src=archive.sh dest=/usr/local/bin/archive.sh mode=755 + ansible.builtin.copy: src=archive.sh dest=/usr/local/bin/archive.sh mode=755 tags: supybot - name: Teams cron job @@ -62,7 +62,7 @@ when: inventory_hostname.startswith('value02') - name: Setup meetbot.conf apache config - copy: src=meetbot.conf dest=/etc/httpd/conf.d/meetbot.conf mode=644 + ansible.builtin.copy: src=meetbot.conf dest=/etc/httpd/conf.d/meetbot.conf mode=644 tags: supybot - name: Check the selinux context of the /srv/web/meetbot dir @@ -115,7 +115,7 @@ - config - name: Deploy the fedora-messaging CA - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/ca.crt" dest: /etc/pki/fedora-messaging/rabbitmq-ca.crt mode: "0644" @@ -127,7 +127,7 @@ - config - name: Deploy the fedora-messaging cert - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/{{ botname }}.crt" dest: /etc/pki/fedora-messaging/{{ botname }}.crt mode: "0644" @@ -139,7 +139,7 @@ - config - name: Deploy the fedora-messaging key - copy: + ansible.builtin.copy: src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/{{ botname }}.key" dest: /etc/pki/fedora-messaging/{{ botname }}.key mode: "0600" @@ -163,7 +163,7 @@ - config - name: Setup zodbot systemd service file (prod) - copy: src=zodbot.service dest=/etc/systemd/system/zodbot.service + ansible.builtin.copy: src=zodbot.service dest=/etc/systemd/system/zodbot.service when: env == "production" notify: - reload systemd @@ -179,7 +179,7 @@ - supybot - name: Setup ursabot systemd service file (stg) - copy: src=ursabot.service dest=/etc/systemd/system/ursabot.service + ansible.builtin.copy: src=ursabot.service dest=/etc/systemd/system/ursabot.service when: env == "staging" notify: - reload systemd @@ -195,7 +195,7 @@ - supybot - name: Setup the SAR script for the meetbot logs - copy: src=meetbot_sar.py dest=/usr/local/bin/meetbot_sar.py + ansible.builtin.copy: src=meetbot_sar.py dest=/usr/local/bin/meetbot_sar.py owner=root group=root mode=0700 tags: - config diff --git a/roles/testcase_stats/tasks/main.yml b/roles/testcase_stats/tasks/main.yml index 941adf124f..dd90ce07f1 100644 --- a/roles/testcase_stats/tasks/main.yml +++ b/roles/testcase_stats/tasks/main.yml @@ -33,7 +33,7 @@ template: src=testcase_stats.cron dest=/etc/cron.hourly/testcase_stats owner=root group=root mode=0755 - name: Set up Apache config - copy: src=testcase_stats.conf.httpd dest=/etc/httpd/conf.d/01-testcase_stats.conf owner=root group=root mode=0644 + ansible.builtin.copy: src=testcase_stats.conf.httpd dest=/etc/httpd/conf.d/01-testcase_stats.conf owner=root group=root mode=0644 notify: - reload httpd tags: diff --git a/roles/tftp_server/tasks/main.yml b/roles/tftp_server/tasks/main.yml index ebcf76b7e6..7570c108e4 100644 --- a/roles/tftp_server/tasks/main.yml +++ b/roles/tftp_server/tasks/main.yml @@ -18,7 +18,7 @@ - tftp_server - name: Setup pxelinux.cfg default file - copy: src=default.{{ inventory_hostname }} dest=/var/lib/tftpboot/pxelinux.cfg/default mode=644 + ansible.builtin.copy: src=default.{{ inventory_hostname }} dest=/var/lib/tftpboot/pxelinux.cfg/default mode=644 tags: - config - tftp_server @@ -45,7 +45,7 @@ when: datacenter == 'iad2' - name: Copy rhcos files to images folder - copy: + ansible.builtin.copy: src: "/var/lib/tftpboot/rhcos/" dest: "/var/lib/tftpboot/images/RHCOS/4.8/x86_64/" remote_src: yes diff --git a/roles/torrent/tasks/main.yml b/roles/torrent/tasks/main.yml index e17442c65b..95d7cfe1e7 100644 --- a/roles/torrent/tasks/main.yml +++ b/roles/torrent/tasks/main.yml @@ -36,7 +36,7 @@ - config - name: Install the files for the tracker - copy: src={{ item.file }} dest={{ item.dest }} mode={{ item.mode }} + ansible.builtin.copy: src={{ item.file }} dest={{ item.dest }} mode={{ item.mode }} with_items: - { file: torrent_generator.conf, dest: /etc/torrent_generator.conf, mode: 644 } - { file: spins_generator.conf, dest: /etc/spins_generator.conf, mode: 644 } diff --git a/roles/virthost/tasks/main.yml b/roles/virthost/tasks/main.yml index 20a4ecf1ae..a2e1e5336b 100644 --- a/roles/virthost/tasks/main.yml +++ b/roles/virthost/tasks/main.yml @@ -6,7 +6,7 @@ # enable the advanced virt module - name: Enable the advanced virt module - copy: + ansible.builtin.copy: dest: /etc/dnf/modules.d/virt.module content: | [virt] @@ -51,11 +51,11 @@ # We need this module option set and then need to tweak the libvirt xml to enable it # - name: Setup nested virt on virthosts with nested=true variable (x86_64) - copy: src=kvm_intel.conf dest=/etc/modprobe.d/kvm_intel.conf + ansible.builtin.copy: src=kvm_intel.conf dest=/etc/modprobe.d/kvm_intel.conf when: nested == true and ansible_architecture == 'x86_64' - name: Setup nested virt on virthosts with nested=true variable (s390x) - copy: src=kvm.conf dest=/etc/modprobe.d/kvm.conf + ansible.builtin.copy: src=kvm.conf dest=/etc/modprobe.d/kvm.conf when: nested == true and ansible_architecture == 's390x' # diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml index 9879dfb1ae..7ec770cd84 100644 --- a/roles/web-data-analysis/tasks/main.yml +++ b/roles/web-data-analysis/tasks/main.yml @@ -22,7 +22,7 @@ - web-data - name: Copy over website index. - copy: src=html/main-index.html dest=/var/www/html/index.html mode=0644 + ansible.builtin.copy: src=html/main-index.html dest=/var/www/html/index.html mode=0644 tags: - web-data @@ -33,7 +33,7 @@ - name: Css files - copy: src={{item}} dest=/var/www/html/css/ mode=0644 + ansible.builtin.copy: src={{item}} dest=/var/www/html/css/ mode=0644 with_items: [html/css/data-reports.css, html/css/normalize.css] tags: - web-data @@ -50,7 +50,7 @@ - web-data - name: Make the web directory summary. - copy: src=html/summary.html dest=/var/www/html/csv-reports/images/ mode=0644 + ansible.builtin.copy: src=html/summary.html dest=/var/www/html/csv-reports/images/ mode=0644 tags: - web-data @@ -59,31 +59,31 @@ with_items: [hotspot-all.png, fedora-rev-latest-stacked.png] - name: Scripts to condense data down for further processing - copy: src={{item}} dest=/usr/local/bin/ mode=0755 + ansible.builtin.copy: src={{item}} dest=/usr/local/bin/ mode=0755 with_items: [condense-mirrorlogs.sh] tags: - web-data - name: Python scripts to calculate various data - copy: src={{item}} dest=/usr/local/bin/ mode=0755 + ansible.builtin.copy: src={{item}} dest=/usr/local/bin/ mode=0755 with_items: [mirrorlist.py] tags: - web-data - name: Awk files for csv creation - copy: src={{item}} dest=/usr/local/share/web-data-analysis mode=0644 + ansible.builtin.copy: src={{item}} dest=/usr/local/share/web-data-analysis mode=0644 with_items: [mirrors-data.awk] tags: - web-data - name: Gnuplot file for image creation - copy: src={{item}} dest=/usr/local/share/web-data-analysis mode=0644 + ansible.builtin.copy: src={{item}} dest=/usr/local/share/web-data-analysis mode=0644 with_items: [mirrors-data.gp] tags: - web-data - name: Daily cron file to run the log files - copy: src={{item}} dest=/etc/cron.d/ mode=0644 + ansible.builtin.copy: src={{item}} dest=/etc/cron.d/ mode=0644 with_items: [condense-mirrorlogs.cron] tags: - web-data @@ -160,17 +160,17 @@ - cron - name: Install countme script to parse new logs & update totals - copy: src=countme-update.sh dest=/usr/local/bin/ mode=0755 + ansible.builtin.copy: src=countme-update.sh dest=/usr/local/bin/ mode=0755 tags: - web-data - name: Install CentOS countme script to parse new logs & update totals - copy: src=countme-centos-update.sh dest=/usr/local/bin/ mode=0755 + ansible.builtin.copy: src=countme-centos-update.sh dest=/usr/local/bin/ mode=0755 tags: - web-data - name: Install cron file to run countme-update.sh daily - copy: src=countme-update.cron dest=/etc/cron.d/ mode=0644 + ansible.builtin.copy: src=countme-update.cron dest=/etc/cron.d/ mode=0644 tags: - web-data - cron @@ -194,7 +194,7 @@ - config - name: Install a script to sync httpd logs via cron only on log01 - copy: + ansible.builtin.copy: src: sync-http-logs.py dest: /usr/local/bin/sync-http-logs.py mode: "0755" @@ -224,7 +224,7 @@ - web-data - name: Proxy log merge script (log01) - copy: src=combineHttpLogs.sh dest=/usr/local/bin/ mode=0755 + ansible.builtin.copy: src=combineHttpLogs.sh dest=/usr/local/bin/ mode=0755 tags: - config - web-data @@ -238,7 +238,7 @@ - cron - name: Install daily cron job to sync and merge log files - copy: + ansible.builtin.copy: src: sync-http-logs-and-merge.sh dest: /etc/cron.daily mode: "0755" @@ -247,7 +247,7 @@ - cron - name: Compress logs script (log01) - copy: src=compress_logs.sh dest=/usr/local/bin/ mode=0755 + ansible.builtin.copy: src=compress_logs.sh dest=/usr/local/bin/ mode=0755 tags: - config - web-data diff --git a/roles/weblate-backup/tasks/main.yml b/roles/weblate-backup/tasks/main.yml index 50e608f2f7..bd8104358e 100644 --- a/roles/weblate-backup/tasks/main.yml +++ b/roles/weblate-backup/tasks/main.yml @@ -24,7 +24,7 @@ - weblate_backup - name: Copy private key - copy: + ansible.builtin.copy: src: "{{ private }}/files/weblate/id_rsa" dest: ~_backup_weblate/.ssh/id_rsa owner: _backup_weblate @@ -34,7 +34,7 @@ - weblate_backup - name: Copy passphrase file - copy: + ansible.builtin.copy: src: "{{ private }}/files/weblate/borg_passphrase" dest: ~_backup_weblate/.borgpass owner: _backup_weblate diff --git a/roles/yubikey/tasks/main.yml b/roles/yubikey/tasks/main.yml index 9eb78790b8..ff299fb82f 100644 --- a/roles/yubikey/tasks/main.yml +++ b/roles/yubikey/tasks/main.yml @@ -25,7 +25,7 @@ - {file: /etc/ykksm/ykksm-config.php, dest: /usr/share/ykksm/ykksm-config.php } - name: Install the apache configuration files - copy: src={{ item.file }} + ansible.builtin.copy: src={{ item.file }} dest={{ item.dest}} with_items: - { file: yk-ksm.conf, dest: /etc/httpd/conf.d/yk-ksm.conf } diff --git a/roles/zabbix/zabbix_agent/tasks/main.yml b/roles/zabbix/zabbix_agent/tasks/main.yml index a2eb26fa24..2c1e785ac6 100644 --- a/roles/zabbix/zabbix_agent/tasks/main.yml +++ b/roles/zabbix/zabbix_agent/tasks/main.yml @@ -24,7 +24,7 @@ - zabbix_agent - name: Distributing custom selinux policies - copy: + ansible.builtin.copy: src: "selinux/{{ ansible_distribution_version[0] }}/{{ item }}" dest: "/etc/selinux/centos/{{ item }}" register: sepolicy @@ -65,7 +65,7 @@ - zabbix_agent - name: Copy zabbix-agend.conf psk config - copy: + ansible.builtin.copy: src: "{{ item }}" dest: /etc/zabbix/fedora.psk owner: zabbix diff --git a/roles/zabbix/zabbix_agent/tasks/tools.yml b/roles/zabbix/zabbix_agent/tasks/tools.yml index f60e8e1a8d..546f99b7dd 100644 --- a/roles/zabbix/zabbix_agent/tasks/tools.yml +++ b/roles/zabbix/zabbix_agent/tasks/tools.yml @@ -1,6 +1,6 @@ --- - name: Some basic wrapper scripts for zabbix-sender - copy: + ansible.builtin.copy: src: "scripts/{{ item }}" dest: "/usr/lib/zabbix/{{ item }}" mode: "0755" diff --git a/roles/zabbix/zabbix_server/tasks/plugins.yml b/roles/zabbix/zabbix_server/tasks/plugins.yml index 873a554570..223342db34 100644 --- a/roles/zabbix/zabbix_server/tasks/plugins.yml +++ b/roles/zabbix/zabbix_server/tasks/plugins.yml @@ -5,7 +5,7 @@ # Custom zabbix scripts - name: Importing zabbix scripts - copy: + ansible.builtin.copy: src: "{{ item }}" dest: /usr/lib/zabbix/ mode: "0755" diff --git a/roles/zanata/tasks/main.yml b/roles/zanata/tasks/main.yml index ce13349f60..a30b0182bf 100644 --- a/roles/zanata/tasks/main.yml +++ b/roles/zanata/tasks/main.yml @@ -25,7 +25,7 @@ - zanata - name: Zanata default config - copy: > + ansible.builtin.copy: > src=sample.xml dest=/var/lib/zanata/sample.xml owner=apache group=apache mode=0600 tags: diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml index 224b0577bd..4a4e133e17 100644 --- a/tasks/cloud_setup_basic.yml +++ b/tasks/cloud_setup_basic.yml @@ -79,7 +79,7 @@ - packages - name: Write out global-update-applied file if we updated - copy: content="updated" dest=/etc/sysconfig/global-update-applied + ansible.builtin.copy: content="updated" dest=/etc/sysconfig/global-update-applied when: updated is defined tags: - packages diff --git a/tasks/confine_ssh.yml b/tasks/confine_ssh.yml index 2fa860de74..81324eb4a1 100644 --- a/tasks/confine_ssh.yml +++ b/tasks/confine_ssh.yml @@ -1,6 +1,6 @@ --- - name: Install the confine-ssh script - copy: > + ansible.builtin.copy: > src={{files}}/scripts/confine-ssh.sh dest=/usr/local/bin/confine-ssh.sh mode=0755 diff --git a/tasks/openvpn_client.yml b/tasks/openvpn_client.yml index 02e4c65d94..5f3d75929f 100644 --- a/tasks/openvpn_client.yml +++ b/tasks/openvpn_client.yml @@ -6,35 +6,35 @@ - packages - name: /etc/openvpn/ca.crt from vpn/openvpn/keys/ca.crt - copy: src="{{ private }}/files/vpn/openvpn/keys/ca.crt" dest=/etc/openvpn/ca.crt mode=0600 owner=root group=root + ansible.builtin.copy: src="{{ private }}/files/vpn/openvpn/keys/ca.crt" dest=/etc/openvpn/ca.crt mode=0600 owner=root group=root tags: - config notify: - restart openvpn # - name: /etc/openvpn/crl.pem from vpn/openvpn/keys/crl.pem -# copy: src="{{ private }}/vpn/openvpn/keys/crl.pem" dest=/etc/openvpn/crl.pem mode=0644 owner=root group=root +# ansible.builtin.copy: src="{{ private }}/vpn/openvpn/keys/crl.pem" dest=/etc/openvpn/crl.pem mode=0644 owner=root group=root # tags: # - config # notify: # - restart openvpn - name: /etc/openvpn/openvpn.conf - copy: src="{{ files }}/openvpn/client.conf" dest=/etc/openvpn/openvpn.conf + ansible.builtin.copy: src="{{ files }}/openvpn/client.conf" dest=/etc/openvpn/openvpn.conf tags: - config notify: - restart openvpn - name: /etc/openvpn/client.crt - copy: src="{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.crt" dest=/etc/openvpn/client.crt mode=0600 owner=root group=root + ansible.builtin.copy: src="{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.crt" dest=/etc/openvpn/client.crt mode=0600 owner=root group=root tags: - config notify: - restart openvpn - name: /etc/openvpn/client.key - copy: src="{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.key" dest=/etc/openvpn/client.key mode=0600 owner=root group=root + ansible.builtin.copy: src="{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.key" dest=/etc/openvpn/client.key mode=0600 owner=root group=root tags: - config notify: diff --git a/tasks/openvpn_client_7.yml b/tasks/openvpn_client_7.yml index e27e111eaa..571322e98b 100644 --- a/tasks/openvpn_client_7.yml +++ b/tasks/openvpn_client_7.yml @@ -6,35 +6,35 @@ - packages - name: /etc/openvpn/ca.crt from vpn/openvpn/keys/ca.crt - copy: src="{{ private }}/files/vpn/openvpn/keys/ca.crt" dest=/etc/openvpn/ca.crt mode=0600 owner=root group=root + ansible.builtin.copy: src="{{ private }}/files/vpn/openvpn/keys/ca.crt" dest=/etc/openvpn/ca.crt mode=0600 owner=root group=root tags: - config notify: - restart openvpn 7 # - name: /etc/openvpn/crl.pem from vpn/openvpn/keys/crl.pem -# copy: src="{{ private }}/vpn/openvpn/keys/crl.pem" dest=/etc/openvpn/crl.pem mode=0644 owner=root group=root +# ansible.builtin.copy: src="{{ private }}/vpn/openvpn/keys/crl.pem" dest=/etc/openvpn/crl.pem mode=0644 owner=root group=root # tags: # - config # notify: # - restart openvpn - name: /etc/openvpn/openvpn.conf - copy: src="{{ files }}/openvpn/client.conf" dest=/etc/openvpn/openvpn.conf + ansible.builtin.copy: src="{{ files }}/openvpn/client.conf" dest=/etc/openvpn/openvpn.conf tags: - config notify: - restart openvpn 7 - name: /etc/openvpn/client.crt - copy: src="{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.crt" dest=/etc/openvpn/client.crt mode=0600 owner=root group=root + ansible.builtin.copy: src="{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.crt" dest=/etc/openvpn/client.crt mode=0600 owner=root group=root tags: - config notify: - restart openvpn 7 - name: /etc/openvpn/client.key - copy: src="{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.key" dest=/etc/openvpn/client.key mode=0600 owner=root group=root + ansible.builtin.copy: src="{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.key" dest=/etc/openvpn/client.key mode=0600 owner=root group=root tags: - config notify: diff --git a/tasks/postfix_basic.yml b/tasks/postfix_basic.yml index 926b5d2885..b5ac86c8d4 100644 --- a/tasks/postfix_basic.yml +++ b/tasks/postfix_basic.yml @@ -6,7 +6,7 @@ - packages - name: /etc/postfix/main.cf - copy: src={{ item }} dest=/etc/postfix/main.cf + ansible.builtin.copy: src={{ item }} dest=/etc/postfix/main.cf with_first_found: - "{{ postfix_maincf }}" - "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ ansible_fqdn }}" diff --git a/tasks/rdiff_backup_server.yml b/tasks/rdiff_backup_server.yml index 4bbb44b3f9..a27bcc5580 100644 --- a/tasks/rdiff_backup_server.yml +++ b/tasks/rdiff_backup_server.yml @@ -10,11 +10,11 @@ - packages - name: Setup rdiff backup script - copy: src="{{ files }}/rdiff-backup/run-rdiff-backups" dest=/usr/local/bin/run-rdiff-backups mode=755 + ansible.builtin.copy: src="{{ files }}/rdiff-backup/run-rdiff-backups" dest=/usr/local/bin/run-rdiff-backups mode=755 tags: - config - name: Setup rdiff backup cron - copy: src="{{ files }}/rdiff-backup/run-rdiff-backups.cron" dest=/etc/cron.d/run-rdiff-backups + ansible.builtin.copy: src="{{ files }}/rdiff-backup/run-rdiff-backups.cron" dest=/etc/cron.d/run-rdiff-backups tags: - config diff --git a/tasks/reg-server.yml b/tasks/reg-server.yml index bef12665fa..247d2c99fb 100644 --- a/tasks/reg-server.yml +++ b/tasks/reg-server.yml @@ -6,21 +6,21 @@ - regserver - name: Copy reg-server repositories html template - copy: + ansible.builtin.copy: src: "{{files}}/reg-server/repositories.html" dest: "/var/lib/reg-server/templates/repositories.html" tags: - regserver - name: Copy reg-server tags html template - copy: + ansible.builtin.copy: src: "{{files}}/reg-server/tags.html" dest: "/var/lib/reg-server/templates/tags.html" tags: - regserver - name: Install cronjob file - copy: + ansible.builtin.copy: src: "{{files}}/reg-server/cron-prod" dest: "/etc/cron.d/reg-server" when: env == "production" @@ -28,7 +28,7 @@ - regserver - name: Install cronjob file - stg - copy: + ansible.builtin.copy: src: "{{files}}/reg-server/cron-stg" dest: "/etc/cron.d/reg-server" when: env == "staging" @@ -36,14 +36,14 @@ - regserver - name: Copy fedora icon - copy: + ansible.builtin.copy: src: "{{files}}/reg-server/fedora.png" dest: "/var/lib/reg-server/static/fedora.png" tags: - regserver - name: Copy custom styles.css - copy: + ansible.builtin.copy: src: "{{files}}/reg-server/styles.css" dest: "/var/lib/reg-server/static/css/styles.css" tags: diff --git a/tasks/serialgetty.yml b/tasks/serialgetty.yml index 1311cbc87f..2cc99fc46d 100644 --- a/tasks/serialgetty.yml +++ b/tasks/serialgetty.yml @@ -1,7 +1,7 @@ --- - name: Upstart serial setup - copy: src="{{ files }}/common/ttyS0.conf" dest=/etc/init/ttyS0.conf + ansible.builtin.copy: src="{{ files }}/common/ttyS0.conf" dest=/etc/init/ttyS0.conf when: is_rhel is defined tags: - configs diff --git a/tasks/swap.yml b/tasks/swap.yml index 303ac25889..cf27721450 100644 --- a/tasks/swap.yml +++ b/tasks/swap.yml @@ -4,7 +4,7 @@ --- - name: Touch an empty file that we will use for swap - copy: + ansible.builtin.copy: content: "" dest: "{{ swap_file_path }}" force: no diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml index 2d2dc3089f..87634a00ca 100644 --- a/tasks/yumrepos.yml +++ b/tasks/yumrepos.yml @@ -27,7 +27,7 @@ - yumrepos - name: Put rhel repos on rhel systems - copy: src="{{ files }}/common/rhel{{ ansible_distribution_major_version|int }}.repo" dest="/etc/yum.repos.d/rhel{{ ansible_distribution_major_version|int }}.repo" + ansible.builtin.copy: src="{{ files }}/common/rhel{{ ansible_distribution_major_version|int }}.repo" dest="/etc/yum.repos.d/rhel{{ ansible_distribution_major_version|int }}.repo" when: ansible_distribution == 'RedHat' and not inventory_hostname.startswith('ppc9') and datacenter != "aws" tags: - config @@ -35,7 +35,7 @@ - yumrepos - name: Put rhel repos on rhel systems (power9) - copy: src="{{ files }}/common/rhel{{ ansible_distribution_major_version|int }}-power9.repo" dest="/etc/yum.repos.d/rhel{{ ansible_distribution_major_version|int }}.repo" + ansible.builtin.copy: src="{{ files }}/common/rhel{{ ansible_distribution_major_version|int }}-power9.repo" dest="/etc/yum.repos.d/rhel{{ ansible_distribution_major_version|int }}.repo" when: ansible_distribution == 'RedHat' and inventory_hostname.startswith('ppc9') and datacenter != "aws" tags: - config @@ -43,7 +43,7 @@ - yumrepos - name: Put epel repos on el systems - copy: src="{{ files }}/common/epel{{ ansible_distribution_major_version|int }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version|int }}.repo" + ansible.builtin.copy: src="{{ files }}/common/epel{{ ansible_distribution_major_version|int }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version|int }}.repo" when: ((ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and use_default_epel) and datacenter != "aws" tags: - config @@ -51,7 +51,7 @@ - yumrepos - name: Put epel repos on el systems (aws) - copy: src="{{ files }}/common/original-epel{{ ansible_distribution_major_version|int }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version|int }}.repo" + ansible.builtin.copy: src="{{ files }}/common/original-epel{{ ansible_distribution_major_version|int }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version|int }}.repo" when: ((ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and use_default_epel) and datacenter == "aws" tags: - config @@ -59,7 +59,7 @@ - yumrepos - name: Put epel gpg key on el systems (aws) - copy: src="{{ files }}/common/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version|int }}" dest="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version|int }}" + ansible.builtin.copy: src="{{ files }}/common/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version|int }}" dest="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version|int }}" when: ((ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and use_default_epel) and datacenter == "aws" tags: - config @@ -101,7 +101,7 @@ - yumrepos - name: Add infrastructure tags repo - RHEL - copy: src="{{ files }}/common/rhel-infra-tags.repo" dest="/etc/yum.repos.d/infra-tags.repo" + ansible.builtin.copy: src="{{ files }}/common/rhel-infra-tags.repo" dest="/etc/yum.repos.d/infra-tags.repo" when: ((ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')) tags: - config @@ -109,7 +109,7 @@ - yumrepos - name: Add infrastructure STAGING tags repo - RHEL - copy: src="{{ files }}/common/rhel-infra-tags-stg.repo" dest="/etc/yum.repos.d/infra-tags-stg.repo" + ansible.builtin.copy: src="{{ files }}/common/rhel-infra-tags-stg.repo" dest="/etc/yum.repos.d/infra-tags-stg.repo" when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and env in ['staging', 'pagure-staging'] tags: - config @@ -117,7 +117,7 @@ - yumrepos - name: Add infrastructure tags repo - Fedora - copy: src="{{ files }}/common/fedora-infra-tags.repo" dest="/etc/yum.repos.d/infra-tags.repo" + ansible.builtin.copy: src="{{ files }}/common/fedora-infra-tags.repo" dest="/etc/yum.repos.d/infra-tags.repo" when: ansible_distribution == 'Fedora' tags: - config @@ -125,7 +125,7 @@ - yumrepos - name: Add infrastructure STAGING tags repo - Fedora - copy: src="{{ files }}/common/fedora-infra-tags-stg.repo" dest="/etc/yum.repos.d/infra-tags-stg.repo" + ansible.builtin.copy: src="{{ files }}/common/fedora-infra-tags-stg.repo" dest="/etc/yum.repos.d/infra-tags-stg.repo" when: ansible_distribution == 'Fedora' and env in ['staging', 'pagure-staging'] tags: - config