Auto build for 4a5bda3

tuna · May 10, 2024 · 7cf2830 · 7cf2830
1 parent 351af7a
commit 7cf2830
Show file tree

Hide file tree

Showing 3 changed files with 189 additions and 8 deletions.
diff --git a/1970-01-01-debian.html b/1970-01-01-debian.html
@@ -29,11 +29,12 @@
 </div>
 {% raw %}
 <div class="z-help">
-<p>一般情况下，将 <code>/etc/apt/sources.list</code> 文件中 Debian 默认的源地址 <code>http://deb.debian.org/</code> 替换为镜像地址即可。</p>
+<p>大部分 Debian 的软件源配置文件使用传统的 One-Line-Style，路径为 <code>/etc/apt/sources.list</code>；但是对于容器镜像，从 Debian 12 开始，其软件源配置文件变更为 DEB822 格式，路径为 <code>/etc/apt/sources.list.d/debian.sources</code>。一般情况下，将对应文件中 Debian 默认的源地址 <code>http://deb.debian.org/</code> 替换为镜像地址即可。</p>
 <p>Debian Buster 以上版本默认支持 HTTPS 源。如果遇到无法拉取 HTTPS 源的情况，请先使用 HTTP 源并安装：</p>
 <div class="z-wrap"><form class="z-form" onsubmit="return false"></form><pre class="z-code"></pre></div><pre class="z-tmpl" z-lang="bash">
 {{sudo}}apt install apt-transport-https ca-certificates
 </pre>
+<h3>传统格式（<code>/etc/apt/sources.list</code>）</h3>
 <div class="z-wrap"><form class="z-form" onsubmit="return false"><div><label for="sgUPeCfW" title="">Debian 版本</label><select id="sgUPeCfW" name="release" title=""><option value="bookworm">Debian 12 (bookworm)</option><option value="bullseye">Debian 11 (bullseye)</option><option value="buster">Debian 10 (buster)</option><option value="testing">testing</option><option value="sid">sid</option></select></div><div><input id="CuiRiqdY" name="src" title="源码源通常用于构建和调试，开启后影响更新速度" type="checkbox"/><label for="CuiRiqdY" title="源码源通常用于构建和调试，开启后影响更新速度">启用源码源</label></div><div><input checked="checked" id="iwdkdUCh" name="nf" title="" type="checkbox"/><label for="iwdkdUCh" title="">使用非自由软件源</label></div><div><input id="PWTrdWIm" name="mirror_security" title="为了更及时地获得安全更新，不推荐使用镜像站安全更新软件源" type="checkbox"/><label for="PWTrdWIm" title="为了更及时地获得安全更新，不推荐使用镜像站安全更新软件源">强制安全更新使用镜像</label></div></form><pre class="z-code"></pre></div><pre class="z-tmpl" z-input="release src nf mirror_security" z-path="/etc/apt/sources.list">
 # 默认注释了源码镜像以提高 apt update 速度，如有需要可自行取消注释
 {{#sid}}
@@ -50,6 +51,7 @@
 deb {{endpoint}}/ {{release}}-backports main contrib{{#nf}}{{nonfree}}{{/nf}}
 {{src}}deb-src {{endpoint}}/ {{release}}-backports main contrib{{#nf}}{{nonfree}}{{/nf}}
 
+# 以下安全更新软件源包含了官方源与镜像站配置，如有需要可自行修改注释切换
 {{#mirror_security}}
 deb {{endpoint}}-security {{release}}{{security}} main contrib{{#nf}}{{nonfree}}{{/nf}}
 {{src}}deb-src {{endpoint}}-security {{release}}{{security}} main contrib{{#nf}}{{nonfree}}{{/nf}}
@@ -60,6 +62,65 @@
 {{/mirror_security}}
 {{/sid}}
 </pre>
+<h3>DEB822 格式（<code>/etc/apt/sources.list.d/debian.sources</code>）</h3>
+<div class="z-wrap"><form class="z-form" onsubmit="return false"><div><label for="AgelbHvJ" title="">Debian 版本</label><input id="AgelbHvJ" name="release_deb822" title="" type="text" value=""/></div><div><input id="eGsJgGJq" name="src" title="源码源通常用于构建和调试，开启后影响更新速度" type="checkbox"/><label for="eGsJgGJq" title="源码源通常用于构建和调试，开启后影响更新速度">启用源码源</label></div><div><input checked="checked" id="EVgCNQvL" name="nf" title="" type="checkbox"/><label for="EVgCNQvL" title="">使用非自由软件源</label></div><div><input id="RDtbVjNY" name="mirror_security" title="为了更及时地获得安全更新，不推荐使用镜像站安全更新软件源" type="checkbox"/><label for="RDtbVjNY" title="为了更及时地获得安全更新，不推荐使用镜像站安全更新软件源">强制安全更新使用镜像</label></div></form><pre class="z-code"></pre></div><pre class="z-tmpl" z-input="release_deb822 src nf mirror_security" z-path="/etc/apt/sources.list.d/debian.sources">
+{{#sid}}
+Types: deb
+URIs: {{endpoint}}
+Suites: sid
+Components: main contrib{{#nf}} non-free non-free-firmware{{/nf}}
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+
+# 默认注释了源码镜像以提高 apt update 速度，如有需要可自行取消注释
+{{src}}Types: deb-src
+{{src}}URIs: {{endpoint}}
+{{src}}Suites: sid
+{{src}}Components: main contrib{{#nf}} non-free non-free-firmware{{/nf}}
+{{src}}Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+{{/sid}}
+{{^sid}}
+Types: deb
+URIs: {{endpoint}}
+Suites: {{release_deb822}} {{release_deb822}}-updates {{release_deb822}}-backports
+Components: main contrib{{#nf}} non-free non-free-firmware{{/nf}}
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+
+# 默认注释了源码镜像以提高 apt update 速度，如有需要可自行取消注释
+{{src}}Types: deb-src
+{{src}}URIs: {{endpoint}}
+{{src}}Suites: {{release_deb822}} {{release_deb822}}-updates {{release_deb822}}-backports
+{{src}}Components: main contrib{{#nf}} non-free non-free-firmware{{/nf}}
+{{src}}Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+
+# 以下安全更新软件源包含了官方源与镜像站配置，如有需要可自行修改注释切换
+{{#mirror_security}}
+Types: deb
+URIs: {{endpoint}}-security
+Suites: {{release_deb822}}-security
+Components: main contrib{{#nf}} non-free non-free-firmware{{/nf}}
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+
+{{src}}Types: deb-src
+{{src}}URIs: {{endpoint}}-security
+{{src}}Suites: {{release_deb822}}-security
+{{src}}Components: main contrib{{#nf}} non-free non-free-firmware{{/nf}}
+{{src}}Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+{{/mirror_security}}
+{{^mirror_security}}
+Types: deb
+URIs: https://security.debian.org/debian-security
+Suites: {{release_deb822}}-security
+Components: main contrib{{#nf}} non-free non-free-firmware{{/nf}}
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+
+{{src}}Types: deb-src
+{{src}}URIs: https://security.debian.org/debian-security
+{{src}}Suites: {{release_deb822}}-security
+{{src}}Components: main contrib{{#nf}} non-free non-free-firmware{{/nf}}
+{{src}}Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+{{/mirror_security}}
+{{/sid}}
+</pre>
 <p>为了方便快速配置，此处一并附上了 debian-security 的配置，一般来说，镜像站会同时提供 debian-security，为了更准确的信息您可以前往 <a href="../debian-security/">Debian Security 帮助</a> 确认。</p>
 <p>不过，一般来说，为了更及时地获得安全更新，不推荐使用镜像站安全更新软件源，因为镜像站往往有同步延迟。参考 https://www.debian.org/security/faq.en.html#mirror</p>
 <blockquote>
@@ -75,7 +136,7 @@ <h3>Connection reset by peer</h3>
 或使用以下命令将相关设置加入 apt 系统配置中：</p>
 <div class="z-wrap"><form class="z-form" onsubmit="return false"></form><pre class="z-code"></pre></div><pre class="z-tmpl" data-lang="bash">
 echo "Acquire::http::Pipeline-Depth \"0\";" &gt; /etc/apt/apt.conf.d/99nopipelining
-</pre><script id="z-config" type="application/x-mirrorz-help">eyJfIjogIkRlYmlhbiBcdThmNmZcdTRlZjZcdTZlOTAiLCAiYmxvY2siOiBbInVzYWdlIiwgIm9tdiIsICJuZ2lueCJdLCAiaW5wdXQiOiB7InJlbGVhc2UiOiB7Il8iOiAiRGViaWFuIFx1NzI0OFx1NjcyYyIsICJvcHRpb24iOiB7ImJvb2t3b3JtIjogeyJfIjogIkRlYmlhbiAxMiAoYm9va3dvcm0pIiwgInNlY3VyaXR5IjogIi1zZWN1cml0eSIsICJub25mcmVlIjogIiBub24tZnJlZSBub24tZnJlZS1maXJtd2FyZSJ9LCAiYnVsbHNleWUiOiB7Il8iOiAiRGViaWFuIDExIChidWxsc2V5ZSkiLCAic2VjdXJpdHkiOiAiLXNlY3VyaXR5IiwgIm5vbmZyZWUiOiAiIG5vbi1mcmVlIn0sICJidXN0ZXIiOiB7Il8iOiAiRGViaWFuIDEwIChidXN0ZXIpIiwgInNlY3VyaXR5IjogIi91cGRhdGVzIiwgIm5vbmZyZWUiOiAiIG5vbi1mcmVlIn0sICJ0ZXN0aW5nIjogeyJzZWN1cml0eSI6ICItc2VjdXJpdHkiLCAibm9uZnJlZSI6ICIgbm9uLWZyZWUgbm9uLWZyZWUtZmlybXdhcmUifSwgInNpZCI6IHsic2lkIjogdHJ1ZSwgIm5vbmZyZWUiOiAiIG5vbi1mcmVlIG5vbi1mcmVlLWZpcm13YXJlIn19fSwgInNyYyI6IHsiXyI6ICJcdTU0MmZcdTc1MjhcdTZlOTBcdTc4MDFcdTZlOTAiLCAibm90ZSI6ICJcdTZlOTBcdTc4MDFcdTZlOTBcdTkwMWFcdTVlMzhcdTc1MjhcdTRlOGVcdTY3ODRcdTVlZmFcdTU0OGNcdThjMDNcdThiZDVcdWZmMGNcdTVmMDBcdTU0MmZcdTU0MGVcdTVmNzFcdTU0Y2RcdTY2ZjRcdTY1YjBcdTkwMWZcdTVlYTYiLCAidHJ1ZSI6ICIiLCAiZmFsc2UiOiAiIyAifSwgIm5mIjogeyJfIjogIlx1NGY3Zlx1NzUyOFx1OTc1ZVx1ODFlYVx1NzUzMVx1OGY2Zlx1NGVmNlx1NmU5MCIsICJkZWZhdWx0IjogdHJ1ZSwgInRydWUiOiBudWxsfSwgIm1pcnJvcl9zZWN1cml0eSI6IHsiXyI6ICJcdTVmM2FcdTUyMzZcdTViODlcdTUxNjhcdTY2ZjRcdTY1YjBcdTRmN2ZcdTc1MjhcdTk1NWNcdTUwY2YiLCAibm90ZSI6ICJcdTRlM2FcdTRlODZcdTY2ZjRcdTUzY2FcdTY1ZjZcdTU3MzBcdTgzYjdcdTVmOTdcdTViODlcdTUxNjhcdTY2ZjRcdTY1YjBcdWZmMGNcdTRlMGRcdTYzYThcdTgzNTBcdTRmN2ZcdTc1MjhcdTk1NWNcdTUwY2ZcdTdhZDlcdTViODlcdTUxNjhcdTY2ZjRcdTY1YjBcdThmNmZcdTRlZjZcdTZlOTAiLCAidHJ1ZSI6IG51bGx9fSwgIm5hbWUiOiAiZGViaWFuIn0=</script>
+</pre><script id="z-config" type="application/x-mirrorz-help">eyJfIjogIkRlYmlhbiBcdThmNmZcdTRlZjZcdTZlOTAiLCAiYmxvY2siOiBbInVzYWdlIiwgIm9tdiIsICJuZ2lueCJdLCAiaW5wdXQiOiB7InJlbGVhc2UiOiB7Il8iOiAiRGViaWFuIFx1NzI0OFx1NjcyYyIsICJvcHRpb24iOiB7ImJvb2t3b3JtIjogeyJfIjogIkRlYmlhbiAxMiAoYm9va3dvcm0pIiwgInNlY3VyaXR5IjogIi1zZWN1cml0eSIsICJub25mcmVlIjogIiBub24tZnJlZSBub24tZnJlZS1maXJtd2FyZSJ9LCAiYnVsbHNleWUiOiB7Il8iOiAiRGViaWFuIDExIChidWxsc2V5ZSkiLCAic2VjdXJpdHkiOiAiLXNlY3VyaXR5IiwgIm5vbmZyZWUiOiAiIG5vbi1mcmVlIn0sICJidXN0ZXIiOiB7Il8iOiAiRGViaWFuIDEwIChidXN0ZXIpIiwgInNlY3VyaXR5IjogIi91cGRhdGVzIiwgIm5vbmZyZWUiOiAiIG5vbi1mcmVlIn0sICJ0ZXN0aW5nIjogeyJzZWN1cml0eSI6ICItc2VjdXJpdHkiLCAibm9uZnJlZSI6ICIgbm9uLWZyZWUgbm9uLWZyZWUtZmlybXdhcmUifSwgInNpZCI6IHsic2lkIjogdHJ1ZSwgIm5vbmZyZWUiOiAiIG5vbi1mcmVlIG5vbi1mcmVlLWZpcm13YXJlIn19fSwgInJlbGVhc2VfZGViODIyIjogeyJfIjogIkRlYmlhbiBcdTcyNDhcdTY3MmMiLCAib3B0aW9ucyI6IHsiYm9va3dvcm0iOiB7Il8iOiAiRGViaWFuIDEyIChib29rd29ybSkifSwgInRlc3RpbmciOiBudWxsLCAic2lkIjogeyJzaWQiOiB0cnVlfX19LCAic3JjIjogeyJfIjogIlx1NTQyZlx1NzUyOFx1NmU5MFx1NzgwMVx1NmU5MCIsICJub3RlIjogIlx1NmU5MFx1NzgwMVx1NmU5MFx1OTAxYVx1NWUzOFx1NzUyOFx1NGU4ZVx1Njc4NFx1NWVmYVx1NTQ4Y1x1OGMwM1x1OGJkNVx1ZmYwY1x1NWYwMFx1NTQyZlx1NTQwZVx1NWY3MVx1NTRjZFx1NjZmNFx1NjViMFx1OTAxZlx1NWVhNiIsICJ0cnVlIjogIiIsICJmYWxzZSI6ICIjICJ9LCAibmYiOiB7Il8iOiAiXHU0ZjdmXHU3NTI4XHU5NzVlXHU4MWVhXHU3NTMxXHU4ZjZmXHU0ZWY2XHU2ZTkwIiwgImRlZmF1bHQiOiB0cnVlLCAidHJ1ZSI6IG51bGx9LCAibWlycm9yX3NlY3VyaXR5IjogeyJfIjogIlx1NWYzYVx1NTIzNlx1NWI4OVx1NTE2OFx1NjZmNFx1NjViMFx1NGY3Zlx1NzUyOFx1OTU1Y1x1NTBjZiIsICJub3RlIjogIlx1NGUzYVx1NGU4Nlx1NjZmNFx1NTNjYVx1NjVmNlx1NTczMFx1ODNiN1x1NWY5N1x1NWI4OVx1NTE2OFx1NjZmNFx1NjViMFx1ZmYwY1x1NGUwZFx1NjNhOFx1ODM1MFx1NGY3Zlx1NzUyOFx1OTU1Y1x1NTBjZlx1N2FkOVx1NWI4OVx1NTE2OFx1NjZmNFx1NjViMFx1OGY2Zlx1NGVmNlx1NmU5MCIsICJ0cnVlIjogbnVsbH19LCAibmFtZSI6ICJkZWJpYW4ifQ==</script>
 </div>
 
 {% endraw %}