Skip to content

Commit c33ebd2

Browse files
committed
Avoid empty examples files
Fixes #348 Keep the ciphers list commented out by default to be safe
1 parent 432be62 commit c33ebd2

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

.travis.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ script:
1818
- mkdir win32
1919
- ln dnscrypt-proxy.exe win32/
2020
- cp ../LICENSE example-dnscrypt-proxy.toml example-*.txt win32/
21-
- rm -f example-dnscrypt-proxy.toml ; sed 's/^tls_cipher_suite/# tls_cipher_suite/' example-dnscrypt-proxy.toml > example-dnscrypt-proxy.toml
2221
- for i in win32/LICENSE win32/*.toml win32/*.txt; do ex -bsc '%!awk "{sub(/$/,\"\r\")}1"' -cx "$i"; done
2322
- ln ../windows/* win32/
2423
- zip -9 -r dnscrypt-proxy-win32-${TRAVIS_TAG:-dev}.zip win32
@@ -28,7 +27,6 @@ script:
2827
- mkdir win64
2928
- ln dnscrypt-proxy.exe win64/
3029
- cp ../LICENSE example-dnscrypt-proxy.toml example-*.txt win64/
31-
- rm -f example-dnscrypt-proxy.toml ; sed 's/^tls_cipher_suite/# tls_cipher_suite/' example-dnscrypt-proxy.toml > example-dnscrypt-proxy.toml
3230
- for i in win64/LICENSE win64/*.toml win64/*.txt; do ex -bsc '%!awk "{sub(/$/,\"\r\")}1"' -cx "$i"; done
3331
- ln ../windows/* win64/
3432
- zip -9 -r dnscrypt-proxy-win64-${TRAVIS_TAG:-dev}.zip win64
@@ -45,7 +43,6 @@ script:
4543
- mkdir openbsd-amd64
4644
- ln dnscrypt-proxy openbsd-amd64/
4745
- ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt openbsd-amd64/
48-
- rm -f example-dnscrypt-proxy.toml ; sed 's/^tls_cipher_suite/# tls_cipher_suite/' example-dnscrypt-proxy.toml > example-dnscrypt-proxy.toml
4946
- tar czpvf dnscrypt-proxy-openbsd_amd64-${TRAVIS_TAG:-dev}.tar.gz openbsd-amd64
5047

5148
- go clean
@@ -60,7 +57,6 @@ script:
6057
- mkdir freebsd-amd64
6158
- ln dnscrypt-proxy freebsd-amd64/
6259
- ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt freebsd-amd64/
63-
- rm -f example-dnscrypt-proxy.toml ; sed 's/^tls_cipher_suite/# tls_cipher_suite/' example-dnscrypt-proxy.toml > example-dnscrypt-proxy.toml
6460
- tar czpvf dnscrypt-proxy-freebsd_amd64-${TRAVIS_TAG:-dev}.tar.gz freebsd-amd64
6561

6662
- go clean
@@ -75,7 +71,6 @@ script:
7571
- mkdir dragonflybsd-amd64
7672
- ln dnscrypt-proxy dragonflybsd-amd64/
7773
- ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt dragonflybsd-amd64/
78-
- rm -f example-dnscrypt-proxy.toml ; sed 's/^tls_cipher_suite/# tls_cipher_suite/' example-dnscrypt-proxy.toml > example-dnscrypt-proxy.toml
7974
- tar czpvf dnscrypt-proxy-dragonflybsd_amd64-${TRAVIS_TAG:-dev}.tar.gz dragonflybsd-amd64
8075

8176
- go clean
@@ -90,7 +85,6 @@ script:
9085
- mkdir netbsd-amd64
9186
- ln dnscrypt-proxy netbsd-amd64/
9287
- ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt netbsd-amd64/
93-
- rm -f example-dnscrypt-proxy.toml ; sed 's/^tls_cipher_suite/# tls_cipher_suite/' example-dnscrypt-proxy.toml > example-dnscrypt-proxy.toml
9488
- tar czpvf dnscrypt-proxy-netbsd_amd64-${TRAVIS_TAG:-dev}.tar.gz netbsd-amd64
9589

9690
- go clean
@@ -105,7 +99,6 @@ script:
10599
- mkdir linux-x86_64
106100
- ln dnscrypt-proxy linux-x86_64/
107101
- ln ../LICENSE ../systemd/* example-dnscrypt-proxy.toml example-*.txt linux-x86_64/
108-
- rm -f example-dnscrypt-proxy.toml ; sed 's/^tls_cipher_suite/# tls_cipher_suite/' example-dnscrypt-proxy.toml > example-dnscrypt-proxy.toml
109102
- tar czpvf dnscrypt-proxy-linux_x86_64-${TRAVIS_TAG:-dev}.tar.gz linux-x86_64
110103

111104
- go clean
@@ -155,7 +148,6 @@ script:
155148
- mkdir macos
156149
- ln dnscrypt-proxy macos/
157150
- ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt macos/
158-
- rm -f example-dnscrypt-proxy.toml ; sed 's/^tls_cipher_suite/# tls_cipher_suite/' example-dnscrypt-proxy.toml > example-dnscrypt-proxy.toml
159151
- tar czpvf dnscrypt-proxy-macos-${TRAVIS_TAG:-dev}.tar.gz macos
160152

161153
- go clean
@@ -184,7 +176,6 @@ script:
184176
- mkdir android-x86_64
185177
- ln dnscrypt-proxy android-x86_64/
186178
- cp ../LICENSE example-dnscrypt-proxy.toml example-*.txt android-x86_64/
187-
- rm -f example-dnscrypt-proxy.toml ; sed 's/^tls_cipher_suite/# tls_cipher_suite/' example-dnscrypt-proxy.toml > example-dnscrypt-proxy.toml
188179
- zip -9 -r dnscrypt-proxy-android_x86_64-${TRAVIS_TAG:-dev}.zip android-x86_64
189180

190181
- ls -l dnscrypt-proxy-*.tar.gz dnscrypt-proxy-*.zip

dnscrypt-proxy/example-dnscrypt-proxy.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@ cert_refresh_delay = 240
128128
## 52393 = TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
129129
##
130130
## On non-Intel CPUs such as MIPS routers and ARM systems (Android, Raspberry Pi...),
131-
## the following suite improves performance. RSA verification is faster than ECDSA.
131+
## the following suite improves performance.
132132
## This may also help on Intel CPUs running 32-bit operating systems.
133133
##
134134
## Delete or comment the next line if you have issues fetching sources or
135135
## connecting to some DoH servers. Google and Cloudflare are fine with it.
136136

137-
tls_cipher_suite = [52392, 49199]
137+
# tls_cipher_suite = [52392, 49199]
138138

139139

140140
## Fallback resolver

0 commit comments

Comments
 (0)