Merge branch 'master' into gh-actions

This commit is contained in:
Kyle Robbertze 2021-05-21 15:18:39 +02:00
commit 482fef46a1
201 changed files with 133815 additions and 173837 deletions

View file

@ -30,13 +30,6 @@ storage_backend=file
monit_user = guest
monit_password = airtime
[soundcloud]
connection_retries = 3
time_between_retries = 60
soundcloud_client_id = 0
soundcloud_client_secret = 0
soundcloud_redirect_uri = http://soundcloud.example.org/redirect
[ldap]
hostname = ldap.example.org
binddn = 'uid=libretime,cn=sysaccounts,cn=etc,dc=int,dc=example,dc=org'

View file

@ -25,11 +25,4 @@ station_id = teststation
[monit]
monit_user = guest
monit_password = airtime
[soundcloud]
connection_retries = 3
time_between_retries = 60
soundcloud_client_id = 0
soundcloud_client_secret = 0
soundcloud_redirect_uri = http://soundcloud.example.org/redirect
monit_password = airtime