From b9cae7237385c3892050c85ec1330401ffe72e87 Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Fri, 28 Feb 2025 20:09:10 +0200 Subject: [PATCH] etc/apt: remove sources.list/, continue sources.list.d/ migration --- .../experimental.list | 0 .../kali.list | 0 etc/apt/sources.list.d/stable.sources | 70 +++++++++++++++++++ etc/apt/sources.list/sid | 9 --- etc/apt/sources.list/stable | 44 ------------ etc/apt/sources.list/testing | 34 --------- etc/apt/sources.list/unstable | 9 --- 7 files changed, 70 insertions(+), 96 deletions(-) rename etc/apt/{sources.list => sources.list.d}/experimental.list (100%) rename etc/apt/{sources.list => sources.list.d}/kali.list (100%) create mode 100644 etc/apt/sources.list.d/stable.sources delete mode 100644 etc/apt/sources.list/sid delete mode 100644 etc/apt/sources.list/stable delete mode 100644 etc/apt/sources.list/testing delete mode 100644 etc/apt/sources.list/unstable diff --git a/etc/apt/sources.list/experimental.list b/etc/apt/sources.list.d/experimental.list similarity index 100% rename from etc/apt/sources.list/experimental.list rename to etc/apt/sources.list.d/experimental.list diff --git a/etc/apt/sources.list/kali.list b/etc/apt/sources.list.d/kali.list similarity index 100% rename from etc/apt/sources.list/kali.list rename to etc/apt/sources.list.d/kali.list diff --git a/etc/apt/sources.list.d/stable.sources b/etc/apt/sources.list.d/stable.sources new file mode 100644 index 00000000..3ef5049a --- /dev/null +++ b/etc/apt/sources.list.d/stable.sources @@ -0,0 +1,70 @@ +Types: deb deb-src +URIs: https://deb.debian.org/debian/ +Suites: stable +Components: main contrib non-free non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb +URIs: https://deb.debian.org/debian-debug/ +Suites: stable-debug +Components: main contrib non-free non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb deb-src +URIs: tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian/ +Suites: stable +Components: main contrib non-free non-free-firmware +Enabled: no +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb +URIs: tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug/ +Suites: stable-debug +Components: main contrib non-free non-free-firmware +Enabled: no +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb deb-src +URIs: https://deb.debian.org/debian-security/ +Suites: stable-security +Components: main contrib non-free non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb +URIs: https://deb.debian.org/debian-debug/ +Suites: stable-proposed-updates-debug +Components: main contrib non-free non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb deb-src +URIs: http://security.debian.org/ +Suites: stable-security +Components: main contrib non-free non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb deb-src +URIs: tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onion/debian-security/ +Suites: stable-security +Components: main contrib non-free non-free-firmware +Enabled: no +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb +URIs: tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug/ +Suites: stable-proposed-updates-debug +Components: main contrib non-free non-free-firmware +Enabled: no +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb deb-src +URIs: https://deb.debian.org/debian/ +Suites: stable-updates +Components: main contrib non-free non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb deb-src +URIs: tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian/ +Suites: stable-updates +Components: main contrib non-free non-free-firmware +Enabled: no +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg diff --git a/etc/apt/sources.list/sid b/etc/apt/sources.list/sid deleted file mode 100644 index c4683366..00000000 --- a/etc/apt/sources.list/sid +++ /dev/null @@ -1,9 +0,0 @@ -## Main repos -deb https://deb.debian.org/debian sid main contrib non-free non-free-firmware -deb-src https://deb.debian.org/debian sid main contrib non-free non-free-firmware -deb https://deb.debian.org/debian-debug sid-debug main contrib non-free non-free-firmware - -## Main repos over Tor -#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian sid main contrib non-free non-free-firmware -#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian sid main contrib non-free non-free-firmware -#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug sid-debug main contrib non-free non-free-firmware diff --git a/etc/apt/sources.list/stable b/etc/apt/sources.list/stable deleted file mode 100644 index 3fe95ecb..00000000 --- a/etc/apt/sources.list/stable +++ /dev/null @@ -1,44 +0,0 @@ -## Main repos -deb https://deb.debian.org/debian stable main contrib non-free non-free-firmware -deb-src https://deb.debian.org/debian stable main contrib non-free non-free-firmware -deb https://deb.debian.org/debian-debug stable-debug main contrib non-free non-free-firmware - -## Main repos over Tor -#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable main contrib non-free non-free-firmware -#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable main contrib non-free non-free-firmware -#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug stable-debug main contrib non-free non-free-firmware - -## Security repo CDN -deb https://deb.debian.org/debian-security/ stable-security main contrib non-free non-free-firmware -deb-src https://deb.debian.org/debian-security/ stable-security main contrib non-free non-free-firmware -## https://bugs.debian.org/894081 -deb https://deb.debian.org/debian-debug stable-proposed-updates-debug main contrib non-free non-free-firmware - -## Security repo directly -# To be enabled AFTER it gets https, meanwhile CDN & Tor must be enough. -#deb http://security.debian.org/ stable-security main contrib non-free non-free-firmware -#deb-src http://security.debian.org/ stable-security main contrib non-free non-free-firmware - -## Security repos over Tor -deb tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onion/debian-security stable-security main contrib non-free non-free-firmware -deb-src tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onion/debian-security stable-security main contrib non-free non-free-firmware -## https://bugs.debian.org/894081 -#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug stable-proposed-updates-debug main contrib non-free non-free-firmware - -## Updates repo -deb https://deb.debian.org/debian stable-updates main contrib non-free non-free-firmware -deb-src https://deb.debian.org/debian stable-updates main contrib non-free non-free-firmware - -## Updates repo over Tor -#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-updates main contrib non-free non-free-firmware -#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-updates main contrib non-free non-free-firmware - -## Backports -deb https://deb.debian.org/debian stable-backports main contrib non-free non-free-firmware -deb-src https://deb.debian.org/debian stable-backports main contrib non-free non-free-firmware -deb https://deb.debian.org/debian-debug stable-backports-debug main contrib non-free non-free-firmware - -## Backports over Tor -#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-backports main contrib non-free non-free-firmware -#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-backports main contrib non-free non-free-firmware -#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug stable-backports-debug main contrib non-free non-free-firmware diff --git a/etc/apt/sources.list/testing b/etc/apt/sources.list/testing deleted file mode 100644 index 3966b6e7..00000000 --- a/etc/apt/sources.list/testing +++ /dev/null @@ -1,34 +0,0 @@ -## Main repos -deb https://deb.debian.org/debian testing main contrib non-free non-free-firmware -deb-src https://deb.debian.org/debian testing main contrib non-free non-free-firmware -deb https://deb.debian.org/debian-debug testing-debug main contrib non-free non-free-firmware - -## Main repos over Tor -#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing main contrib non-free non-free-firmware -#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing main contrib non-free non-free-firmware -#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug testing-debug main contrib non-free non-free-firmware - -## Security repo CDN -deb https://deb.debian.org/debian-security/ testing-security main contrib non-free non-free-firmware -deb-src https://deb.debian.org/debian-security/ testing-security main contrib non-free non-free-firmware -## https://bugs.debian.org/894081 -deb https://deb.debian.org/debian-debug testing-proposed-updates-debug main contrib non-free non-free-firmware - -## Security repo directly -# To be enabled AFTER it gets https, meanwhile CDN & Tor must be enough. -#deb http://security.debian.org/ testing-security main contrib non-free non-free-firmware -#deb-src http://security.debian.org/ testing-security main contrib non-free non-free-firmware - -## Security repos over Tor -deb tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onion/debian-security testing-security main contrib non-free non-free-firmware -deb-src tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onion/debian-security testing-security main contrib non-free non-free-firmware -## https://bugs.debian.org/894081 -#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug testing-proposed-updates-debug main contrib non-free non-free-firmware - -## Updates repo -deb https://deb.debian.org/debian testing-updates main contrib non-free non-free-firmware -deb-src https://deb.debian.org/debian testing-updates main contrib non-free non-free-firmware - -## Updates repo over Tor -#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing-updates main contrib non-free non-free-firmware -#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing-updates main contrib non-free non-free-firmware diff --git a/etc/apt/sources.list/unstable b/etc/apt/sources.list/unstable deleted file mode 100644 index b3b169b3..00000000 --- a/etc/apt/sources.list/unstable +++ /dev/null @@ -1,9 +0,0 @@ -## Main repos -deb https://deb.debian.org/debian unstable main contrib non-free non-free-firmware -deb-src https://deb.debian.org/debian unstable main contrib non-free non-free-firmware -deb https://deb.debian.org/debian-debug unstable-debug main contrib non-free non-free-firmware - -## Main repos over Tor -#deb tor+http://vwakviie2ienjx6t.onion/debian unstable main contrib non-free non-free-firmware -#deb-src tor+http://vwakviie2ienjx6t.onion/debian unstable main contrib non-free non-free-firmware -#deb tor+http://ktqxbqrhg5ai2c7f.onion/debian-debug unstable-debug main contrib non-free non-free-firmware