From ae9416ed85d427b36f577a31019ab4cb7b1b3c85 Mon Sep 17 00:00:00 2001 From: Gorden Mende Date: Wed, 16 Aug 2023 09:56:11 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- apt/sources.list | 12 ++++++------ apt/sources.list.d/mariadb.list | 2 +- apt/sources.list.d/nodesource.list | 4 ++-- apt/sources.list.d/php.list | 2 +- apt/sources.list.d/rspamd.list | 4 ++-- apt/sources.list.d/zerotier.list | 2 +- myssl/dh4096.pem | 22 +++++++++++----------- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apt/sources.list b/apt/sources.list index 1bbcd96f..25c7298f 100644 --- a/apt/sources.list +++ b/apt/sources.list @@ -4,15 +4,15 @@ #deb cdrom:[Debian GNU/Linux 10.0.0 _bullseye_ - Official amd64 NETINST 20190706-10:23]/ bullseye main -deb http://deb.debian.org/debian/ bullseye main -deb-src http://deb.debian.org/debian/ bullseye main +deb http://deb.debian.org/debian/ bookworm main contrib non-free +deb-src http://deb.debian.org/debian/ bookworm main contrib non-free -deb http://security.debian.org/debian-security bullseye-security main -deb-src http://security.debian.org/debian-security bullseye-security main +deb http://security.debian.org/debian-security bookworm-security main contrib non-free +deb-src http://security.debian.org/debian-security bookworm-security main contrib non-free # bullseye-updates, previously known as 'volatile' -deb http://deb.debian.org/debian/ bullseye-updates main -deb-src http://deb.debian.org/debian/ bullseye-updates main +deb http://deb.debian.org/debian/ bookworm-updates main contrib non-free +deb-src http://deb.debian.org/debian/ bookworm-updates main contrib non-free # This system was installed using small removable media # (e.g. netinst, live or single CD). The matching "deb cdrom" diff --git a/apt/sources.list.d/mariadb.list b/apt/sources.list.d/mariadb.list index 31538e7d..20d1dc35 100644 --- a/apt/sources.list.d/mariadb.list +++ b/apt/sources.list.d/mariadb.list @@ -14,4 +14,4 @@ #deb [arch=amd64] http://downloads.mariadb.com/Tools/debian bullseye main -deb https://mirror.wtnet.de/mariadb/repo/10.9/debian bullseye main +#deb https://mirror.wtnet.de/mariadb/repo/10.9/debian bookworm main diff --git a/apt/sources.list.d/nodesource.list b/apt/sources.list.d/nodesource.list index 16c96e12..ebb7e6a1 100644 --- a/apt/sources.list.d/nodesource.list +++ b/apt/sources.list.d/nodesource.list @@ -1,2 +1,2 @@ -deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_19.x bullseye main -deb-src [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_19.x bullseye main +deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_19.x bookworm main +deb-src [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_19.x bookworm main diff --git a/apt/sources.list.d/php.list b/apt/sources.list.d/php.list index c06ab57b..274e4280 100644 --- a/apt/sources.list.d/php.list +++ b/apt/sources.list.d/php.list @@ -1 +1 @@ -deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ bullseye main +deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ bookworm main diff --git a/apt/sources.list.d/rspamd.list b/apt/sources.list.d/rspamd.list index d2a92b28..7513c271 100644 --- a/apt/sources.list.d/rspamd.list +++ b/apt/sources.list.d/rspamd.list @@ -1,2 +1,2 @@ -deb [arch=amd64 signed-by=/etc/apt/keyrings/rspamd.gpg] http://rspamd.com/apt-stable/ bullseye main -deb-src [arch=amd64 signed-by=/etc/apt/keyrings/rspamd.gpg] http://rspamd.com/apt-stable/ bullseye main +deb [arch=amd64 signed-by=/etc/apt/keyrings/rspamd.gpg] http://rspamd.com/apt-stable/ bookworm main +deb-src [arch=amd64 signed-by=/etc/apt/keyrings/rspamd.gpg] http://rspamd.com/apt-stable/ bookworm main diff --git a/apt/sources.list.d/zerotier.list b/apt/sources.list.d/zerotier.list index 1daf2c6e..5fc09911 100644 --- a/apt/sources.list.d/zerotier.list +++ b/apt/sources.list.d/zerotier.list @@ -1 +1 @@ -deb http://download.zerotier.com/debian/bullseye bullseye main +#deb http://download.zerotier.com/debian/bullseye bookworm main diff --git a/myssl/dh4096.pem b/myssl/dh4096.pem index 983339ce..1ebad846 100644 --- a/myssl/dh4096.pem +++ b/myssl/dh4096.pem @@ -1,13 +1,13 @@ -----BEGIN DH PARAMETERS----- -MIICCAKCAgEAjjuEgC2Teup/nuVjsXapA2u2xJHARGnBVZ9Ch1mjXqUpu0jyqFab -51E0uS3KTSEPfYjwfXuqbWmLQ0xnpa2AzOjbinGJKjHNnkWqLi2qrUHpE2ZP+NFj -4HtblLK4+043c6clSHFY6JihVknS5P0soeyq44yRHjXAA+xg4BHhm9uL0lzlaS+8 -fFmcR52YToGZLjzAblpK20TZtAaRbVj1J93pXMJ+PReQNVI40xlSZILVgF2W+czD -oXCZf9PxaoNFMtJRV+h7oRD4eRbUdtl8ImxybQlxiA/pFLEWaxDu2DgPot1s9q1C -rnYLLq9eDZqE2WtdWwN6erJQ0s/nNkswkBa2aAs0UoUxxmqHPolOiw5HELWrMFzd -1p6mGZkqwExBQXmuyxG8dGBT5KfhfWPYIT7foD7s/sgjwv6lAIJ/doh1bquXOVdp -17gG56BUtnJshu5UEk6hXcL7APv46cQsQz8fGTsiYcqNm7mIAokbbYFHj7nb8EJh -3MaU9BVlP38oeR3fQY2MBsnSX7CUulrAxB7fwjwOZ3yxzvEA2l9tNWwKwx+DtZ3V -2c4M03NTEQ3C6+tGRfgbSQ5LOR8Sh7h4t6vqina7dQYJmX6LJp/XUtJodLXhdU4l -31YxGCyDAPskV72+8kqtk7FTjfEvMMK4ci0G5qFc9HL8xP0yL1QzFrMCAQI= +MIICCAKCAgEAwIfbNV2REGacdbXszBPZqRMqd+rOabA4g8BzOuTMt73oIKIcCZMc +1GWyGK6fCNjokGi2T3CASCC4Qt//X8lXyeDwl/ZYmgPctuNqt1DYIPmcpfBvo3DQ +uFCIM7uhG5IpKGaevQROEE+GYmbXlKihHnm5F+Fbeo05zBXu7QNDgmCDUDjCTFeC +q9TtpRTOLTQpZc3YwovXgArdD6B/sd3rugAS1sNXShiYw4NBiUyE0unj0h9IdaFP +2DK6yFkOMlbkUso5LjO8GkDfLsytURgibMQBDhoGjDze1LH6N77pnFAlVjyiahwb +Nrbu3cbcDZ0xBCOF7xImk3Mz8R1aVNzHJ81DBnQx//qYWAzknmrOIvp9VmLEksWe +tL+awuyDLb5KdTaW5SlHgCvY8oHUMu6UhkgJFA+se0XCqOGyI4raGI1zG0KMIQP1 +LnX6WlVi/GxT1desSl87tvB0h+NOFUIoIx/USRXdP8jBZ52tZjrAfVeqbJRmLKTf +MGAUn/E581yXQNKuUdNd/qD6X7GQ0RRQ7nAlWHsXq7qeHb5xO3l4uq+aO/OwndTs +YfZcC5h6W54JV0u+rw8aFJDikyfi/G/aQIh5DAsRvdZkPfWtjpvzied1hhmxjiwv +nfRY7/Yy+IeR/HtrzSHHuYI+purw6AlQrlBOrmPVjHDoc/i/j8AvKZMCAQI= -----END DH PARAMETERS-----