Skip to content

Commit

Permalink
Pull request 59: 1-proxy-logs
Browse files Browse the repository at this point in the history
Closes #1.

Squashed commit of the following:

commit cd2285e
Author: Ainar Garipov <[email protected]>
Date:   Fri Jul 5 16:22:19 2024 +0300

    dnssvc: imp docs

commit 97c1caa
Author: Ainar Garipov <[email protected]>
Date:   Fri Jul 5 16:19:39 2024 +0300

    cmd: rm more

commit c8a360a
Author: Ainar Garipov <[email protected]>
Date:   Fri Jul 5 15:42:24 2024 +0300

    dnssvc: typo

commit a0a7b73
Author: Ainar Garipov <[email protected]>
Date:   Fri Jul 5 15:31:48 2024 +0300

    all: fix bamboo

commit 5c9118c
Author: Ainar Garipov <[email protected]>
Date:   Fri Jul 5 15:22:15 2024 +0300

    all: try fixing bamboo

commit 4084a38
Author: Ainar Garipov <[email protected]>
Date:   Fri Jul 5 15:15:54 2024 +0300

    all: imp logs; mv docs
  • Loading branch information
ainar-g committed Jul 8, 2024
1 parent 6d6a172 commit f259bcd
Show file tree
Hide file tree
Showing 17 changed files with 81 additions and 479 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ NOTE: Add new changes BELOW THIS COMMENT.

- Path to the executable is now validated when the application installs itself as a `launchd` service on macOS ([#2]).

### Fixed

- DNS proxy logs being written to `stderr` instead of `log.output` ([#1]).

[#1]: https://github.com/AdguardTeam/AdGuardDNSClient/issues/1
[#2]: https://github.com/AdguardTeam/AdGuardDNSClient/issues/2

[go-1.22.5]: https://groups.google.com/g/golang-announce/c/gyb7aM1C9H4
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ For building packages, you might need additional tools, such as GnuPG, MSI Tools

## <a href="#opts" id="opts" name="opts">Command-line options</a>

Each option overrides the corresponding value provided by the configuration file
and the environment.
Each option overrides the corresponding value provided by the configuration file and the environment.

### <a href="#opts-help" id="opts-help" name="opts-help">Help</a>

Expand All @@ -134,10 +133,10 @@ Option `--version` makes AdGuard DNS Client print out the version of the `AdGuar

## <a href="#conf" id="conf" name="conf">Configuration</a>

The YAML configuration file is described in the [`doc/configuration.md`] file, and there is also a sample configuration file `config.dist.yaml`. Some configuration parameters can also be overridden using the environment, see [`doc/environment.md`].
The YAML configuration file is described in [its own article][conf], and there is also a sample configuration file `config.dist.yaml`. Some configuration parameters can also be overridden using the [environment][env].

[`doc/configuration.md`]: doc/configuration.md
[`doc/environment.md`]: doc/environment.md
[conf]: https://adguard-dns.io/kb/dns-client/configuration/
[env]: https://adguard-dns.io/kb/dns-client/environment/

## <a href="#exit-codes" id="exit-codes" name="exit-codes">Exit codes</a>

Expand Down
41 changes: 4 additions & 37 deletions bamboo-specs/bamboo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@
'channel': 'development'

'stages':
-
'Skip':
'manual': false
'final': false
'jobs':
- 'Skip'
-
'Lint':
'manual': false
Expand All @@ -44,32 +38,6 @@
'jobs':
- 'Publish'

# The Skip stage terminates the plan execution prematurely if the main
# repository has no changes. This is needed to avoid builds triggered by
# changes in the linked repositories, e.g. bamboo-deploy-publisher.
#
# TODO(e.burkov): Remove this crutch, when the Bamboo version will support such
# a configuration for triggers via YAML specs, see
# https://docs.atlassian.com/bamboo-specs-docs/8.2.0/specs.html?yaml#triggering-selected-repositories.
'Skip':
'key': 'SKIP'
'tasks':
-
'script':
- |-
#!/bin/sh
set -e -f -u -x
if [ "${bamboo.planRepository.revision}" = "${bamboo.planRepository.previousRevision}" ]
then
echo "aborting plan due to absent changes"
exit 0
fi
'requirements':
- 'adg-docker': 'true'

'Lint':
'docker':
'image': '${bamboo.dockerGo}'
Expand Down Expand Up @@ -374,6 +342,10 @@
../../bamboo-deploy-publisher/deploy.sh\
adguarddns-client-github
# TODO(e.burkov): Limit repositories when the Bamboo version will support such
# configuration for triggers via YAML specs.
#
# See https://docs.atlassian.com/bamboo-specs-docs/8.2.0/specs.html?yaml#triggering-selected-repositories.
'branches':
'create': 'for-pull-request'
'delete':
Expand Down Expand Up @@ -442,11 +414,6 @@
# All the other branches, including master.
'^.*':
'stages':
- 'Skip':
'manual': false
'final': false
'jobs':
- 'Skip'
- 'Lint':
'manual': false
'final': false
Expand Down
270 changes: 0 additions & 270 deletions doc/configuration.md

This file was deleted.

Loading

0 comments on commit f259bcd

Please sign in to comment.