From e469df1d95b3ca5eb51ae1b42ffc355632f1548c Mon Sep 17 00:00:00 2001 From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com> Date: Fri, 11 Aug 2023 08:07:04 +0000 Subject: [PATCH] update --- docs/.vitepress/config.ts | 12 +++++++++--- docs/en_US/guide/docker_custom.md | 0 docs/en_US/guide/lxd_custom.md | 0 docs/en_US/guide/lxd_install.md | 6 ++++-- docs/en_US/guide/pve_custom.md | 0 docs/en_US/guide/pve_install.md | 6 +++--- docs/guide/docker_custom.md | 0 docs/guide/lxd_custom.md | 0 docs/guide/pve_custom.md | 0 docs/guide/pve_install.md | 6 +++--- 10 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 docs/en_US/guide/docker_custom.md create mode 100644 docs/en_US/guide/lxd_custom.md create mode 100644 docs/en_US/guide/pve_custom.md create mode 100644 docs/guide/docker_custom.md create mode 100644 docs/guide/lxd_custom.md create mode 100644 docs/guide/pve_custom.md diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts index 5a3e2b867e..d08c54a002 100644 --- a/docs/.vitepress/config.ts +++ b/docs/.vitepress/config.ts @@ -21,7 +21,7 @@ export default defineConfig({ link: '/', activeMatch: '^/$|^/guide/' }, - { text: 'Linux相关', + { text: 'Linux相关项目', link: '/case/index', activeMatch: '^/case/' }, @@ -94,6 +94,7 @@ function getGuideSidebarZhCN() { { text: 'PVE主体安装', link: '/guide/pve_install.html' }, { text: 'KVM虚拟化', link: '/guide/pve_kvm.html' }, { text: 'LXC虚拟化', link: '/guide/pve_lxc.html' }, + { text: '自定义', link: '/guide/pve_custom.html' }, { text: '致谢', link: '/guide/pve_thanks.html' }, { text: '常见问题答疑', link: '/guide/pve_qa.html' } ] @@ -104,7 +105,8 @@ function getGuideSidebarZhCN() { { text: '系统和硬件配置要求', link: '/guide/lxd_precheck.html' }, { text: 'LXD主体安装', link: '/guide/lxd_install.html' }, { text: 'LXC虚拟化', link: '/guide/lxd_lxc.html' }, - { text: '其他自定义配置', link: '/guide/lxd_extra_config.html' }, + { text: '更多配置', link: '/guide/lxd_extra_config.html' }, + { text: '自定义', link: '/guide/lxd_custom.html' }, { text: '致谢', link: '/guide/lxd_thanks.html' }, { text: '常见问题答疑', link: '/guide/lxd_qa.html' } ] @@ -115,6 +117,7 @@ function getGuideSidebarZhCN() { { text: '系统和硬件配置要求', link: '/guide/docker_precheck.html' }, { text: '主体安装', link: '/guide/docker_install.html' }, { text: 'Docker虚拟化', link: '/guide/docker_build.html' }, + { text: '自定义', link: '/guide/docker_custom.html' }, { text: '致谢', link: '/guide/docker_thanks.html' }, { text: '常见问题答疑', link: '/guide/docker_qa.html' } ] @@ -169,6 +172,7 @@ function getGuideSidebarEnUS() { { text: 'PVE main installation', link: '/en_US/guide/pve_install.html' }, { text: 'KVM Virtualization', link: '/en_US/guide/pve_kvm.html' }, { text: 'LXC Virtualization', link: '/en_US/guide/pve_lxc.html' }, + { text: 'Custom', link: '/en_US/guide/pve_custom.html' }, { text: 'Acknowledgements', link: '/en_US/guide/pve_thanks.html' }, { text: 'FAQ', link: '/en_US/guide/pve_qa.html' } ] @@ -179,7 +183,8 @@ function getGuideSidebarEnUS() { { text: 'System and hardware configuration requirements', link: '/en_US/guide/lxd_precheck.html' }, { text: 'LXD main installation', link: '/en_US/guide/lxd_install.html' }, { text: 'LXC Virtualization', link: '/en_US/guide/lxd_lxc.html' }, - { text: 'Other custom configuration', link: '/en_US/guide/lxd_extra_config.html' }, + { text: 'Extra configuration', link: '/en_US/guide/lxd_extra_config.html' }, + { text: 'Custom', link: '/en_US/guide/lxd_custom.html' }, { text: 'Acknowledgements', link: '/en_US/guide/lxd_thanks.html' }, { text: 'FAQ', link: '/en_US/guide/lxd_qa.html' } ] @@ -190,6 +195,7 @@ function getGuideSidebarEnUS() { { text: 'System and hardware configuration requirements', link: '/en_US/guide/docker_precheck.html' }, { text: 'Main installation', link: '/en_US/guide/docker_install.html' }, { text: 'Docker Virtualization', link: '/en_US/guide/docker_build.html' }, + { text: 'Custom', link: '/en_US/guide/docker_custom.html' }, { text: 'Acknowledgements', link: '/en_US/guide/docker_thanks.html' }, { text: 'FAQ', link: '/en_US/guide/docker_qa.html' } ] diff --git a/docs/en_US/guide/docker_custom.md b/docs/en_US/guide/docker_custom.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docs/en_US/guide/lxd_custom.md b/docs/en_US/guide/lxd_custom.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docs/en_US/guide/lxd_install.md b/docs/en_US/guide/lxd_install.md index c889692d3c..6937c99416 100644 --- a/docs/en_US/guide/lxd_install.md +++ b/docs/en_US/guide/lxd_install.md @@ -97,7 +97,9 @@ export PATH=$PATH:/snap/bin 环境安装过程中**可能需要重启服务器以加载含zfs的内核，然后再次执行安装命令，一切以运行后命令行的提示为准** -如果第二次执行安装命令仍提示重启系统加载内核，那么意味着内核在上一次加载中失败了，最好重装宿主机系统为ubuntu系解决这个问题 +如果脚本提示重启系统后需要再次执行脚本，第二次执行安装脚本仍提示重启系统加载内核，那么意味着内核在上一次加载中失败了，最好重装宿主机系统为ubuntu系解决这个问题 + +每次执行脚本都需要输入一次初始化的配置，所以遇到脚本提示需重启系统再次执行，那么就得再次输入初始化的配置 国际 @@ -111,6 +113,6 @@ curl -L https://raw.githubusercontent.com/spiritLHLS/lxd/main/scripts/lxdinstall curl -L https://ghproxy.com/https://raw.githubusercontent.com/spiritLHLS/lxd/main/scripts/lxdinstall.sh -o lxdinstall.sh && chmod +x lxdinstall.sh && bash lxdinstall.sh ``` -例子： +初始化配置的例子： 如果系统盘除去已占用空间还有18G硬盘空余，想开2G虚拟内存(2048MB的SWAP)，15G的存储池，按照命令行的提示则依次输入```2048```和```15``` diff --git a/docs/en_US/guide/pve_custom.md b/docs/en_US/guide/pve_custom.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docs/en_US/guide/pve_install.md b/docs/en_US/guide/pve_install.md index 7fed2d91b5..911fb1c04f 100644 --- a/docs/en_US/guide/pve_install.md +++ b/docs/en_US/guide/pve_install.md @@ -18,6 +18,8 @@ outline: deep - ```/etc/cloud/cloud.cfg```文件修改(避免覆写已修改的hostname等配置) - ```/etc/network/interfaces```文件修改(修复auto、dhcp类型为static、增加vmbr0网关) - 检测是否为中国IP，如果为中国IP使用清华镜像源，否则使用官方源，同时处理apt的源和对应的nameserver，避免断网 +- 创建vmbr0(独立IP网关)，宿主机允许addr和gateway为内网IP或外网IP，已自动识别 +- vmbr0创建支持开设纯IPV4、纯IPV6、双栈虚拟机，自动识别IPV4地址和IPV6地址，自动识别对应的IP区间 - 安装PVE开虚拟机需要的必备工具包 - x86_64的替换apt源中的企业订阅为社区源，arm的使用第三方修复的补丁构建的源 - 打印查询Linux系统内核和PVE内核是否已安装 @@ -74,15 +76,13 @@ bash <(wget -qO- --no-check-certificate https://ghproxy.com/https://raw.githubus ## 自动配置宿主机的网关 :::warning -使用前请保证重启过服务器且此时PVE能正常使用WEB端再执行，重启机器后不要立即执行此命令，待WEB端启动成功后至少等5分钟再执行本命令 +使用前请保证重启过服务器且此时PVE能正常使用WEB端再执行，重启机器后不要立即执行此命令，待WEB端启动成功后至少等1分钟再执行本命令 ::: :::tip 这一步是最容易造成SSH断开的，原因是未等待PVE内核启动就修改网络会造成设置冲突，所以至少等几分钟待内核启动也就是WEB端启动成功后再执行 ::: -- 创建vmbr0(独立IP网关)，宿主机允许addr和gateway为内网IP或外网IP，已自动识别 -- vmbr0创建支持开设纯IPV4、纯IPV6、双栈虚拟机，自动识别IPV4地址和IPV6地址，自动识别对应的IP区间 - 创建vmbr1(NAT网关)，暂不支持开设带独立IPV6地址的NAT的IPV4虚拟机 - 想查看完整设置可以执行```cat /etc/network/interfaces```查看，如需修改网关需要修改该文件，web端已经无法修改 - 加载iptables并设置回源且允许NAT端口转发 diff --git a/docs/guide/docker_custom.md b/docs/guide/docker_custom.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docs/guide/lxd_custom.md b/docs/guide/lxd_custom.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docs/guide/pve_custom.md b/docs/guide/pve_custom.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docs/guide/pve_install.md b/docs/guide/pve_install.md index 7fed2d91b5..911fb1c04f 100644 --- a/docs/guide/pve_install.md +++ b/docs/guide/pve_install.md @@ -18,6 +18,8 @@ outline: deep - ```/etc/cloud/cloud.cfg```文件修改(避免覆写已修改的hostname等配置) - ```/etc/network/interfaces```文件修改(修复auto、dhcp类型为static、增加vmbr0网关) - 检测是否为中国IP，如果为中国IP使用清华镜像源，否则使用官方源，同时处理apt的源和对应的nameserver，避免断网 +- 创建vmbr0(独立IP网关)，宿主机允许addr和gateway为内网IP或外网IP，已自动识别 +- vmbr0创建支持开设纯IPV4、纯IPV6、双栈虚拟机，自动识别IPV4地址和IPV6地址，自动识别对应的IP区间 - 安装PVE开虚拟机需要的必备工具包 - x86_64的替换apt源中的企业订阅为社区源，arm的使用第三方修复的补丁构建的源 - 打印查询Linux系统内核和PVE内核是否已安装 @@ -74,15 +76,13 @@ bash <(wget -qO- --no-check-certificate https://ghproxy.com/https://raw.githubus ## 自动配置宿主机的网关 :::warning -使用前请保证重启过服务器且此时PVE能正常使用WEB端再执行，重启机器后不要立即执行此命令，待WEB端启动成功后至少等5分钟再执行本命令 +使用前请保证重启过服务器且此时PVE能正常使用WEB端再执行，重启机器后不要立即执行此命令，待WEB端启动成功后至少等1分钟再执行本命令 ::: :::tip 这一步是最容易造成SSH断开的，原因是未等待PVE内核启动就修改网络会造成设置冲突，所以至少等几分钟待内核启动也就是WEB端启动成功后再执行 ::: -- 创建vmbr0(独立IP网关)，宿主机允许addr和gateway为内网IP或外网IP，已自动识别 -- vmbr0创建支持开设纯IPV4、纯IPV6、双栈虚拟机，自动识别IPV4地址和IPV6地址，自动识别对应的IP区间 - 创建vmbr1(NAT网关)，暂不支持开设带独立IPV6地址的NAT的IPV4虚拟机 - 想查看完整设置可以执行```cat /etc/network/interfaces```查看，如需修改网关需要修改该文件，web端已经无法修改 - 加载iptables并设置回源且允许NAT端口转发