From d4770ddc7745ae763be1427a7bdb3451b5b23328 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sat, 21 Sep 2024 09:04:22 +0200 Subject: [PATCH] chore(cmd): clean up commands (#9705) Move infrastructure related commands to under `cmd/infra` and development stuff to `cmd/dev`. The default build command builds the regular user facing binaries: syncthing, stdiscosrv, and strelaysrv. --- .github/workflows/build-syncthing.yaml | 2 +- build.go | 30 ++++++++---------- cmd/{ => dev}/stcompdirs/main.go | 0 cmd/{ => dev}/stdisco/main.go | 0 cmd/{ => dev}/stevents/main.go | 0 cmd/{ => dev}/stfileinfo/main.go | 0 cmd/{ => dev}/stfinddevice/main.go | 0 cmd/{ => dev}/stfindignored/main.go | 0 cmd/{ => dev}/stgenfiles/main.go | 0 cmd/{ => dev}/stsigtool/main.go | 0 cmd/{ => dev}/stvanity/main.go | 0 cmd/{ => dev}/stwatchfile/main.go | 0 .../stcrashreceiver/_testdata/panic.log | 0 cmd/{ => infra}/stcrashreceiver/diskstore.go | 0 cmd/{ => infra}/stcrashreceiver/main.go | 0 cmd/{ => infra}/stcrashreceiver/metrics.go | 0 cmd/{ => infra}/stcrashreceiver/sentry.go | 0 .../stcrashreceiver/sentry_test.go | 0 .../stcrashreceiver/sourcecodeloader.go | 0 .../stcrashreceiver/stcrashreceiver.go | 0 cmd/{ => infra}/stcrashreceiver/util.go | 0 cmd/{ => infra}/strelaypoolsrv/LICENSE | 0 cmd/{ => infra}/strelaypoolsrv/README.md | 0 .../strelaypoolsrv/auto/.gitignore | 0 cmd/{ => infra}/strelaypoolsrv/auto/doc.go | 2 +- .../strelaypoolsrv/auto/noassets.go | 0 cmd/{ => infra}/strelaypoolsrv/gui/index.html | 0 cmd/{ => infra}/strelaypoolsrv/main.go | 2 +- cmd/{ => infra}/strelaypoolsrv/main_test.go | 0 cmd/{ => infra}/strelaypoolsrv/stats.go | 0 cmd/{ => infra}/strelaypoolsrv/stats_test.go | 0 cmd/{ => infra}/stupgrades/main.go | 0 cmd/{ => infra}/ursrv/aggregate/aggregate.go | 0 cmd/{ => infra}/ursrv/main.go | 4 +-- cmd/{ => infra}/ursrv/serve/analytics.go | 0 cmd/{ => infra}/ursrv/serve/compiler_test.go | 0 cmd/{ => infra}/ursrv/serve/formatting.go | 0 cmd/{ => infra}/ursrv/serve/metrics.go | 0 cmd/{ => infra}/ursrv/serve/serve.go | 0 .../ursrv/serve/static/assets/img/favicon.png | Bin .../bootstrap/css/bootstrap-theme.min.css | 0 .../static/bootstrap/css/bootstrap.min.css | 0 .../static/bootstrap/js/bootstrap.min.js | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | Bin .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin cmd/{ => infra}/ursrv/serve/static/index.html | 2 +- lib/upgrade/upgrade_common.go | 4 +-- 49 files changed, 21 insertions(+), 25 deletions(-) rename cmd/{ => dev}/stcompdirs/main.go (100%) rename cmd/{ => dev}/stdisco/main.go (100%) rename cmd/{ => dev}/stevents/main.go (100%) rename cmd/{ => dev}/stfileinfo/main.go (100%) rename cmd/{ => dev}/stfinddevice/main.go (100%) rename cmd/{ => dev}/stfindignored/main.go (100%) rename cmd/{ => dev}/stgenfiles/main.go (100%) rename cmd/{ => dev}/stsigtool/main.go (100%) rename cmd/{ => dev}/stvanity/main.go (100%) rename cmd/{ => dev}/stwatchfile/main.go (100%) rename cmd/{ => infra}/stcrashreceiver/_testdata/panic.log (100%) rename cmd/{ => infra}/stcrashreceiver/diskstore.go (100%) rename cmd/{ => infra}/stcrashreceiver/main.go (100%) rename cmd/{ => infra}/stcrashreceiver/metrics.go (100%) rename cmd/{ => infra}/stcrashreceiver/sentry.go (100%) rename cmd/{ => infra}/stcrashreceiver/sentry_test.go (100%) rename cmd/{ => infra}/stcrashreceiver/sourcecodeloader.go (100%) rename cmd/{ => infra}/stcrashreceiver/stcrashreceiver.go (100%) rename cmd/{ => infra}/stcrashreceiver/util.go (100%) rename cmd/{ => infra}/strelaypoolsrv/LICENSE (100%) rename cmd/{ => infra}/strelaypoolsrv/README.md (100%) rename cmd/{ => infra}/strelaypoolsrv/auto/.gitignore (100%) rename cmd/{ => infra}/strelaypoolsrv/auto/doc.go (81%) rename cmd/{ => infra}/strelaypoolsrv/auto/noassets.go (100%) rename cmd/{ => infra}/strelaypoolsrv/gui/index.html (100%) rename cmd/{ => infra}/strelaypoolsrv/main.go (99%) rename cmd/{ => infra}/strelaypoolsrv/main_test.go (100%) rename cmd/{ => infra}/strelaypoolsrv/stats.go (100%) rename cmd/{ => infra}/strelaypoolsrv/stats_test.go (100%) rename cmd/{ => infra}/stupgrades/main.go (100%) rename cmd/{ => infra}/ursrv/aggregate/aggregate.go (100%) rename cmd/{ => infra}/ursrv/main.go (85%) rename cmd/{ => infra}/ursrv/serve/analytics.go (100%) rename cmd/{ => infra}/ursrv/serve/compiler_test.go (100%) rename cmd/{ => infra}/ursrv/serve/formatting.go (100%) rename cmd/{ => infra}/ursrv/serve/metrics.go (100%) rename cmd/{ => infra}/ursrv/serve/serve.go (100%) rename cmd/{ => infra}/ursrv/serve/static/assets/img/favicon.png (100%) rename cmd/{ => infra}/ursrv/serve/static/bootstrap/css/bootstrap-theme.min.css (100%) rename cmd/{ => infra}/ursrv/serve/static/bootstrap/css/bootstrap.min.css (100%) rename cmd/{ => infra}/ursrv/serve/static/bootstrap/js/bootstrap.min.js (100%) rename cmd/{ => infra}/ursrv/serve/static/fonts/glyphicons-halflings-regular.eot (100%) rename cmd/{ => infra}/ursrv/serve/static/fonts/glyphicons-halflings-regular.svg (100%) rename cmd/{ => infra}/ursrv/serve/static/fonts/glyphicons-halflings-regular.ttf (100%) rename cmd/{ => infra}/ursrv/serve/static/fonts/glyphicons-halflings-regular.woff (100%) rename cmd/{ => infra}/ursrv/serve/static/index.html (99%) diff --git a/.github/workflows/build-syncthing.yaml b/.github/workflows/build-syncthing.yaml index 54d65a08a..22811ca74 100644 --- a/.github/workflows/build-syncthing.yaml +++ b/.github/workflows/build-syncthing.yaml @@ -516,7 +516,7 @@ jobs: - name: Install signing tool run: | - go install ./cmd/stsigtool + go install ./cmd/dev/stsigtool - name: Sign archives run: | diff --git a/build.go b/build.go index d3d0b9ddd..ea53ad799 100644 --- a/build.go +++ b/build.go @@ -193,37 +193,37 @@ var targets = map[string]target{ debname: "syncthing-relaypoolsrv", debdeps: []string{"libc6"}, description: "Syncthing Relay Pool Server", - buildPkgs: []string{"github.com/syncthing/syncthing/cmd/strelaypoolsrv"}, + buildPkgs: []string{"github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv"}, binaryName: "strelaypoolsrv", // .exe will be added automatically for Windows builds archiveFiles: []archiveFile{ {src: "{{binary}}", dst: "{{binary}}", perm: 0755}, - {src: "cmd/strelaypoolsrv/README.md", dst: "README.txt", perm: 0644}, - {src: "cmd/strelaypoolsrv/LICENSE", dst: "LICENSE.txt", perm: 0644}, + {src: "cmd/infra/strelaypoolsrv/README.md", dst: "README.txt", perm: 0644}, + {src: "cmd/infra/strelaypoolsrv/LICENSE", dst: "LICENSE.txt", perm: 0644}, {src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644}, }, installationFiles: []archiveFile{ {src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755}, - {src: "cmd/strelaypoolsrv/README.md", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/README.txt", perm: 0644}, - {src: "cmd/strelaypoolsrv/LICENSE", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/LICENSE.txt", perm: 0644}, + {src: "cmd/infra/strelaypoolsrv/README.md", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/README.txt", perm: 0644}, + {src: "cmd/infra/strelaypoolsrv/LICENSE", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/LICENSE.txt", perm: 0644}, {src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644}, }, }, "stupgrades": { name: "stupgrades", description: "Syncthing Upgrade Check Server", - buildPkgs: []string{"github.com/syncthing/syncthing/cmd/stupgrades"}, + buildPkgs: []string{"github.com/syncthing/syncthing/cmd/infra/stupgrades"}, binaryName: "stupgrades", }, "stcrashreceiver": { name: "stcrashreceiver", description: "Syncthing Crash Server", - buildPkgs: []string{"github.com/syncthing/syncthing/cmd/stcrashreceiver"}, + buildPkgs: []string{"github.com/syncthing/syncthing/cmd/infra/stcrashreceiver"}, binaryName: "stcrashreceiver", }, "ursrv": { name: "ursrv", description: "Syncthing Usage Reporting Server", - buildPkgs: []string{"github.com/syncthing/syncthing/cmd/ursrv"}, + buildPkgs: []string{"github.com/syncthing/syncthing/cmd/infra/ursrv"}, binaryName: "ursrv", }, } @@ -232,15 +232,11 @@ func initTargets() { all := targets["all"] pkgs, _ := filepath.Glob("cmd/*") for _, pkg := range pkgs { - pkg = filepath.Base(pkg) - if strings.HasPrefix(pkg, ".") { - // ignore dotfiles + if files, err := filepath.Glob(pkg + "/*.go"); err != nil || len(files) == 0 { + // No go files in the directory continue } - if noupgrade && pkg == "stupgrades" { - continue - } - all.buildPkgs = append(all.buildPkgs, fmt.Sprintf("github.com/syncthing/syncthing/cmd/%s", pkg)) + all.buildPkgs = append(all.buildPkgs, fmt.Sprintf("github.com/syncthing/syncthing/%s", pkg)) } targets["all"] = all @@ -838,12 +834,12 @@ func listFiles(dir string) []string { func rebuildAssets() { os.Setenv("SOURCE_DATE_EPOCH", fmt.Sprint(buildStamp())) - runPrint(goCmd, "generate", "github.com/syncthing/syncthing/lib/api/auto", "github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto") + runPrint(goCmd, "generate", "github.com/syncthing/syncthing/lib/api/auto", "github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto") } func lazyRebuildAssets() { shouldRebuild := shouldRebuildAssets("lib/api/auto/gui.files.go", "gui") || - shouldRebuildAssets("cmd/strelaypoolsrv/auto/gui.files.go", "cmd/strelaypoolsrv/gui") + shouldRebuildAssets("cmd/infra/strelaypoolsrv/auto/gui.files.go", "cmd/infra/strelaypoolsrv/gui") if withNextGenGUI { shouldRebuild = buildNextGenGUI() || shouldRebuild diff --git a/cmd/stcompdirs/main.go b/cmd/dev/stcompdirs/main.go similarity index 100% rename from cmd/stcompdirs/main.go rename to cmd/dev/stcompdirs/main.go diff --git a/cmd/stdisco/main.go b/cmd/dev/stdisco/main.go similarity index 100% rename from cmd/stdisco/main.go rename to cmd/dev/stdisco/main.go diff --git a/cmd/stevents/main.go b/cmd/dev/stevents/main.go similarity index 100% rename from cmd/stevents/main.go rename to cmd/dev/stevents/main.go diff --git a/cmd/stfileinfo/main.go b/cmd/dev/stfileinfo/main.go similarity index 100% rename from cmd/stfileinfo/main.go rename to cmd/dev/stfileinfo/main.go diff --git a/cmd/stfinddevice/main.go b/cmd/dev/stfinddevice/main.go similarity index 100% rename from cmd/stfinddevice/main.go rename to cmd/dev/stfinddevice/main.go diff --git a/cmd/stfindignored/main.go b/cmd/dev/stfindignored/main.go similarity index 100% rename from cmd/stfindignored/main.go rename to cmd/dev/stfindignored/main.go diff --git a/cmd/stgenfiles/main.go b/cmd/dev/stgenfiles/main.go similarity index 100% rename from cmd/stgenfiles/main.go rename to cmd/dev/stgenfiles/main.go diff --git a/cmd/stsigtool/main.go b/cmd/dev/stsigtool/main.go similarity index 100% rename from cmd/stsigtool/main.go rename to cmd/dev/stsigtool/main.go diff --git a/cmd/stvanity/main.go b/cmd/dev/stvanity/main.go similarity index 100% rename from cmd/stvanity/main.go rename to cmd/dev/stvanity/main.go diff --git a/cmd/stwatchfile/main.go b/cmd/dev/stwatchfile/main.go similarity index 100% rename from cmd/stwatchfile/main.go rename to cmd/dev/stwatchfile/main.go diff --git a/cmd/stcrashreceiver/_testdata/panic.log b/cmd/infra/stcrashreceiver/_testdata/panic.log similarity index 100% rename from cmd/stcrashreceiver/_testdata/panic.log rename to cmd/infra/stcrashreceiver/_testdata/panic.log diff --git a/cmd/stcrashreceiver/diskstore.go b/cmd/infra/stcrashreceiver/diskstore.go similarity index 100% rename from cmd/stcrashreceiver/diskstore.go rename to cmd/infra/stcrashreceiver/diskstore.go diff --git a/cmd/stcrashreceiver/main.go b/cmd/infra/stcrashreceiver/main.go similarity index 100% rename from cmd/stcrashreceiver/main.go rename to cmd/infra/stcrashreceiver/main.go diff --git a/cmd/stcrashreceiver/metrics.go b/cmd/infra/stcrashreceiver/metrics.go similarity index 100% rename from cmd/stcrashreceiver/metrics.go rename to cmd/infra/stcrashreceiver/metrics.go diff --git a/cmd/stcrashreceiver/sentry.go b/cmd/infra/stcrashreceiver/sentry.go similarity index 100% rename from cmd/stcrashreceiver/sentry.go rename to cmd/infra/stcrashreceiver/sentry.go diff --git a/cmd/stcrashreceiver/sentry_test.go b/cmd/infra/stcrashreceiver/sentry_test.go similarity index 100% rename from cmd/stcrashreceiver/sentry_test.go rename to cmd/infra/stcrashreceiver/sentry_test.go diff --git a/cmd/stcrashreceiver/sourcecodeloader.go b/cmd/infra/stcrashreceiver/sourcecodeloader.go similarity index 100% rename from cmd/stcrashreceiver/sourcecodeloader.go rename to cmd/infra/stcrashreceiver/sourcecodeloader.go diff --git a/cmd/stcrashreceiver/stcrashreceiver.go b/cmd/infra/stcrashreceiver/stcrashreceiver.go similarity index 100% rename from cmd/stcrashreceiver/stcrashreceiver.go rename to cmd/infra/stcrashreceiver/stcrashreceiver.go diff --git a/cmd/stcrashreceiver/util.go b/cmd/infra/stcrashreceiver/util.go similarity index 100% rename from cmd/stcrashreceiver/util.go rename to cmd/infra/stcrashreceiver/util.go diff --git a/cmd/strelaypoolsrv/LICENSE b/cmd/infra/strelaypoolsrv/LICENSE similarity index 100% rename from cmd/strelaypoolsrv/LICENSE rename to cmd/infra/strelaypoolsrv/LICENSE diff --git a/cmd/strelaypoolsrv/README.md b/cmd/infra/strelaypoolsrv/README.md similarity index 100% rename from cmd/strelaypoolsrv/README.md rename to cmd/infra/strelaypoolsrv/README.md diff --git a/cmd/strelaypoolsrv/auto/.gitignore b/cmd/infra/strelaypoolsrv/auto/.gitignore similarity index 100% rename from cmd/strelaypoolsrv/auto/.gitignore rename to cmd/infra/strelaypoolsrv/auto/.gitignore diff --git a/cmd/strelaypoolsrv/auto/doc.go b/cmd/infra/strelaypoolsrv/auto/doc.go similarity index 81% rename from cmd/strelaypoolsrv/auto/doc.go rename to cmd/infra/strelaypoolsrv/auto/doc.go index 779d211d3..9afb54149 100644 --- a/cmd/strelaypoolsrv/auto/doc.go +++ b/cmd/infra/strelaypoolsrv/auto/doc.go @@ -4,7 +4,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -//go:generate go run ../../../script/genassets.go -o gui.files.go ../gui +//go:generate go run ../../../../script/genassets.go -o gui.files.go ../gui // Package auto contains auto generated files for web assets. package auto diff --git a/cmd/strelaypoolsrv/auto/noassets.go b/cmd/infra/strelaypoolsrv/auto/noassets.go similarity index 100% rename from cmd/strelaypoolsrv/auto/noassets.go rename to cmd/infra/strelaypoolsrv/auto/noassets.go diff --git a/cmd/strelaypoolsrv/gui/index.html b/cmd/infra/strelaypoolsrv/gui/index.html similarity index 100% rename from cmd/strelaypoolsrv/gui/index.html rename to cmd/infra/strelaypoolsrv/gui/index.html diff --git a/cmd/strelaypoolsrv/main.go b/cmd/infra/strelaypoolsrv/main.go similarity index 99% rename from cmd/strelaypoolsrv/main.go rename to cmd/infra/strelaypoolsrv/main.go index a4c5ff21f..e007b286b 100644 --- a/cmd/strelaypoolsrv/main.go +++ b/cmd/infra/strelaypoolsrv/main.go @@ -23,7 +23,7 @@ import ( lru "github.com/hashicorp/golang-lru/v2" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto" + "github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto" "github.com/syncthing/syncthing/lib/assets" _ "github.com/syncthing/syncthing/lib/automaxprocs" "github.com/syncthing/syncthing/lib/geoip" diff --git a/cmd/strelaypoolsrv/main_test.go b/cmd/infra/strelaypoolsrv/main_test.go similarity index 100% rename from cmd/strelaypoolsrv/main_test.go rename to cmd/infra/strelaypoolsrv/main_test.go diff --git a/cmd/strelaypoolsrv/stats.go b/cmd/infra/strelaypoolsrv/stats.go similarity index 100% rename from cmd/strelaypoolsrv/stats.go rename to cmd/infra/strelaypoolsrv/stats.go diff --git a/cmd/strelaypoolsrv/stats_test.go b/cmd/infra/strelaypoolsrv/stats_test.go similarity index 100% rename from cmd/strelaypoolsrv/stats_test.go rename to cmd/infra/strelaypoolsrv/stats_test.go diff --git a/cmd/stupgrades/main.go b/cmd/infra/stupgrades/main.go similarity index 100% rename from cmd/stupgrades/main.go rename to cmd/infra/stupgrades/main.go diff --git a/cmd/ursrv/aggregate/aggregate.go b/cmd/infra/ursrv/aggregate/aggregate.go similarity index 100% rename from cmd/ursrv/aggregate/aggregate.go rename to cmd/infra/ursrv/aggregate/aggregate.go diff --git a/cmd/ursrv/main.go b/cmd/infra/ursrv/main.go similarity index 85% rename from cmd/ursrv/main.go rename to cmd/infra/ursrv/main.go index aefe19560..78c4e23a7 100644 --- a/cmd/ursrv/main.go +++ b/cmd/infra/ursrv/main.go @@ -11,8 +11,8 @@ import ( "os" "github.com/alecthomas/kong" - "github.com/syncthing/syncthing/cmd/ursrv/aggregate" - "github.com/syncthing/syncthing/cmd/ursrv/serve" + "github.com/syncthing/syncthing/cmd/infra/ursrv/aggregate" + "github.com/syncthing/syncthing/cmd/infra/ursrv/serve" _ "github.com/syncthing/syncthing/lib/automaxprocs" ) diff --git a/cmd/ursrv/serve/analytics.go b/cmd/infra/ursrv/serve/analytics.go similarity index 100% rename from cmd/ursrv/serve/analytics.go rename to cmd/infra/ursrv/serve/analytics.go diff --git a/cmd/ursrv/serve/compiler_test.go b/cmd/infra/ursrv/serve/compiler_test.go similarity index 100% rename from cmd/ursrv/serve/compiler_test.go rename to cmd/infra/ursrv/serve/compiler_test.go diff --git a/cmd/ursrv/serve/formatting.go b/cmd/infra/ursrv/serve/formatting.go similarity index 100% rename from cmd/ursrv/serve/formatting.go rename to cmd/infra/ursrv/serve/formatting.go diff --git a/cmd/ursrv/serve/metrics.go b/cmd/infra/ursrv/serve/metrics.go similarity index 100% rename from cmd/ursrv/serve/metrics.go rename to cmd/infra/ursrv/serve/metrics.go diff --git a/cmd/ursrv/serve/serve.go b/cmd/infra/ursrv/serve/serve.go similarity index 100% rename from cmd/ursrv/serve/serve.go rename to cmd/infra/ursrv/serve/serve.go diff --git a/cmd/ursrv/serve/static/assets/img/favicon.png b/cmd/infra/ursrv/serve/static/assets/img/favicon.png similarity index 100% rename from cmd/ursrv/serve/static/assets/img/favicon.png rename to cmd/infra/ursrv/serve/static/assets/img/favicon.png diff --git a/cmd/ursrv/serve/static/bootstrap/css/bootstrap-theme.min.css b/cmd/infra/ursrv/serve/static/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from cmd/ursrv/serve/static/bootstrap/css/bootstrap-theme.min.css rename to cmd/infra/ursrv/serve/static/bootstrap/css/bootstrap-theme.min.css diff --git a/cmd/ursrv/serve/static/bootstrap/css/bootstrap.min.css b/cmd/infra/ursrv/serve/static/bootstrap/css/bootstrap.min.css similarity index 100% rename from cmd/ursrv/serve/static/bootstrap/css/bootstrap.min.css rename to cmd/infra/ursrv/serve/static/bootstrap/css/bootstrap.min.css diff --git a/cmd/ursrv/serve/static/bootstrap/js/bootstrap.min.js b/cmd/infra/ursrv/serve/static/bootstrap/js/bootstrap.min.js similarity index 100% rename from cmd/ursrv/serve/static/bootstrap/js/bootstrap.min.js rename to cmd/infra/ursrv/serve/static/bootstrap/js/bootstrap.min.js diff --git a/cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.eot b/cmd/infra/ursrv/serve/static/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.eot rename to cmd/infra/ursrv/serve/static/fonts/glyphicons-halflings-regular.eot diff --git a/cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.svg b/cmd/infra/ursrv/serve/static/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.svg rename to cmd/infra/ursrv/serve/static/fonts/glyphicons-halflings-regular.svg diff --git a/cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.ttf b/cmd/infra/ursrv/serve/static/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.ttf rename to cmd/infra/ursrv/serve/static/fonts/glyphicons-halflings-regular.ttf diff --git a/cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.woff b/cmd/infra/ursrv/serve/static/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.woff rename to cmd/infra/ursrv/serve/static/fonts/glyphicons-halflings-regular.woff diff --git a/cmd/ursrv/serve/static/index.html b/cmd/infra/ursrv/serve/static/index.html similarity index 99% rename from cmd/ursrv/serve/static/index.html rename to cmd/infra/ursrv/serve/static/index.html index 901989e23..3d9f3b1c7 100644 --- a/cmd/ursrv/serve/static/index.html +++ b/cmd/infra/ursrv/serve/static/index.html @@ -611,7 +611,7 @@ found in the LICENSE file.

- Source code. + Source code. This product includes GeoLite2 data created by MaxMind, available from http://www.maxmind.com.

diff --git a/lib/upgrade/upgrade_common.go b/lib/upgrade/upgrade_common.go index f7589213b..053e8fb6a 100644 --- a/lib/upgrade/upgrade_common.go +++ b/lib/upgrade/upgrade_common.go @@ -25,7 +25,7 @@ type Release struct { Assets []Asset `json:"assets"` // The HTML URL is needed for human readable links in the output created - // by cmd/stupgrades. + // by cmd/infra/stupgrades. HTMLURL string `json:"html_url"` } @@ -34,7 +34,7 @@ type Asset struct { Name string `json:"name"` // The browser URL is needed for human readable links in the output created - // by cmd/stupgrades. + // by cmd/infra/stupgrades. BrowserURL string `json:"browser_download_url,omitempty"` }