Auto deploy from GitHub Actions build 382

iBug: [b6561f1] Update influxdata and proxmox

influxdata.html

@@ -2610,20 +2610,20 @@ <h2 id="_2">说明<a class="headerlink" href="#_2" title="Permanent link">&para;
 <p>此镜像包含 InfluxData 的时序数据平台的开源产品，诸如 InfluxDB、Telegraf 等。</p>
 <h2 id="_3">使用说明<a class="headerlink" href="#_3" title="Permanent link">&para;</a></h2>
 <p>对于 Debian/Ubuntu 用户，使用以下命令导入 InfluxData 的 GPG 密钥，并更新配置：</p>
-<div class="highlight"><pre><span></span><code>wget -q https://repos.influxdata.com/influxdata-archive_compat.key
-echo &#39;393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c influxdata-archive_compat.key&#39; | sha256sum -c &amp;&amp; cat influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/keyrings/influxdata-archive_compat.gpg &gt; /dev/null
-echo &#39;deb [signed-by=/etc/apt/keyrings/influxdata-archive_compat.gpg] https://mirrors.ustc.edu.cn/influxdata/debian stable main&#39; | sudo tee /etc/apt/sources.list.d/influxdata.list
+<div class="highlight"><pre><span></span><code><a id="__codelineno-0-1" name="__codelineno-0-1" href="#__codelineno-0-1"></a>wget<span class="w"> </span>-q<span class="w"> </span>https://repos.influxdata.com/influxdata-archive_compat.key
+<a id="__codelineno-0-2" name="__codelineno-0-2" href="#__codelineno-0-2"></a><span class="nb">echo</span><span class="w"> </span><span class="s1">&#39;393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c influxdata-archive_compat.key&#39;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sha256sum<span class="w"> </span>-c<span class="w"> </span><span class="o">&amp;&amp;</span><span class="w"> </span>cat<span class="w"> </span>influxdata-archive_compat.key<span class="w"> </span><span class="p">|</span><span class="w"> </span>gpg<span class="w"> </span>--dearmor<span class="w"> </span><span class="p">|</span><span class="w"> </span>sudo<span class="w"> </span>tee<span class="w"> </span>/etc/apt/keyrings/influxdata-archive_compat.gpg<span class="w"> </span>&gt;<span class="w"> </span>/dev/null
+<a id="__codelineno-0-3" name="__codelineno-0-3" href="#__codelineno-0-3"></a><span class="nb">echo</span><span class="w"> </span><span class="s1">&#39;deb [signed-by=/etc/apt/keyrings/influxdata-archive_compat.gpg] https://mirrors.ustc.edu.cn/influxdata/debian stable main&#39;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sudo<span class="w"> </span>tee<span class="w"> </span>/etc/apt/sources.list.d/influxdata.list
 </code></pre></div>
-<p><code>apt update</code> 之后即可安装 <code>influxdb2</code> 与 <code>telegraf</code> 等软件包。</p>
+<p>在运行 <code>apt update</code> 之后即可安装 <code>influxdb</code> 与 <code>telegraf</code> 等软件包。</p>
 <p>对于 CentOS/RHEL 用户，使用以下命令导入 InfluxData 的 GPG 密钥，并更新配置：</p>
-<div class="highlight"><pre><span></span><code>cat &lt;&lt;EOF | sudo tee /etc/yum.repos.d/influxdata.repo
-[influxdata]
-name = InfluxData Repository - Stable
-baseurl = https://mirrors.ustc.edu.cn/influxdata/stable/\$basearch/main
-enabled = 1
-gpgcheck = 1
-gpgkey = https://repos.influxdata.com/influxdata-archive_compat.key
-EOF
+<div class="highlight"><pre><span></span><code><a id="__codelineno-1-1" name="__codelineno-1-1" href="#__codelineno-1-1"></a>cat<span class="w"> </span><span class="s">&lt;&lt;EOF | sudo tee /etc/yum.repos.d/influxdata.repo</span>
+<a id="__codelineno-1-2" name="__codelineno-1-2" href="#__codelineno-1-2"></a><span class="s">[influxdata]</span>
+<a id="__codelineno-1-3" name="__codelineno-1-3" href="#__codelineno-1-3"></a><span class="s">name = InfluxData Repository - Stable</span>
+<a id="__codelineno-1-4" name="__codelineno-1-4" href="#__codelineno-1-4"></a><span class="s">baseurl = https://mirrors.ustc.edu.cn/influxdata/stable/\$basearch/main</span>
+<a id="__codelineno-1-5" name="__codelineno-1-5" href="#__codelineno-1-5"></a><span class="s">enabled = 1</span>
+<a id="__codelineno-1-6" name="__codelineno-1-6" href="#__codelineno-1-6"></a><span class="s">gpgcheck = 1</span>
+<a id="__codelineno-1-7" name="__codelineno-1-7" href="#__codelineno-1-7"></a><span class="s">gpgkey = https://repos.influxdata.com/influxdata-archive_compat.key</span>
+<a id="__codelineno-1-8" name="__codelineno-1-8" href="#__codelineno-1-8"></a><span class="s">EOF</span>
 </code></pre></div>
 <p><code>dnf update</code> 之后即可安装 <code>influxdb2</code> 与 <code>telegraf</code> 等软件包。</p>
 <p>如果有其他配置需求，可参考「相关链接」中「官方下载指南」的说明，配置 GPG 密钥后，在配置项更新时将 <code>repos.influxdata.com</code> 替换为 <code>mirrors.ustc.edu.cn/influxdata</code> 即可。</p>

proxmox.html

@@ -2690,30 +2690,38 @@ <h3 id="debianproxmox">Debian，Proxmox<a class="headerlink" href="#debianproxmo
 sed -i &#39;s|^deb http://security.debian.org|deb https://mirrors.ustc.edu.cn/debian-security|g&#39; /etc/apt/sources.list
 </code></pre></div>
 <p>修改 Proxmox 的源文件，可以使用如下命令：</p>
-<div class="highlight"><pre><span></span><code>source /etc/os-release
-echo &quot;deb https://mirrors.ustc.edu.cn/proxmox/debian/pve $VERSION_CODENAME pve-no-subscription&quot; &gt; /etc/apt/sources.list.d/pve-no-subscription.list
+<div class="tabbed-set tabbed-alternate" data-tabs="1:3"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><input id="__tabbed_1_2" name="__tabbed_1" type="radio" /><input id="__tabbed_1_3" name="__tabbed_1" type="radio" /><div class="tabbed-labels"><label for="__tabbed_1_1">Proxmox VE 8</label><label for="__tabbed_1_2">Proxmox VE 7</label><label for="__tabbed_1_3">Proxmox VE 6</label></div>
+<div class="tabbed-content">
+<div class="tabbed-block">
+<div class="highlight"><pre><span></span><code><a id="__codelineno-0-1" name="__codelineno-0-1" href="#__codelineno-0-1"></a><span class="nb">echo</span><span class="w"> </span><span class="s2">&quot;deb https://mirrors.ustc.edu.cn/proxmox/debian/pve bookworm pve-no-subscription&quot;</span><span class="w"> </span>&gt;<span class="w"> </span>/etc/apt/sources.list.d/pve-no-subscription.list
 </code></pre></div>
+</div>
+<div class="tabbed-block">
+<div class="highlight"><pre><span></span><code><a id="__codelineno-1-1" name="__codelineno-1-1" href="#__codelineno-1-1"></a><span class="nb">echo</span><span class="w"> </span><span class="s2">&quot;deb https://mirrors.ustc.edu.cn/proxmox/debian/pve bullseye pve-no-subscription&quot;</span><span class="w"> </span>&gt;<span class="w"> </span>/etc/apt/sources.list.d/pve-no-subscription.list
+</code></pre></div>
+</div>
+<div class="tabbed-block">
+<div class="highlight"><pre><span></span><code><a id="__codelineno-2-1" name="__codelineno-2-1" href="#__codelineno-2-1"></a><span class="nb">echo</span><span class="w"> </span><span class="s2">&quot;deb https://mirrors.ustc.edu.cn/proxmox/debian/pve buster pve-no-subscription&quot;</span><span class="w"> </span>&gt;<span class="w"> </span>/etc/apt/sources.list.d/pve-no-subscription.list
+</code></pre></div>
+</div>
+</div>
+</div>
 <p>对于 Proxmox Backup Server 和 Proxmox Mail Gateway，请将以上命令中的 <code>pve</code> 分别替换为 <code>pbs</code> 和 <code>pmg</code>。</p>
 <p>PVE 8 之后默认安装 Ceph 仓库源文件 <code>/etc/apt/sources.list.d/ceph.list</code>，可以使用如下命令更换源：</p>
-<div class="highlight"><pre><span></span><code><a id="__codelineno-0-1" name="__codelineno-0-1" href="#__codelineno-0-1"></a><span class="k">if</span><span class="w"> </span><span class="o">[</span><span class="w"> </span>-f<span class="w"> </span>/etc/apt/sources.list.d/ceph.list<span class="w"> </span><span class="o">]</span><span class="p">;</span><span class="w"> </span><span class="k">then</span>
-<a id="__codelineno-0-2" name="__codelineno-0-2" href="#__codelineno-0-2"></a><span class="w">  </span><span class="nv">CEPH_CODENAME</span><span class="o">=</span><span class="sb">`</span>ceph<span class="w"> </span>-v<span class="w"> </span><span class="p">|</span><span class="w"> </span>grep<span class="w"> </span>ceph<span class="w"> </span><span class="p">|</span><span class="w"> </span>awk<span class="w"> </span><span class="s1">&#39;{print $(NF-1)}&#39;</span><span class="sb">`</span>
-<a id="__codelineno-0-3" name="__codelineno-0-3" href="#__codelineno-0-3"></a><span class="w">  </span><span class="nb">source</span><span class="w"> </span>/etc/os-release
-<a id="__codelineno-0-4" name="__codelineno-0-4" href="#__codelineno-0-4"></a><span class="w">  </span><span class="nb">echo</span><span class="w"> </span><span class="s2">&quot;deb https://mirrors.ustc.edu.cn/proxmox/debian/ceph-</span><span class="nv">$CEPH_CODENAME</span><span class="s2"> </span><span class="nv">$VERSION_CODENAME</span><span class="s2"> no-subscription&quot;</span><span class="w"> </span>&gt;<span class="w"> </span>/etc/apt/sources.list.d/ceph.list
-<a id="__codelineno-0-5" name="__codelineno-0-5" href="#__codelineno-0-5"></a><span class="k">fi</span>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-3-1" name="__codelineno-3-1" href="#__codelineno-3-1"></a><span class="k">if</span><span class="w"> </span><span class="o">[</span><span class="w"> </span>-f<span class="w"> </span>/etc/apt/sources.list.d/ceph.list<span class="w"> </span><span class="o">]</span><span class="p">;</span><span class="w"> </span><span class="k">then</span>
+<a id="__codelineno-3-2" name="__codelineno-3-2" href="#__codelineno-3-2"></a><span class="w">  </span><span class="nv">CEPH_CODENAME</span><span class="o">=</span><span class="sb">`</span>ceph<span class="w"> </span>-v<span class="w"> </span><span class="p">|</span><span class="w"> </span>grep<span class="w"> </span>ceph<span class="w"> </span><span class="p">|</span><span class="w"> </span>awk<span class="w"> </span><span class="s1">&#39;{print $(NF-1)}&#39;</span><span class="sb">`</span>
+<a id="__codelineno-3-3" name="__codelineno-3-3" href="#__codelineno-3-3"></a><span class="w">  </span><span class="nb">source</span><span class="w"> </span>/etc/os-release
+<a id="__codelineno-3-4" name="__codelineno-3-4" href="#__codelineno-3-4"></a><span class="w">  </span><span class="nb">echo</span><span class="w"> </span><span class="s2">&quot;deb https://mirrors.ustc.edu.cn/proxmox/debian/ceph-</span><span class="nv">$CEPH_CODENAME</span><span class="s2"> </span><span class="nv">$VERSION_CODENAME</span><span class="s2"> no-subscription&quot;</span><span class="w"> </span>&gt;<span class="w"> </span>/etc/apt/sources.list.d/ceph.list
+<a id="__codelineno-3-5" name="__codelineno-3-5" href="#__codelineno-3-5"></a><span class="k">fi</span>
 </code></pre></div>
 <p>更改完 <code>sources.list</code> 文件后请运行 <code>apt update</code> 更新索引以生效。</p>
 <h3 id="ct-templates">CT Templates<a class="headerlink" href="#ct-templates" title="Permanent link">&para;</a></h3>
-<p>另外，如果你需要使用 Proxmox 网页端下载 CT Templates，可以替换 CT
-Templates 的源为 <code>http://mirrors.ustc.edu.cn</code>。</p>
-<p>具体方法：将 <code>/usr/share/perl5/PVE/APLInfo.pm</code>
- 文件中默认的源地址 <code>http://download.proxmox.com</code> 替换为
-<code>https://mirrors.ustc.edu.cn/proxmox</code> 即可。</p>
+<p>另外，如果你需要使用 Proxmox 网页端或 <code>pveam</code> 命令下载 CT Templates，可以替换 CT Templates 的源为 <code>http://mirrors.ustc.edu.cn</code>。</p>
+<p>具体方法：将 <code>/usr/share/perl5/PVE/APLInfo.pm</code> 文件中默认的源地址 <code>http://download.proxmox.com</code> 替换为 <code>https://mirrors.ustc.edu.cn/proxmox</code> 即可。</p>
 <p>可以使用如下命令：</p>
-<div class="highlight"><pre><span></span><code>cp /usr/share/perl5/PVE/APLInfo.pm /usr/share/perl5/PVE/APLInfo.pm_back
-sed -i &#39;s|http://download.proxmox.com|https://mirrors.ustc.edu.cn/proxmox|g&#39; /usr/share/perl5/PVE/APLInfo.pm
+<div class="highlight"><pre><span></span><code>sed -i.bak &#39;s|http://download.proxmox.com|https://mirrors.ustc.edu.cn/proxmox|g&#39; /usr/share/perl5/PVE/APLInfo.pm
 </code></pre></div>
-<p>针对 <code>/usr/share/perl5/PVE/APLInfo.pm</code>
-文件的修改，执行 <code>systemctl restart pvedaemon</code> 后生效。</p>
+<p>针对 <code>/usr/share/perl5/PVE/APLInfo.pm</code> 文件的修改，执行 <code>systemctl restart pvedaemon</code> 后生效。</p>