From 1e3fc990eb417795ea177e035ef5a6bfe9bac259 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Thu, 8 Apr 2021 16:44:01 +0300 Subject: [PATCH] Pull request: all: fix specs, imp docs Merge in DNS/adguard-home from fix-specs-2 to master Squashed commit of the following: commit 687c5ead52ba4939ea89405a9a326c23e72c502b Author: Ainar Garipov Date: Thu Apr 8 16:38:34 2021 +0300 all: fix specs, imp docs --- bamboo-specs/release.yaml | 10 +++++----- internal/home/auth.go | 2 +- internal/stats/unit.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index a3c01e94..f3a87545 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -150,7 +150,7 @@ cd ./dist/ export CHANNEL="${bamboo.channel}" - ./bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL" + ../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL" 'final-tasks': - 'clean' 'requirements': @@ -179,7 +179,7 @@ SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\ SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\ SNAPCRAFT_UBUNTU_DISCHARGE="${bamboo.snapcraftUbuntuDischargePassword}"\ - ./bamboo-deploy-publisher/deploy.sh adguard-home-snap + ../bamboo-deploy-publisher/deploy.sh adguard-home-snap 'final-tasks': - 'clean' 'requirements': @@ -201,8 +201,6 @@ set -e -f -u -x - cd ./dist/ - export CHANNEL="${bamboo.channel}" if [ "$CHANNEL" != 'release' -a "${CHANNEL}" != 'beta' ] then @@ -211,9 +209,11 @@ exit 0 fi + cd ./dist/ + env\ GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\ - ./bamboo-deploy-publisher/deploy.sh adguard-home-github + ../bamboo-deploy-publisher/deploy.sh adguard-home-github 'final-tasks': - 'clean' 'requirements': diff --git a/internal/home/auth.go b/internal/home/auth.go index 9d5225ff..63a66a76 100644 --- a/internal/home/auth.go +++ b/internal/home/auth.go @@ -86,7 +86,7 @@ func InitAuth(dbFilename string, users []User, sessionTTL uint32) *Auth { if err != nil { log.Error("auth: open DB: %s: %s", dbFilename, err) if err.Error() == "invalid argument" { - log.Error("AdGuard Home cannot be initialized due to an incompatible file system.\nPlease read the explanation here: https://github.com/AdguardTeam/AdGuardHome/internal/wiki/Getting-Started#limitations") + log.Error("AdGuard Home cannot be initialized due to an incompatible file system.\nPlease read the explanation here: https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#limitations") } return nil diff --git a/internal/stats/unit.go b/internal/stats/unit.go index 96775c72..b3a42767 100644 --- a/internal/stats/unit.go +++ b/internal/stats/unit.go @@ -158,7 +158,7 @@ func (s *statsCtx) dbOpen() bool { if err != nil { log.Error("stats: open DB: %s: %s", s.conf.Filename, err) if err.Error() == "invalid argument" { - log.Error("AdGuard Home cannot be initialized due to an incompatible file system.\nPlease read the explanation here: https://github.com/AdguardTeam/AdGuardHome/internal/wiki/Getting-Started#limitations") + log.Error("AdGuard Home cannot be initialized due to an incompatible file system.\nPlease read the explanation here: https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#limitations") } return false }