From daaa33a10a2851894e611714b8fd21f16a0a08aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dubois?= Date: Wed, 28 Sep 2022 16:40:58 +0200 Subject: [PATCH] base: use a variable for /etc/installurl content --- CHANGELOG | 1 + roles/base/defaults/main.yml | 2 ++ roles/base/files/installurl | 1 - roles/base/tasks/packages.yml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 roles/base/files/installurl diff --git a/CHANGELOG b/CHANGELOG index d4cebc9..5acdad2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -45,6 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * nagios-nrpe: do not erase custom configuration of servers in nrpe.d/evolix.cfg, and do not use zzz_evolix.cfg anymore * base: export evomaintenance and evobackup tasks into their own roles * nagios-nrpe: multiples IP can now be checked with check_ipsecctl_critiques.sh +* base: use a variable for /etc/installurl content ### Fixed diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml index 1e107d8..e8a79a2 100644 --- a/roles/base/defaults/main.yml +++ b/roles/base/defaults/main.yml @@ -8,3 +8,5 @@ general_technical_realm: "example.com" evobsd_system_timeout: 36000 evobsd_path: "$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" cron_root_path: "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" + +install_url: "https://cdn.openbsd.org/pub/OpenBSD" diff --git a/roles/base/files/installurl b/roles/base/files/installurl deleted file mode 100644 index 93832e8..0000000 --- a/roles/base/files/installurl +++ /dev/null @@ -1 +0,0 @@ -https://cdn.openbsd.org/pub/OpenBSD diff --git a/roles/base/tasks/packages.yml b/roles/base/tasks/packages.yml index 2e9b4c7..d828f8b 100644 --- a/roles/base/tasks/packages.yml +++ b/roles/base/tasks/packages.yml @@ -2,8 +2,8 @@ - name: "Configure installurl" copy: + content: "{{ install_url }}\n" dest: /etc/installurl - src: installurl mode: "0644" tags: - pkg