diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 52a918b305..5d4eaf6e2b 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -42,7 +42,7 @@ - role: fedora-web/build when: master_sundries_node|bool - role: fedora-web/translation - when: master_sundries_node|bool + when: master_sundries_node|bool and env != "staging" - role: fedora-budget/build when: master_sundries_node|bool - role: fedora-docs/build diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 874a5a9f5a..a61c4140e7 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -18,20 +18,25 @@ website: fedoraproject.org - role: fedora-web/start website: start.fedoraproject.org + when: env != "staging" - role: fedora-web/mirrors website: mirrors.fedoraproject.org + when: env != "staging" - role: fedora-web/community website: fedoracommunity.org when: env == "production" - role: fedora-web/getfedora website: getfedora.org + when: env != "staging" - role: fedora-web/flocktofedora website: flocktofedora.org when: env == "production" - role: fedora-web/labs website: labs.fedoraproject.org + when: env != "staging" - role: fedora-web/iot website: iot.fedoraproject.org + when: env != "staging" - role: fedora-web/registry website: registry.fedoraproject.org - role: fedora-web/ostree @@ -42,6 +47,7 @@ website: codecs.fedoraproject.org - role: fedora-web/alt website: alt.fedoraproject.org + when: env != "staging" - role: fedora-web/src website: src.fedoraproject.org - role: fedora-web/ols diff --git a/roles/fedora-web/alt/tasks/main.yml b/roles/fedora-web/alt/tasks/main.yml index fc7a56b972..094a89e505 100644 --- a/roles/fedora-web/alt/tasks/main.yml +++ b/roles/fedora-web/alt/tasks/main.yml @@ -4,6 +4,7 @@ tags: - fedora-web - fedora-web/alt + when: env != "staging" - name: Copy some config files for {{website}} ansible.builtin.copy: > @@ -17,3 +18,4 @@ tags: - fedora-web - fedora-web/alt + when: env != "staging" diff --git a/roles/fedora-web/community/tasks/main.yml b/roles/fedora-web/community/tasks/main.yml index 307a918f68..9e6cc46494 100644 --- a/roles/fedora-web/community/tasks/main.yml +++ b/roles/fedora-web/community/tasks/main.yml @@ -4,6 +4,7 @@ tags: - fedora-web - fedora-web/community + when: env != "staging" - name: Copy some config files for {{website}} ansible.builtin.copy: > @@ -17,3 +18,4 @@ tags: - fedora-web - fedora-web/community + when: env != "staging" diff --git a/roles/fedora-web/flocktofedora/tasks/main.yml b/roles/fedora-web/flocktofedora/tasks/main.yml index 8b6e7e2a08..d2c23e0cb0 100644 --- a/roles/fedora-web/flocktofedora/tasks/main.yml +++ b/roles/fedora-web/flocktofedora/tasks/main.yml @@ -4,6 +4,7 @@ tags: - fedora-web - fedora-web/flocktofedora + when: env != "staging" - name: Copy some config files for {{website}} ansible.builtin.copy: > @@ -17,3 +18,4 @@ tags: - fedora-web - fedora-web/flocktofedora + when: env != "staging" diff --git a/roles/fedora-web/getfedora/files/cron-sync-getfedora b/roles/fedora-web/getfedora/files/cron-sync-getfedora index 54ba1cb2c9..e75b37551f 100644 --- a/roles/fedora-web/getfedora/files/cron-sync-getfedora +++ b/roles/fedora-web/getfedora/files/cron-sync-getfedora @@ -1,2 +1,2 @@ 25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::getfedora.org/ /srv/web/getfedora.org/ -30 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::fmw/ /srv/web/fmw/ +# 30 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::fmw/ /srv/web/fmw/ diff --git a/roles/fedora-web/getfedora/tasks/main.yml b/roles/fedora-web/getfedora/tasks/main.yml index af1d6e09f9..09734f1dc6 100644 --- a/roles/fedora-web/getfedora/tasks/main.yml +++ b/roles/fedora-web/getfedora/tasks/main.yml @@ -4,6 +4,7 @@ tags: - fedora-web - fedora-web/getfedora + when: env != "staging" - name: Copy some config files for {{website}} ansible.builtin.copy: > @@ -18,3 +19,4 @@ tags: - fedora-web - fedora-web/getfedora + when: env != "staging" diff --git a/roles/fedora-web/iot/tasks/main.yml b/roles/fedora-web/iot/tasks/main.yml index ab447c639b..566479cb3c 100644 --- a/roles/fedora-web/iot/tasks/main.yml +++ b/roles/fedora-web/iot/tasks/main.yml @@ -4,6 +4,7 @@ tags: - fedora-web - fedora-web/iot + when: env != "staging" - name: Copy some config files for {{website}} ansible.builtin.copy: > @@ -17,3 +18,4 @@ tags: - fedora-web - fedora-web/iot + when: env != "staging" diff --git a/roles/fedora-web/labs/tasks/main.yml b/roles/fedora-web/labs/tasks/main.yml index 2fba61fcaa..3821076375 100644 --- a/roles/fedora-web/labs/tasks/main.yml +++ b/roles/fedora-web/labs/tasks/main.yml @@ -4,6 +4,7 @@ tags: - fedora-web - fedora-web/labs + when: env != "staging" - name: Copy some config files for {{website}} ansible.builtin.copy: > @@ -17,3 +18,4 @@ tags: - fedora-web - fedora-web/labs + when: env != "staging" diff --git a/roles/fedora-web/mirrors/tasks/main.yml b/roles/fedora-web/mirrors/tasks/main.yml index c548f67d04..59a816a42a 100644 --- a/roles/fedora-web/mirrors/tasks/main.yml +++ b/roles/fedora-web/mirrors/tasks/main.yml @@ -4,6 +4,7 @@ tags: - fedora-web - fedora-web/mirrors + when: env != "staging" - name: Copy some config files for {{website}} ansible.builtin.copy: > @@ -16,3 +17,4 @@ tags: - fedora-web - fedora-web/mirrors + when: env != "staging" diff --git a/roles/fedora-web/start/tasks/main.yml b/roles/fedora-web/start/tasks/main.yml index 30a17edea9..f356870300 100644 --- a/roles/fedora-web/start/tasks/main.yml +++ b/roles/fedora-web/start/tasks/main.yml @@ -4,6 +4,7 @@ tags: - fedora-web - fedora-web/start + when: env != "staging" - name: Copy some config files for {{website}} ansible.builtin.copy: > @@ -17,3 +18,4 @@ tags: - fedora-web - fedora-web/start + when: env != "staging" diff --git a/roles/fedora-web/translation/tasks/main.yml b/roles/fedora-web/translation/tasks/main.yml index bc20624ca0..279ab2074e 100644 --- a/roles/fedora-web/translation/tasks/main.yml +++ b/roles/fedora-web/translation/tasks/main.yml @@ -8,6 +8,7 @@ state: present tags: - fedora-web-translation + when: env != "staging" - name: Create a non root user to run the code user: @@ -17,10 +18,12 @@ register: user_result tags: - fedora-web-translation + when: env != "staging" - name: Display the public key to add it to pagure debug: var: user_result.ssh_public_key + when: env != "staging" - name: Create gitconfig for user ansible.builtin.copy: @@ -36,6 +39,7 @@ mode: "0644" tags: - fedora-web-translation + when: env != "staging" - ansible.builtin.copy: src: ssh_config @@ -45,6 +49,7 @@ mode: "0644" tags: - fedora-web-translation + when: env != "staging" - ansible.builtin.copy: src: web-translation-update @@ -54,6 +59,7 @@ mode: "0755" tags: - fedora-web-translation + when: env != "staging" - ansible.builtin.copy: src: cron-web-translation-update