Merge pull request #872 from bareos/dev/fbergkemper/bareos-19.2/bug-0…

…000579 webui: enable connect to the director via ipv6
bareos · Jun 29, 2021 · 384dc67 · 384dc67
2 parents 8ad86ef + 139fd5c
commit 384dc67
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/docs/manuals/source/IntroductionAndTutorial/InstallingBareosWebui.rst b/docs/manuals/source/IntroductionAndTutorial/InstallingBareosWebui.rst
@@ -281,6 +281,7 @@ The configuration file :file:`/etc/bareos-webui/directors.ini` should look simil
    enabled = "yes"
 
    ; Fill in the IP-Address or FQDN of you director.
+   ; E.g. alice.example.com, 127.0.0.1 or [::1]
    diraddress = "localhost"
 
    ; Default value is 9101

diff --git a/webui/install/directors.ini.in b/webui/install/directors.ini.in
@@ -13,6 +13,7 @@
 enabled = "yes"
 
 ; Fill in the IP-Address or FQDN of you director.
+; E.g. alice.example.com, 127.0.0.1 or [::1]
 diraddress = "localhost"
 
 ; Default value is @dirport@

diff --git a/webui/vendor/Bareos/library/Bareos/BSock/BareosBSock.php b/webui/vendor/Bareos/library/Bareos/BSock/BareosBSock.php
@@ -5,7 +5,7 @@
  * bareos-webui - Bareos Web-Frontend
  *
  * @link      https://github.com/bareos/bareos for the canonical source repository
- * @copyright Copyright (c) 2014-2019 Bareos GmbH & Co. KG
+ * @copyright Copyright (c) 2014-2021 Bareos GmbH & Co. KG
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -467,13 +467,10 @@ private function connect()
       $port = $this->config['port'];
       $remote = "tcp://" . $this->config['host'] . ":" . $port;
 
-      // set default stream context options
-      $opts = array(
-         'socket' => array(
-            'bindto' => '0:0',
-         ),
-      );
+      // set stream context options
+      $opts = array();
 
+      // create stream context
       $context = stream_context_create($opts);
 
       try {