Update ssl and irc settings handling

This commit is contained in:
DariusIII
2018-03-05 11:00:21 +01:00
parent 5a00641fb3
commit 5d3cb580b3
4 changed files with 21 additions and 9 deletions
+11
View File
@@ -82,3 +82,14 @@ RENAME_MUSIC_MEDIAINFO=
CACHE_EXPIRY_SHORT=
CACHE_EXPIRY_MEDIUM=
CACHE_EXPIRY_LONG=
SSL_CAFILE=
SSL_CAPATH=
SSL_VERIFY_PEER=false
SSL_VERIFY_HOST=false
SSL_ALLOW_SELF_SIGNED=true
SCRAPE_IRC_USERNAME=
SCRAPE_IRC_PORT=
SCRAPE_IRC_TLS=
SCRAPE_IRC_PASSWORD=
+1
View File
@@ -1,4 +1,5 @@
2018-03-05 DariusIII
* Chg: Update ssl and irc settings handling
* Chg: Update config settings handling
* Chg: Remove last of the python requirements
2018-03-04 DariusIII
+4 -4
View File
@@ -1,6 +1,6 @@
<?php
$username = '';
$username = env('SCRAPE_IRC_USERNAME', '');
return [
/***********************************************************************************************************************
@@ -21,13 +21,13 @@ return [
* This is the port to the IRC server.
* @note If you want use SSL/TLS=>use a corresponding port (6697 or 7001 for example)=>and set SCRAPE_IRC_TLS to true.
**********************************************************************************************************************/
'scrape_irc_port' => '6667',
'scrape_irc_port' => env('SCRAPE_IRC_PORT', 6667),
/***********************************************************************************************************************
* If you want to use SSL/TLS encryption on the IRC server=>set this to true.
* @note Make sure you use a valid SSL/TLS port in SCRAPE_IRC_PORT.
**********************************************************************************************************************/
'scrape_irc_tls' => false,
'scrape_irc_tls' => env('SCRAPE_IRC_TLS', false),
/***********************************************************************************************************************
* This is the nick name visible in IRC channels.
@@ -50,7 +50,7 @@ return [
* @note Put your password between quotes: 'mypassword'
* @note If you are using ZNC and having issues=>try 'username:password' or 'username/network:<password>'
**********************************************************************************************************************/
'scrape_irc_password' => false,
'scrape_irc_password' => env('SCRAPE_IRC_PASSWORD', false),
/***********************************************************************************************************************
* This is an optional field you can use for ignoring categories.
+5 -5
View File
@@ -1,9 +1,9 @@
<?php
return [
'ssl_cafile' => '',
'ssl_capath' => '',
'ssl_verify_peer' => false,
'ssl_verify_host' => false,
'ssl_allow_self_signed' => true,
'ssl_cafile' => env('SSL_CAFILE', ''),
'ssl_capath' => env('SSL_CAPATH', ''),
'ssl_verify_peer' => env('SSL_VERIFY_PEER', false),
'ssl_verify_host' => env('SSL_VERIFY_HOST', false),
'ssl_allow_self_signed' => env('SSL_ALLOW_SELF_SIGNED', true),
];