summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2015-06-15 20:01:43 +0200
committerLars-Dominik Braun <lars@6xq.net>2015-06-15 20:01:43 +0200
commit61dbc218e747f1b550a2615ffe3065024db29239 (patch)
treecd46a89a6e5346e7e100e132bff057d4b69b1f5c /contrib
parent4458cbab76fd98989fa2d4260dd20bbbd66297a4 (diff)
downloadpianobar-windows-61dbc218e747f1b550a2615ffe3065024db29239.tar.gz
pianobar-windows-61dbc218e747f1b550a2615ffe3065024db29239.tar.bz2
pianobar-windows-61dbc218e747f1b550a2615ffe3065024db29239.zip
Replace setting tls_fingerprint with ca_bundle
Diffstat (limited to 'contrib')
-rw-r--r--contrib/config-example2
-rw-r--r--contrib/pianobar.15
2 files changed, 6 insertions, 1 deletions
diff --git a/contrib/config-example b/contrib/config-example
index b1648fd..899ee39 100644
--- a/contrib/config-example
+++ b/contrib/config-example
@@ -48,6 +48,7 @@
#love_icon = [+]
#ban_icon = [-]
#volume = 0
+#ca_bundle = /etc/ssl/certs/ca-certificates.crt
# Format strings
#format_nowplaying_song = %t by %a on %l%r%@%s
@@ -62,5 +63,4 @@
#device = D01
#encrypt_password = 2%3WCL*JU$MP]4
#decrypt_password = U#IO$RZPAB%VX2
-#tls_fingerprint = B0A1EB460B1B6F33A1B6CB500C6523CB2E6EC946
diff --git a/contrib/pianobar.1 b/contrib/pianobar.1
index 8a311a5..e337ea2 100644
--- a/contrib/pianobar.1
+++ b/contrib/pianobar.1
@@ -196,6 +196,11 @@ or the key you defined in
Icon for banned songs.
.TP
+.B ca_bundle
+Path to CA certifiate bundle, containing the root and intermediate certificates
+required to validate Pandora’s SSL certificate.
+
+.TP
.B control_proxy = http://user:password@host:port/
Non-american users need a proxy to use pandora.com. Only the xmlrpc interface
will use this proxy. The music is streamed directly.