统一时间规划

03.PVE系统调整.md

@@ -213,7 +213,7 @@ $ crontab -e
 ```bash
 ## 定时任务配置项
 
-0 5 1,16 * * /usr/sbin/reboot
+30 2 1,16 * * /usr/sbin/reboot
 
 ```
 
@@ -223,7 +223,7 @@ $ crontab -e
 
 配置系统自动更新之前，需检查系统当前定时器状态。  
 
-后续将手动调整该定时器的时间，使其每 `5` 天凌晨 `02:00` 进行触发。  
+后续将手动调整该定时器的时间，使其每 `5` 天凌晨 `01:30` 进行触发。  
 
 ```bash
 ## 检查系统定时器
@@ -305,7 +305,7 @@ $ nano /etc/apt/apt.conf.d/50unattended-upgrades
 
 - 自动重启：开启。
 
-- 自动重启时间：`05:00` 。
+- 自动重启时间：`02:30` 。
 
 因为该配置文件很长，完整的配置文件可查看 [pve_50unattended_upgrades.conf](./src/pve_50unattended_upgrades.conf) 以便对比。  
 
@@ -334,7 +334,7 @@ Unattended-Upgrade::Remove-Unused-Dependencies "true";
 
 Unattended-Upgrade::Automatic-Reboot "true";
 
-Unattended-Upgrade::Automatic-Reboot-Time "05:00";
+Unattended-Upgrade::Automatic-Reboot-Time "02:30";
 
 ```
 
@@ -356,7 +356,7 @@ $ systemctl edit apt-daily-upgrade.timer
 
 [Timer]
 OnCalendar=
-OnCalendar=02:00
+OnCalendar=01:30
 RandomizedDelaySec=0
 
 ```
@@ -375,14 +375,13 @@ $ systemctl status apt-daily-upgrade.timer
      Loaded: loaded (/lib/systemd/system/apt-daily-upgrade.timer; enabled; preset: enabled)
     Drop-In: /etc/systemd/system/apt-daily-upgrade.timer.d
              └─override.conf
-     Active: active (waiting) since Sun 2023-06-25 14:35:06 CST; 9s ago
+     Active: active (waiting) since Wed 2023-07-26 14:38:06 CST; 11s ago
-      Until: Sun 2023-06-25 14:35:06 CST; 9s ago
+    Trigger: Thu 2023-07-27 01:30:00 CST; 10h left
-    Trigger: Mon 2023-06-26 02:00:00 CST; 11h left
    Triggers: ● apt-daily-upgrade.service
 
-Jun 25 14:35:06 node01 systemd[1]: Stopped apt-daily-upgrade.timer - Daily apt upgrade and clean activities.
+Jul 26 14:38:06 node01 systemd[1]: Stopped apt-daily-upgrade.timer - Daily apt upgrade and clean activities.
-Jun 25 14:35:06 node01 systemd[1]: Stopping apt-daily-upgrade.timer - Daily apt upgrade and clean activities...
+Jul 26 14:38:06 node01 systemd[1]: Stopping apt-daily-upgrade.timer - Daily apt upgrade and clean activities...
-Jun 25 14:35:06 node01 systemd[1]: Started apt-daily-upgrade.timer - Daily apt upgrade and clean activities.
+Jul 26 14:38:06 node01 systemd[1]: Started apt-daily-upgrade.timer - Daily apt upgrade and clean activities.
 ```
 
 ## 5.硬件直通

05.PVE制作虚拟机模板.md

@@ -354,7 +354,7 @@ Unattended-Upgrade::Remove-Unused-Dependencies "true";
 
 Unattended-Upgrade::Automatic-Reboot "true";
 
-Unattended-Upgrade::Automatic-Reboot-Time "04:30";
+Unattended-Upgrade::Automatic-Reboot-Time "03:00";
 
 ```
 
@@ -406,7 +406,7 @@ $ sudo crontab -e
 ```bash
 ## 定时任务配置项
 
-0 6 8,24 * * /usr/sbin/reboot
+30 4 8,24 * * /usr/sbin/reboot
 
 ```
 

06.PVE用模板克隆虚拟机.md

@@ -171,7 +171,7 @@ $ sudo crontab -e
 ```bash
 ## 定时任务配置项
 
-0 5 * * * /usr/bin/snap restart adguard-home
+30 4 * * * /usr/bin/snap restart adguard-home
 
 ```
 
@@ -254,13 +254,23 @@ $ sudo nvim /etc/smartdns/smartdns.conf
 
 - 检查配置文件中关于本地域名及其上游 DNS 服务器相关配置，请根据实际情况进行调整。  
 
-- 若仅需 `DoT` / `DoH` 作为上游 DNS 服务器，可移除 `server-tcp` 相关配置项。  
-
 ```bash
 # This configuration file is customized by fox,
 # Optimize SmartDNS parameters for local DNS server.
+#
+# For use common DNS server as upstream DNS server,
+# please modify 'server' parameter according to
+# your network environment.
+#
+# eg:
+#       server 119.29.29.29
+#       server 223.5.5.5
+#       server 114.114.114.114
+#       server 2402:4e00::
+#       server 2400:3200::1
 
 conf-file /etc/smartdns/anti-ad-smartdns.conf
+cache-file /tmp/smartdns.cache
 
 bind [::]:53
 bind-tcp [::]:53
@@ -275,33 +285,24 @@ speed-check-mode ping,tcp:80,tcp:443
 
 force-qtype-SOA 65
 
-log-level warn
+log-level notice
 
-server 119.29.29.29 -group dnspod
+server-tcp 119.29.29.29 -group dnspod -exclude-default-group
-server 2402:4e00:: -group dnspod
+server-tcp 2402:4e00:: -group dnspod -exclude-default-group
-server 223.5.5.5 -group alidns
-server 2400:3200::1 -group alidns
 nameserver /doh.pub/dnspod
 nameserver /dot.pub/dnspod
+
+server-tcp 223.5.5.5 -group alidns -exclude-default-group
+server-tcp 2400:3200::1 -group alidns -exclude-default-group
 nameserver /dns.alidns.com/alidns
 
-server 172.16.1.1 -group fox
+server 172.16.1.1 -group intranet -exclude-default-group
-server fdac::1 -group fox
+server fdac::1 -group intranet -exclude-default-group
-nameserver /fox.local/fox
+nameserver /fox.local/intranet
-domain-rules /fox.local/ -no-cache -speed-check-mode none
+domain-rules /fox.local/ -speed-check-mode none -no-cache
 
-server-tcp 119.29.29.29
+server-tls dot.pub
-server-tcp 223.5.5.5
+server-tls dns.alidns.com
-server-tcp 114.114.114.114
-
-server-tcp 2402:4e00::
-server-tcp 2400:3200::1
-server-tcp 2400:3200:baba::1
-
-server-tls 1.12.12.12 -spki-pin 5TIMjgyMhA0qmPdK+AM9LX6vNI/9EPBydh/ZXdfcYmI= -host-name dot.pub
-server-tls 120.53.53.53 -spki-pin 5TIMjgyMhA0qmPdK+AM9LX6vNI/9EPBydh/ZXdfcYmI= -host-name dot.pub
-server-tls 223.5.5.5 -spki-pin ZwR21gnCMTzsM6VWtnb/azufgYegWWuhE9reP5tamWU= -host-name dns.alidns.com
-server-tls 223.6.6.6 -spki-pin ZwR21gnCMTzsM6VWtnb/azufgYegWWuhE9reP5tamWU= -host-name dns.alidns.com
 
 server-https https://doh.pub/dns-query
 server-https https://dns.alidns.com/dns-query

src/debian_50unattended_upgrades.conf

@@ -173,5 +173,5 @@ Unattended-Upgrade::Remove-Unused-Dependencies "true";
 
 Unattended-Upgrade::Automatic-Reboot "true";
 
-Unattended-Upgrade::Automatic-Reboot-Time "04:30";
+Unattended-Upgrade::Automatic-Reboot-Time "03:00";
 

src/debian_smartdns.conf

@@ -1,7 +1,19 @@
 # This configuration file is customized by fox,
 # Optimize SmartDNS parameters for local DNS server.
+#
+# For use common DNS server as upstream DNS server,
+# please modify 'server' parameter according to
+# your network environment.
+#
+# eg:
+#       server 119.29.29.29
+#       server 223.5.5.5
+#       server 114.114.114.114
+#       server 2402:4e00::
+#       server 2400:3200::1
 
 conf-file /etc/smartdns/anti-ad-smartdns.conf
+cache-file /tmp/smartdns.cache
 
 bind [::]:53
 bind-tcp [::]:53
@@ -16,33 +28,24 @@ speed-check-mode ping,tcp:80,tcp:443
 
 force-qtype-SOA 65
 
-log-level warn
+log-level notice
 
-server 119.29.29.29 -group dnspod
+server-tcp 119.29.29.29 -group dnspod -exclude-default-group
-server 2402:4e00:: -group dnspod
+server-tcp 2402:4e00:: -group dnspod -exclude-default-group
-server 223.5.5.5 -group alidns
-server 2400:3200::1 -group alidns
 nameserver /doh.pub/dnspod
 nameserver /dot.pub/dnspod
+
+server-tcp 223.5.5.5 -group alidns -exclude-default-group
+server-tcp 2400:3200::1 -group alidns -exclude-default-group
 nameserver /dns.alidns.com/alidns
 
-server 172.16.1.1 -group fox
+server 172.16.1.1 -group intranet -exclude-default-group
-server fdac::1 -group fox
+server fdac::1 -group intranet -exclude-default-group
-nameserver /fox.local/fox
+nameserver /fox.local/intranet
-domain-rules /fox.local/ -no-cache -speed-check-mode none
+domain-rules /fox.local/ -speed-check-mode none -no-cache
 
-server-tcp 119.29.29.29
+server-tls dot.pub
-server-tcp 223.5.5.5
+server-tls dns.alidns.com
-server-tcp 114.114.114.114
-
-server-tcp 2402:4e00::
-server-tcp 2400:3200::1
-server-tcp 2400:3200:baba::1
-
-server-tls 1.12.12.12 -spki-pin 5TIMjgyMhA0qmPdK+AM9LX6vNI/9EPBydh/ZXdfcYmI= -host-name dot.pub
-server-tls 120.53.53.53 -spki-pin 5TIMjgyMhA0qmPdK+AM9LX6vNI/9EPBydh/ZXdfcYmI= -host-name dot.pub
-server-tls 223.5.5.5 -spki-pin ZwR21gnCMTzsM6VWtnb/azufgYegWWuhE9reP5tamWU= -host-name dns.alidns.com
-server-tls 223.6.6.6 -spki-pin ZwR21gnCMTzsM6VWtnb/azufgYegWWuhE9reP5tamWU= -host-name dns.alidns.com
 
 server-https https://doh.pub/dns-query
 server-https https://dns.alidns.com/dns-query

src/pve_50unattended_upgrades.conf

@@ -175,5 +175,5 @@ Unattended-Upgrade::Remove-Unused-Dependencies "true";
 
 Unattended-Upgrade::Automatic-Reboot "true";
 
-Unattended-Upgrade::Automatic-Reboot-Time "05:00";
+Unattended-Upgrade::Automatic-Reboot-Time "02:30";
 

src/pve_apt_daily_upgrade.conf

@@ -3,7 +3,7 @@
 
 [Timer]
 OnCalendar=
-OnCalendar=02:00
+OnCalendar=01:30
 RandomizedDelaySec=0
 
 ### Lines below this comment will be discarded