aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2024-02-28 10:45:02 -0300
committerSilvio Rhatto <rhatto@riseup.net>2024-02-28 10:45:02 -0300
commitc42e7b9e9898338ddaac22aac7984c68cd84e752 (patch)
tree87eb0d72fcce3e00809ba1dbbff8753e245c9127 /templates
parent0be57bbffc9db4370258b7114cf262f38d4f528a (diff)
downloadpuppet-nodo-c42e7b9e9898338ddaac22aac7984c68cd84e752.tar.gz
puppet-nodo-c42e7b9e9898338ddaac22aac7984c68cd84e752.tar.bz2
Feat: nodo::subsystem::apt: new parameters controlling contrib, non-free and non-free-firmware components
Diffstat (limited to 'templates')
-rw-r--r--templates/apt/Debian.sources.list.erb20
1 files changed, 10 insertions, 10 deletions
diff --git a/templates/apt/Debian.sources.list.erb b/templates/apt/Debian.sources.list.erb
index 690bec4..7b54459 100644
--- a/templates/apt/Debian.sources.list.erb
+++ b/templates/apt/Debian.sources.list.erb
@@ -4,22 +4,22 @@
### Debian current: <%= scope.lookupvar('::lsbdistcodename') %>
# basic
-deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %> main contrib non-free non-free-firmware
-deb-src https://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %> main contrib non-free non-free-firmware
+deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %> main<%= @contrib_component %><%= @non_free_component %><%= @non_free_firmware_component %>
+deb-src https://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %> main<%= @contrib_component %><%= @non_free_component %><%= @non_free_firmware_component %>
# updates
-deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-updates main contrib non-free non-free-firmware
-deb-src https://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-updates main contrib non-free non-free-firmware
+deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-updates main<%= @contrib_component %><%= @non_free_component %><%= @non_free_firmware_component %>
+deb-src https://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-updates main<%= @contrib_component %><%= @non_free_component %><%= @non_free_firmware_component %>
# security
<% if scope.lookupvar('::lsbdistcodename') == 'stretch' or scope.lookupvar('::lsbdistcodename') == 'buster' -%>
-deb http://security.debian.org/ <%= scope.lookupvar('::lsbdistcodename') %>/updates main contrib non-free non-free-firmware
-deb-src http://security.debian.org/ <%= scope.lookupvar('::lsbdistcodename') %>/updates main contrib non-free non-free-firmware
+deb http://security.debian.org/ <%= scope.lookupvar('::lsbdistcodename') %>/updates main<%= @contrib_component %><%= @non_free_component %><%= @non_free_firmware_component %>
+deb-src http://security.debian.org/ <%= scope.lookupvar('::lsbdistcodename') %>/updates main<%= @contrib_component %><%= @non_free_component %><%= @non_free_firmware_component %>
<% else -%>
-deb http://security.debian.org/debian-security <%= scope.lookupvar('::lsbdistcodename') %>-security main contrib non-free non-free-firmware
-deb-src http://security.debian.org/debian-security <%= scope.lookupvar('::lsbdistcodename') %>-security main contrib non-free non-free-firmware
+deb http://security.debian.org/debian-security <%= scope.lookupvar('::lsbdistcodename') %>-security main<%= @contrib_component %><%= @non_free_component %><%= @non_free_firmware_component %>
+deb-src http://security.debian.org/debian-security <%= scope.lookupvar('::lsbdistcodename') %>-security main<%= @contrib_component %><%= @non_free_component %><%= @non_free_firmware_component %>
<% end -%>
# backports
-deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-backports main contrib non-free non-free-firmware
-deb-src <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-backports main contrib non-free non-free-firmware
+deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-backports main<%= @contrib_component %><%= @non_free_component %><%= @non_free_firmware_component %>
+deb-src <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-backports main<%= @contrib_component %><%= @non_free_component %><%= @non_free_firmware_component %>