From 9ce858d69168478d3332933e839db624317e67bd Mon Sep 17 00:00:00 2001 From: do Date: Thu, 2 Jul 2020 14:43:04 +0200 Subject: [PATCH] apt-proxy for known hardware types --- hardware/common/apt.sls | 10 ++++++++++ hardware/common/init.sls | 11 +++++++++++ hardware/init.sls | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 hardware/common/apt.sls create mode 100644 hardware/common/init.sls diff --git a/hardware/common/apt.sls b/hardware/common/apt.sls new file mode 100644 index 0000000..f15394a --- /dev/null +++ b/hardware/common/apt.sls @@ -0,0 +1,10 @@ + +apt-proxy: + file.managed: + - name: /etc/apt/apt.conf.d/proxy + - contents: | + # SALT managed + Acquire::http::proxy "http://apt-cache.lan:3142"; + Acquire::ftp::proxy "http://apt-cache.lan:3142"; + + diff --git a/hardware/common/init.sls b/hardware/common/init.sls new file mode 100644 index 0000000..d864aa9 --- /dev/null +++ b/hardware/common/init.sls @@ -0,0 +1,11 @@ +{% +set hardwaretype = salt['grains.get']( + 'hardware', + default={} + ) +%} + +include: +{%- if 'unknown' not in hardwaretype %} + - .apt +{%- endif %} diff --git a/hardware/init.sls b/hardware/init.sls index 175fa31..97b51bc 100644 --- a/hardware/init.sls +++ b/hardware/init.sls @@ -1,4 +1,5 @@ -{% if grains['hardware'] == 'RaspberryPi' %} include: + - .common +{% if grains['hardware'] == 'RaspberryPi' %} - .raspberrypi {% endif %}