Commit Graph

1370 Commits

Author SHA1 Message Date
Simon Zolin 3b98461a2a Merge: + config: add cache size and time settings
Close #947

* commit '4e8473f8a5b04d2b3883ab74323734ef5e976c0e':
  * use dnsproxy v0.19.1
  * dnsfilter: use golibs/cache
2019-09-03 17:14:14 +03:00
Simon Zolin 4e8473f8a5 * use dnsproxy v0.19.1 2019-09-02 19:13:20 +03:00
Simon Zolin c616259e8b * dnsfilter: use golibs/cache
+ config: add cache size settings
+ config: add cache_time setting
2019-09-02 19:12:53 +03:00
Konstantin 🦄 Zamyakin 7d3fe71597 fix .twosky.json 2019-09-02 17:05:16 +03:00
Simon Zolin a9524448b1 Merge: Set SSL certificate & privatekey from file
Close #634

* commit 'c05917bce0a4c823a4a3f58973e09f7dd8dae877':
  - client: remove unused strings
  * README: update link to the crowdin
  + client: handle fields for certificate path and private key path
  * openapi: update "TlsConfig"
  + config: add certificate_path, private_key_path
2019-08-30 19:36:51 +03:00
Ildar Kamalov c05917bce0 - client: remove unused strings 2019-08-30 19:18:23 +03:00
Ildar Kamalov 7aa5c37e3b * README: update link to the crowdin 2019-08-30 19:18:23 +03:00
Ildar Kamalov 6d63450f03 + client: handle fields for certificate path and private key path 2019-08-30 19:18:23 +03:00
Simon Zolin 4445c4b669 * openapi: update "TlsConfig" 2019-08-30 19:18:23 +03:00
Simon Zolin 24bb708b21 + config: add certificate_path, private_key_path
* POST /control/tls/configure: support certificate_path and private_key_path
2019-08-30 19:18:14 +03:00
Ildar Kamalov c847df9976 Merge: Add TikTok to Blocked services
Closes #950

* commit 'bdd86adac5a3fdc7013200e1448a7acb6a04993e':
  + blocked_services: add tiktok main domain
  + client: add tiktok icon
  + blocked_services: add tiktok
2019-08-29 13:34:58 +03:00
Ildar Kamalov bdd86adac5 + blocked_services: add tiktok main domain 2019-08-29 11:45:39 +03:00
Ildar Kamalov 44a3a8857f + client: add tiktok icon 2019-08-29 11:40:17 +03:00
Ildar Kamalov eb524e27a6 + blocked_services: add tiktok 2019-08-29 11:39:04 +03:00
Simon Zolin be3f855df2 Merge: * /control/version.json: retry up to 3 times after DNS resolve of static.adguard.com has failed
Close #934

* commit 'd4c012220edc52e7d47808f1d83ce9ca664f73d3':
  * control: add link to the issue on github
  * /control/version.json: retry up to 3 times after DNS resolve of static.adguard.com has failed
2019-08-28 15:21:53 +03:00
Simon Zolin d4c012220e * control: add link to the issue on github 2019-08-27 11:53:09 +03:00
Simon Zolin 815489c0ff * /control/version.json: retry up to 3 times after DNS resolve of static.adguard.com has failed 2019-08-26 16:02:56 +03:00
Simon Zolin c7b5b00d14 Merge: * dhcp: validate range_start/range_end values
Close #848

* commit '625b22a8d7bece655216b926f1b4ce35e14ccb07':
  * dhcp: validate range_start/range_end values
2019-08-23 17:18:30 +03:00
Simon Zolin dd632d3f69 Merge: * dhcp: when adding a static lease, it can replace a dynamic lease
Close #833

* commit '7acbeb89569cd0260a0e21eae3a2439b419c2e24':
  * dhcp: when adding a static lease, it can replace a dynamic lease
2019-08-23 17:18:10 +03:00
Simon Zolin 7acbeb8956 * dhcp: when adding a static lease, it can replace a dynamic lease 2019-08-23 16:14:00 +03:00
Simon Zolin 625b22a8d7 * dhcp: validate range_start/range_end values 2019-08-23 14:44:23 +03:00
Simon Zolin 307b934cf1 Merge: * control: refactor: all handlers are registered via httpRegister()
* commit '452a668a5ba66efa265621104fe3be17ae156ed5':
  * control: refactor: all handlers are registered via httpRegister()
2019-08-23 14:09:22 +03:00
Ildar Kamalov fb2c625bd1 Merge: - client: fix IPv6 redirect url for install
* commit 'c8052c23d190ebcc8437a1c61b08e685e5657e70':
  fix condition
  - client: fix IPv6 redirect url for install
2019-08-23 13:54:44 +03:00
Ildar Kamalov c8052c23d1 fix condition 2019-08-22 18:50:58 +03:00
Ildar Kamalov 0bd722c426 - client: fix IPv6 redirect url for install
Closes #953
2019-08-22 18:42:55 +03:00
Andrey Meshkov 53767a5bed *(documentation): bump openapi spec version to 0.98.1 2019-08-22 15:42:43 +03:00
Andrey Meshkov 64d40bdc47 Merge: - config: global "blocked_services" settings were reset on startup
* commit 'b1ca7c90d3ef0e72d3535b7cf195adfe83d34e5a':
  - config: global "blocked_services" settings were reset on startup
2019-08-22 15:38:24 +03:00
Simon Zolin b1ca7c90d3 - config: global "blocked_services" settings were reset on startup 2019-08-22 15:30:48 +03:00
Simon Zolin bde59364c6 Merge: - dnsforward: don't use dnsfilter object after it's closed (additional check)
* commit 'a370cd0bf035213ea7d09e1e577a4612934a8c5a':
  - dnsforward: don't use dnsfilter object after it's closed (additional check)
2019-08-22 12:05:55 +03:00
Simon Zolin a370cd0bf0 - dnsforward: don't use dnsfilter object after it's closed (additional check) 2019-08-22 12:01:59 +03:00
Simon Zolin 452a668a5b * control: refactor: all handlers are registered via httpRegister()
* move some code to home/control_filtering.go
2019-08-21 14:52:57 +03:00
Ildar Kamalov e6bd2a101d Merge: + translations: add twosky config file
* commit '568a7a73347862c30830d956a26e2beb31c27857':
  + translations: add twosky config file
2019-08-20 18:07:16 +03:00
Simon Zolin d2e0940053 Merge: * use dnsproxy v0.18.4
* commit '31af6ae9147fd85d593237ec6715c428d56740ed':
  * use dnsproxy v0.18.4
2019-08-20 18:05:21 +03:00
Simon Zolin 31af6ae914 * use dnsproxy v0.18.4 2019-08-20 17:59:40 +03:00
Ildar Kamalov 568a7a7334 + translations: add twosky config file 2019-08-20 17:19:49 +03:00
Simon Zolin 09a52436fb Merge: - dnsforward: don't use dnsfilter object after it's closed
Close #940

* commit '94552a30d7080c8471f7fca370a5905c6c420272':
  - dnsforward: don't use dnsfilter object after it's closed
2019-08-20 15:36:34 +03:00
Simon Zolin 94552a30d7 - dnsforward: don't use dnsfilter object after it's closed 2019-08-20 15:07:39 +03:00
Andrey Meshkov 87ca9ed9c2 -(dnsforward): fixed sigsegv when protection is disabled
* commit 'c82e93cfc7cf439a5e5bf9b8bc27f5b68b528b53':
  -(dnsforward): fixed sigsegv when protection is disabled
2019-08-20 15:03:17 +03:00
Andrey Meshkov c82e93cfc7 -(dnsforward): fixed sigsegv when protection is disabled
Also, fixed all golint issues

 Closes: #941
2019-08-20 00:55:32 +03:00
Simon Zolin 91a1eb9e06 Merge: * use dnsproxy v0.18.3
* commit 'c54e2585ac86d045fe21ae61af35e6a4eeda5d91':
  * use dnsproxy v0.18.3
2019-08-19 17:10:03 +03:00
Simon Zolin c54e2585ac * use dnsproxy v0.18.3 2019-08-19 17:02:19 +03:00
Simon Zolin 5b555f95ff Merge: + dhcp: use --workdir value for "leases.db" file path
Close #935

* commit '8e08cddf647226d5e8e5f41307b60274a3f232e5':
  + dhcp: use --workdir value for "leases.db" file path
2019-08-19 16:55:42 +03:00
Simon Zolin 8e08cddf64 + dhcp: use --workdir value for "leases.db" file path 2019-08-19 14:40:10 +03:00
Simon Zolin eba7931c2d Merge: Revert: * dnsfilter: use fastcache instead of gcache
* commit 'b37208564bd170f21347db9cfde39614ea4a02c2':
  - fix build: we're using a new gcache module now
  Revert "+ config: add cache size settings"
  Revert "* dnsfilter: use fastcache instead of gcache"
  Revert "fix tests"
2019-08-16 16:13:03 +03:00
Andrey Meshkov 5448000f7b *(global): travis slack notification 2019-08-16 16:08:56 +03:00
Simon Zolin b37208564b - fix build: we're using a new gcache module now 2019-08-16 15:43:12 +03:00
Simon Zolin d46ebe1c8b Revert "+ config: add cache size settings"
This reverts commit 81303b5db7.
2019-08-16 15:17:38 +03:00
Simon Zolin 68d5d595b6 Revert "* dnsfilter: use fastcache instead of gcache"
This reverts commit 6f51df7d2e.
2019-08-16 15:17:38 +03:00
Simon Zolin 56c69cdb79 Revert "fix tests"
This reverts commit d9265aa9a8.
2019-08-16 15:11:57 +03:00
Simon Zolin 28cc9dc973 Merge: + travis: slack notifications
* commit '8aef6d8f91bbac5ce47539ef121a73ea75d12042':
  + travis: slack notifications
2019-08-16 13:50:59 +03:00