ebl update to BwebConsole (drop Expect/Bconsole and scp)

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3651 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/brestore/brestore-fr.glade b/gui/brestore/brestore-fr.glade
index 48d162e891be85b8fe242b219e591b2703d6c350..b9dd456e5b2378c29174a3984a8a6dab4fb0a6d7 100644 (file)
--- a/gui/brestore/brestore-fr.glade
+++ b/gui/brestore/brestore-fr.glade
@@ -473,7 +473,7 @@ This year</property>
 
              <child>
                <widget class="GtkEntry" id="entry_location">
-                 <property name="width_request">380</property>
+                 <property name="width_request">250</property>
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="editable">True</property>
@@ -1875,7 +1875,9 @@ Ou, si le director est sur une autre machine :
 &lt;b&gt; scp://bacula@hostdir:/path/to/bsr &lt;/b&gt;
 
 Ou si le director fonctionne avec le connecteur http bweb
-&lt;b&gt; http://bacula:mdp@hostdir/cgi-bin/bweb/bput.pl&lt;/b&gt;</property>
+&lt;b&gt; file://var/tmp&lt;/b&gt;
+Et vous devez positionner bconsole sur
+&lt;b&gt; http://user:pass@director/cgi-bin/bweb/bconsole.pl&lt;/b&gt;</property>
                              <property name="use_underline">False</property>
                              <property name="use_markup">True</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1980,11 +1982,14 @@ Ou si le director fonctionne avec le connecteur http bweb
                          <child>
                            <widget class="GtkEntry" id="entry_bconsole">
                              <property name="visible">True</property>
+                             <property name="tooltip" translatable="yes">/path/to/bconsole -n -c /path/to/bconsole.conf
+or
+http://user:pass@director/cgi-bin/bweb/bconsole.pl</property>
                              <property name="can_focus">True</property>
                              <property name="editable">True</property>
                              <property name="visibility">True</property>
                              <property name="max_length">0</property>
-                             <property name="text" translatable="yes">/usr/local/bacula/etc/bconsole</property>
+                             <property name="text" translatable="yes">/usr/local/bacula/sbin/bconsole -n -c /usr/local/bacula/etc/bconsole.conf</property>
                              <property name="has_frame">True</property>
                              <property name="invisible_char">*</property>
                              <property name="activates_default">False</property>
@@ -2183,7 +2188,7 @@ Ou si le director fonctionne avec le connecteur http bweb
                          <child>
                            <widget class="GtkEntry" id="entry_bweb">
                              <property name="visible">True</property>
-                             <property name="tooltip" translatable="yes">http://bacula-dir/cgi-bin/bweb/bweb.pl</property>
+                             <property name="tooltip" translatable="yes">http://bacula-dir/cgi-bin/bweb/bweb.pl (ou laisser vide)</property>
                              <property name="can_focus">True</property>
                              <property name="editable">True</property>
                              <property name="visibility">True</property>

diff --git a/gui/brestore/brestore.glade b/gui/brestore/brestore.glade
index 451b51c24cc5036429d5d444129d573b54998384..b5256ebc52150e5dc3dcaaa8dfc47b455fd236ca 100644 (file)
--- a/gui/brestore/brestore.glade
+++ b/gui/brestore/brestore.glade
@@ -475,7 +475,7 @@ This year</property>
 
              <child>
                <widget class="GtkEntry" id="entry_location">
-                 <property name="width_request">380</property>
+                 <property name="width_request">230</property>
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="editable">True</property>
@@ -1876,8 +1876,11 @@ if director is local, put something like :
 &lt;b&gt; file://path/to/bacula/work/dir&lt;/b&gt;
 or if director is on other host
 &lt;b&gt; scp://bacula@hostdir:/path/to/bsr &lt;/b&gt;
-or if director works with the http connector
-&lt;b&gt; http://bacula:mdp@hostdir/cgi-bin/bweb/bput.pl&lt;/b&gt;</property>
+
+or if director works with the bweb http connector
+&lt;b&gt; file://var/tmp&lt;/b&gt;
+and set bconsole to 
+&lt;b&gt; http://user:pass@director/cgi-bin/bweb/brestore.pl&lt;/b&gt;</property>
                              <property name="use_underline">False</property>
                              <property name="use_markup">True</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1982,7 +1985,9 @@ or if director works with the http connector
                          <child>
                            <widget class="GtkEntry" id="entry_bconsole">
                              <property name="visible">True</property>
-                             <property name="tooltip" translatable="yes">/path/to/bconsole -n -c /path/to/bconsole.conf</property>
+                             <property name="tooltip" translatable="yes">/path/to/bconsole -n -c /path/to/bconsole.conf
+or
+http://user:pass@director/cgi-bin/bweb/bconsole.pl</property>
                              <property name="can_focus">True</property>
                              <property name="editable">True</property>
                              <property name="visibility">True</property>