chore: use ansible_facts
All checks were successful
ci/woodpecker/push/linting Pipeline was successful
All checks were successful
ci/woodpecker/push/linting Pipeline was successful
This commit is contained in:
parent
d36ce2dfa8
commit
ad68a72478
3 changed files with 16 additions and 15 deletions
|
|
@ -1,11 +1,12 @@
|
||||||
Types: deb
|
Types: deb
|
||||||
URIs: {{ apt_repository_main }}
|
URIs: {{ apt_repository_main }}
|
||||||
Suites: {{ ansible_distribution_release }} {{ ansible_distribution_release }}-updates {{ ansible_distribution_release }}-backports
|
Suites: {{ ansible_facts['distribution_release'] }} {{ ansible_facts['distribution_release'] }}-updates {{
|
||||||
|
ansible_facts['distribution_release'] }}-backports
|
||||||
Components: main restricted {% if apt_enable_universe == True %}universe{% endif %} {% if apt_enable_multiverse == True %}multiverse{% endif %}
|
Components: main restricted {% if apt_enable_universe == True %}universe{% endif %} {% if apt_enable_multiverse == True %}multiverse{% endif %}
|
||||||
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
|
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
|
||||||
|
|
||||||
Types: deb
|
Types: deb
|
||||||
URIs: {{ apt_repository_security }}
|
URIs: {{ apt_repository_security }}
|
||||||
Suites: {{ ansible_distribution_release }}-security
|
Suites: {{ ansible_facts['distribution_release'] }}-security
|
||||||
Components: main restricted {% if apt_enable_universe == True %}universe{% endif %} {% if apt_enable_multiverse == True %}multiverse{% endif %}
|
Components: main restricted {% if apt_enable_universe == True %}universe{% endif %} {% if apt_enable_multiverse == True %}multiverse{% endif %}
|
||||||
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
|
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,21 @@
|
||||||
# main + restricted
|
# main + restricted
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }} main restricted
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }} main restricted
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }}-updates main restricted
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }}-updates main restricted
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }}-security main restricted
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }}-security main restricted
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }}-backports main restricted
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }}-backports main restricted
|
||||||
|
|
||||||
{% if apt_enable_universe == True %}
|
{% if apt_enable_universe == True %}
|
||||||
# universe
|
# universe
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }} universe
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }} universe
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }}-updates universe
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }}-updates universe
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }}-security universe
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }}-security universe
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }}-backports universe
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }}-backports universe
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if apt_enable_multiverse == True %}
|
{% if apt_enable_multiverse == True %}
|
||||||
# multiverse
|
# multiverse
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }} multiverse
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }} multiverse
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }}-updates multiverse
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }}-updates multiverse
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }}-security multiverse
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }}-security multiverse
|
||||||
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_distribution_release }}-backports multiverse
|
deb [ arch=amd64 ] {{ apt_repository }} {{ ansible_facts['distribution_release'] }}-backports multiverse
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ Compression no
|
||||||
AllowTcpForwarding yes
|
AllowTcpForwarding yes
|
||||||
AllowAgentForwarding yes
|
AllowAgentForwarding yes
|
||||||
PrintMotd yes
|
PrintMotd yes
|
||||||
{% if ansible_distribution == 'Debian' %}
|
{% if ansible_facts['distribution'] == 'Debian' %}
|
||||||
UsePAM yes
|
UsePAM yes
|
||||||
PrintLastLog no
|
PrintLastLog no
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue