Move all PPAs to desktop to enhance security of CLI images (#4414)

* Move PPAs to desktop * Remove script that is in by mistake * Fix
2025-09-24 19:47:06 +07:00 · 2022-11-11 12:19:20 +01:00
parent 6eef8aed2b
commit 996b6b40a7
32 changed files with 4 additions and 10 deletions
--- a/config/cli/bullseye/debootstrap/config_desktop/packages
+++ b/config/cli/bullseye/debootstrap/config_desktop/packages
@@ -1,3 +1,4 @@
 dconf-cli
 libglib2.0-dev
 libgtk2.0-bin
+nala
--- a/config/cli/bullseye/debootstrap/config_desktop/sources/apt/nala.gpg
+++ b/config/cli/bullseye/debootstrap/config_desktop/sources/apt/nala.gpg
--- a/config/cli/bullseye/debootstrap/config_desktop/sources/apt/nala.source
+++ b/config/cli/bullseye/debootstrap/config_desktop/sources/apt/nala.source
--- a/config/cli/bullseye/main/packages
+++ b/config/cli/bullseye/main/packages
@@ -6,7 +6,6 @@ dialog
 fake-hwclock
 figlet
 fping
-nala
 ncurses-term
 openssh-server
 parted
--- a/config/cli/focal/main/config_desktop/sources/apt/chromium-browser.gpg
+++ b/config/cli/focal/main/config_desktop/sources/apt/chromium-browser.gpg
--- a/config/cli/focal/main/config_desktop/sources/apt/chromium-browser.source
+++ b/config/cli/focal/main/config_desktop/sources/apt/chromium-browser.source
--- a/config/cli/focal/main/config_desktop/sources/apt/mozilla-team.gpg
+++ b/config/cli/focal/main/config_desktop/sources/apt/mozilla-team.gpg
--- a/config/cli/focal/main/config_desktop/sources/apt/mozilla-team.source
+++ b/config/cli/focal/main/config_desktop/sources/apt/mozilla-team.source
--- a/config/cli/focal/main/sources/apt/zfs.source
+++ b/config/cli/focal/main/sources/apt/zfs.source
@@ -1,2 +1 @@
 deb [signed-by=/usr/share/keyrings/zfs.gpg] https://ppa.launchpadcontent.net/jonathonf/zfs/ubuntu/ focal main
-# deb-src https://ppa.launchpadcontent.net/jonathonf/zfs/ubuntu/ focal main
--- a/config/cli/jammy/main/config_desktop/packages
+++ b/config/cli/jammy/main/config_desktop/packages
@@ -18,6 +18,7 @@ libnl-genl-3-dev
 libssl-dev
 libwrap0-dev
 linux-base
+nala
 sudo
 unattended-upgrades
 unicode-data
--- a/config/cli/jammy/main/config_desktop/sources/apt/chromium-browser.gpg
+++ b/config/cli/jammy/main/config_desktop/sources/apt/chromium-browser.gpg
--- a/config/cli/jammy/main/config_desktop/sources/apt/chromium-browser.source
+++ b/config/cli/jammy/main/config_desktop/sources/apt/chromium-browser.source
--- a/config/cli/jammy/main/config_desktop/sources/apt/mozilla-team.gpg
+++ b/config/cli/jammy/main/config_desktop/sources/apt/mozilla-team.gpg
--- a/config/cli/jammy/main/config_desktop/sources/apt/mozilla-team.source
+++ b/config/cli/jammy/main/config_desktop/sources/apt/mozilla-team.source
--- a/config/cli/jammy/main/config_desktop/sources/apt/nala.gpg
+++ b/config/cli/jammy/main/config_desktop/sources/apt/nala.gpg
--- a/config/cli/jammy/main/config_desktop/sources/apt/nala.source
+++ b/config/cli/jammy/main/config_desktop/sources/apt/nala.source
--- a/config/cli/kinetic/main/sources/apt/chromium-browser.gpg
+++ b/config/cli/kinetic/main/sources/apt/chromium-browser.gpg
@@ -1 +0,0 @@
-../../../../jammy/main/sources/apt/chromium-browser.gpg
--- a/config/cli/kinetic/main/sources/apt/chromium-browser.source
+++ b/config/cli/kinetic/main/sources/apt/chromium-browser.source
@@ -1 +0,0 @@
-../../../../jammy/main/sources/apt/chromium-browser.source
--- a/config/cli/kinetic/main/sources/apt/mozilla-team.gpg
+++ b/config/cli/kinetic/main/sources/apt/mozilla-team.gpg
@@ -1 +0,0 @@
-../../../../jammy/main/sources/apt/mozilla-team.gpg
--- a/config/cli/kinetic/main/sources/apt/mozilla-team.source
+++ b/config/cli/kinetic/main/sources/apt/mozilla-team.source
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/mozilla-team.gpg] http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ kinetic main
--- a/config/cli/kinetic/main/sources/apt/nala.gpg
+++ b/config/cli/kinetic/main/sources/apt/nala.gpg
@@ -1 +0,0 @@
-../../../../jammy/main/sources/apt/nala.gpg
--- a/config/cli/kinetic/main/sources/apt/nala.source
+++ b/config/cli/kinetic/main/sources/apt/nala.source
@@ -1 +0,0 @@
-../../../../jammy/main/sources/apt/nala.source
--- a/config/desktop/_all_distributions/environments/_all_environments/sources/apt/githubcli.gpg
+++ b/config/desktop/_all_distributions/environments/_all_environments/sources/apt/githubcli.gpg
--- a/config/desktop/_all_distributions/environments/_all_environments/sources/apt/githubcli.source
+++ b/config/desktop/_all_distributions/environments/_all_environments/sources/apt/githubcli.source
--- a/config/optional/architectures/arm64/_config/cli/_all_distributions/main/packages
+++ b/config/optional/architectures/arm64/_config/cli/_all_distributions/main/packages
@@ -1,4 +1,3 @@
-box64
 gpiod
 cpufrequtils
 nocache
--- a/config/optional/architectures/arm64/_config/desktop/_all_distributions/main/packages
+++ b/config/optional/architectures/arm64/_config/desktop/_all_distributions/main/packages
@@ -0,0 +1 @@
+box64
--- a/config/optional/architectures/arm64/_config/desktop/_all_distributions/main/sources/apt/box64.gpg
+++ b/config/optional/architectures/arm64/_config/desktop/_all_distributions/main/sources/apt/box64.gpg
--- a/config/optional/architectures/arm64/_config/desktop/_all_distributions/main/sources/apt/box64.source
+++ b/config/optional/architectures/arm64/_config/desktop/_all_distributions/main/sources/apt/box64.source
--- a/config/optional/architectures/armhf/_config/cli/_all_distributions/main/packages
+++ b/config/optional/architectures/armhf/_config/cli/_all_distributions/main/packages
@@ -1,4 +1,3 @@
-box86
 gpiod
 cpufrequtils
 nocache
--- a/config/optional/architectures/armhf/_config/desktop/_all_distributions/main/packages
+++ b/config/optional/architectures/armhf/_config/desktop/_all_distributions/main/packages
@@ -0,0 +1 @@
+box86
--- a/config/optional/architectures/armhf/_config/desktop/_all_distributions/main/sources/apt/box86.gpg
+++ b/config/optional/architectures/armhf/_config/desktop/_all_distributions/main/sources/apt/box86.gpg
--- a/config/optional/architectures/armhf/_config/desktop/_all_distributions/main/sources/apt/box86.source
+++ b/config/optional/architectures/armhf/_config/desktop/_all_distributions/main/sources/apt/box86.source
				`@@ -1 +0,0 @@`
				`../../../../jammy/main/sources/apt/chromium-browser.gpg`
				`@@ -1 +0,0 @@`
				`../../../../jammy/main/sources/apt/mozilla-team.gpg`
				`@@ -1 +0,0 @@`
				`deb [signed-by=/usr/share/keyrings/mozilla-team.gpg] http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ kinetic main`
				`@@ -1 +0,0 @@`
				`../../../../jammy/main/sources/apt/nala.gpg`