mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 16:38:34 2021 +0300

    all: fix specs, imp docs
This commit is contained in:
Ainar Garipov 2021-04-08 16:44:01 +03:00
parent c5f4d0ce44
commit 1e3fc990eb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bamboo-specs/release.yaml
View File

@ -150,7 +150,7 @@
cd ./dist/ cd ./dist/
export CHANNEL="${bamboo.channel}" export CHANNEL="${bamboo.channel}"
./bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL" ../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks': 'final-tasks':
- 'clean' - 'clean'
'requirements': 'requirements':
@ -179,7 +179,7 @@
SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\ SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\
SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\ SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\
SNAPCRAFT_UBUNTU_DISCHARGE="${bamboo.snapcraftUbuntuDischargePassword}"\ SNAPCRAFT_UBUNTU_DISCHARGE="${bamboo.snapcraftUbuntuDischargePassword}"\
./bamboo-deploy-publisher/deploy.sh adguard-home-snap ../bamboo-deploy-publisher/deploy.sh adguard-home-snap
'final-tasks': 'final-tasks':
- 'clean' - 'clean'
'requirements': 'requirements':
@ -201,8 +201,6 @@
set -e -f -u -x set -e -f -u -x
cd ./dist/
export CHANNEL="${bamboo.channel}" export CHANNEL="${bamboo.channel}"
if [ "$CHANNEL" != 'release' -a "${CHANNEL}" != 'beta' ] if [ "$CHANNEL" != 'release' -a "${CHANNEL}" != 'beta' ]
then then
@ -211,9 +209,11 @@
exit 0 exit 0
fi fi
cd ./dist/
env\ env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\ GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
./bamboo-deploy-publisher/deploy.sh adguard-home-github ../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks': 'final-tasks':
- 'clean' - 'clean'
'requirements': 'requirements':

2
internal/home/auth.go
View File

@ -86,7 +86,7 @@ func InitAuth(dbFilename string, users []User, sessionTTL uint32) *Auth {
if err != nil { if err != nil {
log.Error("auth: open DB: %s: %s", dbFilename, err) log.Error("auth: open DB: %s: %s", dbFilename, err)
if err.Error() == "invalid argument" { 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 return nil

2
internal/stats/unit.go
View File

@ -158,7 +158,7 @@ func (s *statsCtx) dbOpen() bool {
if err != nil { if err != nil {
log.Error("stats: open DB: %s: %s", s.conf.Filename, err) log.Error("stats: open DB: %s: %s", s.conf.Filename, err)
if err.Error() == "invalid argument" { 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 return false
} }