diff options
| -rw-r--r-- | roles/common/tasks/repos.yml | 20 | ||||
| -rw-r--r-- | roles/common/templates/updates-fantom-hidden.repo.j2 | 4 | ||||
| -rw-r--r-- | roles/common/templates/updates-fantom.repo.j2 | 4 |
3 files changed, 18 insertions, 10 deletions
diff --git a/roles/common/tasks/repos.yml b/roles/common/tasks/repos.yml index 74df13c..15a1ae1 100644 --- a/roles/common/tasks/repos.yml +++ b/roles/common/tasks/repos.yml @@ -5,7 +5,7 @@ owner: root group: root mode: 0644 - when: ansible_distribution_version|int >= {{ mirrorlimitdown }} and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= mirrorlimitdown and ansible_architecture == "x86_64" and ansible_distribution_release != "Rawhide" tags: localmirror @@ -16,7 +16,7 @@ owner: root group: root mode: 0644 - when: ansible_distribution_version|int >= {{ mirrorlimitdown }} and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= mirrorlimitdown and ansible_architecture == "x86_64" and ansible_distribution_release != "Rawhide" tags: localmirror @@ -25,7 +25,7 @@ section=updates option=enabled value=0 - when: ansible_distribution_version|int >= {{ mirrorlimitdown }} and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= mirrorlimitdown and ansible_architecture == "x86_64" and ansible_distribution_release != "Rawhide" and mirrorenable == "1" or mirrorhiddenenable == "1" tags: localmirror @@ -35,9 +35,9 @@ section=updates option=enabled value=1 - when: ansible_distribution_version|int >= {{ mirrorlimitdown }} and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= mirrorlimitdown and ansible_architecture == "x86_64" and ansible_distribution_release != "Rawhide" and mirrorenable == "0" - or mirrorhiddenenable == "0" + and mirrorhiddenenable == "0" tags: localmirror @@ -49,7 +49,7 @@ owner: root group: root mode: 0644 - when: ansible_distribution_version|int >= {{ mirrorlimitdown }} and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= mirrorlimitdown and ansible_architecture == "x86_64" and ansible_distribution_release != "Rawhide" tags: localmirror @@ -60,7 +60,7 @@ owner: root group: root mode: 0644 - when: ansible_distribution_version|int >= {{ mirrorlimitdown }} and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= mirrorlimitdown and ansible_architecture == "x86_64" and ansible_distribution_release != "Rawhide" tags: localmirror @@ -69,7 +69,7 @@ section=fedora option=enabled value=0 - when: ansible_distribution_version|int >= {{ mirrorlimitdown }} and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= mirrorlimitdown and ansible_architecture == "x86_64" and ansible_distribution_release != "Rawhide" and mirrorenable == "1" or mirrorhiddenenable == "1" tags: localmirror @@ -79,9 +79,9 @@ section=fedora option=enabled value=1 - when: ansible_distribution_version|int >= {{ mirrorlimitdown }} and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= mirrorlimitdown and ansible_architecture == "x86_64" and ansible_distribution_release != "Rawhide" and mirrorenable == "0" - or mirrorhiddenenable == "0" + and mirrorhiddenenable == "0" tags: localmirror diff --git a/roles/common/templates/updates-fantom-hidden.repo.j2 b/roles/common/templates/updates-fantom-hidden.repo.j2 index defd824..a465f30 100644 --- a/roles/common/templates/updates-fantom-hidden.repo.j2 +++ b/roles/common/templates/updates-fantom-hidden.repo.j2 @@ -1,7 +1,11 @@ [updates-fantom-hidden] name=Fedora $releasever - $basearch - Updates on Casper's hidden server failovermethod=priority +{% if ansible_distribution_version|int <= 27 -%} +baseurl=http://pmstfd4f6s5bm2xq.onion/pub/fedora/linux/updates/$releasever/$basearch/ +{% else %} baseurl=http://pmstfd4f6s5bm2xq.onion/pub/fedora/linux/updates/$releasever/Everything/$basearch/ +{% endif -%} enabled={{ mirrorhiddenenable }} repo_gpgcheck=0 type=rpm diff --git a/roles/common/templates/updates-fantom.repo.j2 b/roles/common/templates/updates-fantom.repo.j2 index 3fa7c8b..7647aea 100644 --- a/roles/common/templates/updates-fantom.repo.j2 +++ b/roles/common/templates/updates-fantom.repo.j2 @@ -1,7 +1,11 @@ [updates-fantom] name=Fedora $releasever - $basearch - Updates on Casper's server failovermethod=priority +{% if ansible_distribution_version|int <= 27 -%} +baseurl=https://{{ mirrorhost }}/pub/fedora/linux/updates/$releasever/$basearch/ +{% else %} baseurl=https://{{ mirrorhost }}/pub/fedora/linux/updates/$releasever/Everything/$basearch/ +{% endif -%} enabled={{ mirrorenable }} repo_gpgcheck=0 type=rpm |