From: Frank Brehm Date: Fri, 19 Aug 2022 06:57:03 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=16640f7a8607ed51329e396b67bf53002f99c190;p=config%2Fbruni%2Fetc-mint-new1.git saving uncommitted changes in /etc prior to apt run --- diff --git a/.etckeeper b/.etckeeper index 708a0bf..5383dda 100755 --- a/.etckeeper +++ b/.etckeeper @@ -626,20 +626,28 @@ maybe chmod 0644 'apt/sources.list.d.bak.2022-08-14/team-xbmc-ppa-focal.list' maybe chmod 0644 'apt/sources.list.d.bak.2022-08-14/teams.list' maybe chmod 0644 'apt/sources.list.d.bak.2022-08-14/vscode.list' maybe chmod 0644 'apt/sources.list.d/fbrehm.list' -maybe chmod 0644 'apt/sources.list.d/flexiondotorg-minecraft-focal.list' +maybe chmod 0644 'apt/sources.list.d/flexiondotorg-minecraft-ubuntu.list' maybe chmod 0644 'apt/sources.list.d/google-chrome.list' -maybe chmod 0644 'apt/sources.list.d/nextcloud-devs-client-bionic.list' -maybe chmod 0644 'apt/sources.list.d/nilarimogard-webupd8-focal.list' +maybe chmod 0644 'apt/sources.list.d/nextcloud-devs-client-ubuntu.list' maybe chmod 0644 'apt/sources.list.d/official-package-repositories.list' maybe chmod 0664 'apt/sources.list.d/plexmediaserver.list' -maybe chmod 0644 'apt/sources.list.d/team-xbmc-ppa-focal.list' +maybe chmod 0644 'apt/sources.list.d/team-xbmc-ppa-jammy.list' maybe chmod 0644 'apt/sources.list.d/teams.list' maybe chmod 0644 'apt/sources.list.d/vscode.list' maybe chmod 0644 'apt/trusted.gpg' maybe chmod 0755 'apt/trusted.gpg.d' +maybe chmod 0644 'apt/trusted.gpg.d/apt.postgresql.org.gpg' maybe chmod 0644 'apt/trusted.gpg.d/google-chrome.gpg' +maybe chmod 0644 'apt/trusted.gpg.d/hashicorp.gpg' maybe chmod 0644 'apt/trusted.gpg.d/linuxmint-keyring.gpg' maybe chmod 0644 'apt/trusted.gpg.d/microsoft.gpg' +maybe chmod 0644 'apt/trusted.gpg.d/minecraft.asc' +maybe chmod 0644 'apt/trusted.gpg.d/nextcloud-devs.gpg' +maybe chmod 0644 'apt/trusted.gpg.d/pgadmin.gpg' +maybe chmod 0644 'apt/trusted.gpg.d/puppet-keyring.gpg' +maybe chmod 0644 'apt/trusted.gpg.d/puppet-tools-keyring.gpg' +maybe chmod 0644 'apt/trusted.gpg.d/repo.uhu-banane.de.gpg-key2.asc' +maybe chmod 0644 'apt/trusted.gpg.d/team-xbmc.asc' maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-defaults.chroot.key.gpg' maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg' maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2016-dbgsym.gpg' diff --git a/apt/sources.list.d/flexiondotorg-minecraft-focal.list b/apt/sources.list.d/flexiondotorg-minecraft-focal.list deleted file mode 100644 index 1d5e6f5..0000000 --- a/apt/sources.list.d/flexiondotorg-minecraft-focal.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/flexiondotorg/minecraft/ubuntu jammy main -# deb-src http://ppa.launchpad.net/flexiondotorg/minecraft/ubuntu jammy main diff --git a/apt/sources.list.d/flexiondotorg-minecraft-ubuntu.list b/apt/sources.list.d/flexiondotorg-minecraft-ubuntu.list new file mode 100644 index 0000000..20af49a --- /dev/null +++ b/apt/sources.list.d/flexiondotorg-minecraft-ubuntu.list @@ -0,0 +1,2 @@ +# deb http://ppa.launchpad.net/flexiondotorg/minecraft/ubuntu jammy main +# deb-src http://ppa.launchpad.net/flexiondotorg/minecraft/ubuntu jammy main diff --git a/apt/sources.list.d/nextcloud-devs-client-bionic.list b/apt/sources.list.d/nextcloud-devs-client-bionic.list deleted file mode 100644 index 20f74ec..0000000 --- a/apt/sources.list.d/nextcloud-devs-client-bionic.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/nextcloud-devs/client/ubuntu jammy main -# deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu jammy main diff --git a/apt/sources.list.d/nextcloud-devs-client-ubuntu.list b/apt/sources.list.d/nextcloud-devs-client-ubuntu.list new file mode 100644 index 0000000..20f74ec --- /dev/null +++ b/apt/sources.list.d/nextcloud-devs-client-ubuntu.list @@ -0,0 +1,2 @@ +deb http://ppa.launchpad.net/nextcloud-devs/client/ubuntu jammy main +# deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu jammy main diff --git a/apt/sources.list.d/nilarimogard-webupd8-focal.list b/apt/sources.list.d/nilarimogard-webupd8-focal.list deleted file mode 100644 index 70b8637..0000000 --- a/apt/sources.list.d/nilarimogard-webupd8-focal.list +++ /dev/null @@ -1,2 +0,0 @@ -# deb http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu focal main -# deb-src http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu focal main diff --git a/apt/sources.list.d/team-xbmc-ppa-focal.list b/apt/sources.list.d/team-xbmc-ppa-focal.list deleted file mode 100644 index 5b71e6f..0000000 --- a/apt/sources.list.d/team-xbmc-ppa-focal.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/team-xbmc/ppa/ubuntu jammy main -# deb-src http://ppa.launchpad.net/team-xbmc/ppa/ubuntu jammy main diff --git a/apt/sources.list.d/team-xbmc-ppa-jammy.list b/apt/sources.list.d/team-xbmc-ppa-jammy.list new file mode 100644 index 0000000..659b45b --- /dev/null +++ b/apt/sources.list.d/team-xbmc-ppa-jammy.list @@ -0,0 +1,2 @@ +# deb http://ppa.launchpad.net/team-xbmc/ppa/ubuntu jammy main +# deb-src http://ppa.launchpad.net/team-xbmc/ppa/ubuntu jammy main diff --git a/apt/trusted.gpg b/apt/trusted.gpg index 781a46d..2b5c00e 100644 Binary files a/apt/trusted.gpg and b/apt/trusted.gpg differ diff --git a/apt/trusted.gpg.d/apt.postgresql.org.gpg b/apt/trusted.gpg.d/apt.postgresql.org.gpg new file mode 100644 index 0000000..afa15cb Binary files /dev/null and b/apt/trusted.gpg.d/apt.postgresql.org.gpg differ diff --git a/apt/trusted.gpg.d/hashicorp.gpg b/apt/trusted.gpg.d/hashicorp.gpg new file mode 100644 index 0000000..0d3082b Binary files /dev/null and b/apt/trusted.gpg.d/hashicorp.gpg differ diff --git a/apt/trusted.gpg.d/linuxmint-keyring.gpg b/apt/trusted.gpg.d/linuxmint-keyring.gpg index ff1576e..ef00e7f 100644 Binary files a/apt/trusted.gpg.d/linuxmint-keyring.gpg and b/apt/trusted.gpg.d/linuxmint-keyring.gpg differ diff --git a/apt/trusted.gpg.d/minecraft.asc b/apt/trusted.gpg.d/minecraft.asc new file mode 100644 index 0000000..e69de29 diff --git a/apt/trusted.gpg.d/nextcloud-devs.gpg b/apt/trusted.gpg.d/nextcloud-devs.gpg new file mode 100644 index 0000000..80150b0 Binary files /dev/null and b/apt/trusted.gpg.d/nextcloud-devs.gpg differ diff --git a/apt/trusted.gpg.d/pgadmin.gpg b/apt/trusted.gpg.d/pgadmin.gpg new file mode 100644 index 0000000..dad43b2 Binary files /dev/null and b/apt/trusted.gpg.d/pgadmin.gpg differ diff --git a/apt/trusted.gpg.d/puppet-keyring.gpg b/apt/trusted.gpg.d/puppet-keyring.gpg new file mode 100644 index 0000000..81c9d29 Binary files /dev/null and b/apt/trusted.gpg.d/puppet-keyring.gpg differ diff --git a/apt/trusted.gpg.d/puppet-tools-keyring.gpg b/apt/trusted.gpg.d/puppet-tools-keyring.gpg new file mode 100644 index 0000000..81c9d29 Binary files /dev/null and b/apt/trusted.gpg.d/puppet-tools-keyring.gpg differ diff --git a/apt/trusted.gpg.d/repo.uhu-banane.de.gpg-key2.asc b/apt/trusted.gpg.d/repo.uhu-banane.de.gpg-key2.asc new file mode 100644 index 0000000..c6d8606 --- /dev/null +++ b/apt/trusted.gpg.d/repo.uhu-banane.de.gpg-key2.asc @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +P3sAh6WcNCOYEq7xJfApQA81fNoP +=41ob +-----END PGP PUBLIC KEY BLOCK----- diff --git a/apt/trusted.gpg.d/team-xbmc.asc b/apt/trusted.gpg.d/team-xbmc.asc new file mode 100644 index 0000000..e69de29