Skip to content

Commit

Permalink
fix: 解决智能镜像源配置不生效的问题 (#133)
Browse files Browse the repository at this point in the history
cdn服务器地址不正确,导致匹配不到

Log: 解决智能镜像源配置不生效的问题
pms: BUG-302185
  • Loading branch information
fly602 authored Feb 10, 2025
1 parent eeff51f commit d14fc99
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion etc/apt/apt.conf.d/99lastore.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DPkg::Post-Invoke { "/var/lib/lastore/scripts/build_system_info || true "}
Acquire::SmartMirrors::Enable true;
Acquire::SmartMirrors::Debug false;
Acquire::SmartMirrors::GuestURI "/usr/bin/lastore-smartmirror";
Acquire::SmartMirrors::MainSource "http://packages.chinauos.cn/uos";
Acquire::SmartMirrors::MainSource "https://cdn-community-packages.deepin.com/deepin";
Acquire::SmartMirrors::DomainList:: "deepin.com";
Acquire::SmartMirrors::DomainList:: "deepin.org";
Acquire::SmartMirrors::DomainList:: "uniontech.com";
Expand Down
2 changes: 1 addition & 1 deletion etc/apt/apt.conf.d/99mirrors.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Don't wirte anything except MirrorSource, otherwise the config may lost

Acquire::SmartMirrors::MirrorSource "http://cdn.packages.deepin.com/deepin";
Acquire::SmartMirrors::MirrorSource "https://cdn-community-packages.deepin.com/deepin";
10 changes: 7 additions & 3 deletions src/lastore-smartmirror-daemon/smartmirror.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,17 @@ func (s *SmartMirror) route(original, officialMirror string) string {
return original
}

if strings.HasPrefix(original, officialMirror+"/pool") {
if !strings.HasPrefix(original, officialMirror) {
return original
}

if strings.Contains(original, "/pool/") {
return s.makeChoice(original, officialMirror)
} else if strings.HasPrefix(original, officialMirror+"/dists") && strings.HasSuffix(original, "Release") {
} else if strings.Contains(original, "/dists/") && strings.HasSuffix(original, "Release") {
// Get Release from Release
url, _ := handleRequest(buildRequest(makeHeader(), "HEAD", original))
return url
} else if strings.HasPrefix(original, officialMirror+"/dists") && strings.Contains(original, "/by-hash/") {
} else if strings.Contains(original, "/dists/") && strings.Contains(original, "/by-hash/") {
return s.makeChoice(original, officialMirror)
}
return original
Expand Down
2 changes: 1 addition & 1 deletion var/lib/lastore/mirrors.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "default",
"name": "Official Mirror (CDN Acceleration)",
"url": "http://cdn.packages.deepin.com/deepin/",
"url": "https://cdn-community-packages.deepin.com/deepin",
"name_locale": {
"zh_CN": "官方CDN(加速)源",
"zh_TW": "官方CDN(加速)源"
Expand Down

0 comments on commit d14fc99

Please sign in to comment.