freenas | 20 Oct 22:41 2014

[freenas/freenas] 0f0e1b1: Allow updates to happen in one pass, like before.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 0f0e1b1458effa10666e5b5773ed7ac9b8467071
Author: William Grzybowski <wg@...>
Date:   Mon Oct 20 18:40:19 2014 -0200

    Allow updates to happen in one pass, like before.
---
 gui/system/utils.py                    | 10 +++++++--
 gui/system/views.py                    | 40 ++++++++++++++++++++++++----------
 gui/templates/system/update_check.html |  5 +++--
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/gui/system/utils.py b/gui/system/utils.py
index 96cd1ae..c3888ce 100644
--- a/gui/system/utils.py
+++ b/gui/system/utils.py
 <at>  <at>  -97,7 +97,7  <at>  <at>  class UpdateHandler(object):

     DUMPFILE = '/tmp/.upgradeprogress'

-    def __init__(self, uuid=None):
+    def __init__(self, uuid=None, apply_=None):
         if uuid:
             try:
                 self.load()
 <at>  <at>  -106,6 +106,7  <at>  <at>  class UpdateHandler(object):
             except:
(Continue reading)

freenas | 20 Oct 22:34 2014

[freenas/freenas] e2a1ac1: Merge remote-tracking branch 'origin/master' into freebsd10

branch: freebsd10
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freebsd10
commit e2a1ac1ec005580bcd27c8c0d5c9e5fab267a177
Merge: 184a4f6 746f6d7
Author: Jordan Hubbard <jkh@...>
Date:   Mon Oct 20 13:34:29 2014 -0700

    Merge remote-tracking branch 'origin/master' into freebsd10

 ReleaseNotes                                       |  94 +++++++----
 build/nanobsd/nanobsd.sh                           |  41 ++++-
 docs/userguide/freenas_directoryservice.rst        |  72 +++++---
 docs/userguide/freenas_intro.rst                   |   7 +-
 docs/userguide/freenas_jails.rst                   | 186 +++++++++++----------
 docs/userguide/freenas_plugins.rst                 |   4 +-
 docs/userguide/freenas_services.rst                |   4 +-
 docs/userguide/freenas_storage.rst                 |   5 +-
 docs/userguide/images/ad1.png                      | Bin 0 -> 18384 bytes
 docs/userguide/images/chroot.png                   | Bin 0 -> 24901 bytes
 docs/userguide/images/directory1.png               | Bin 0 -> 27185 bytes
 docs/userguide/images/jails1.png                   | Bin 18944 -> 11704 bytes
 docs/userguide/images/jails2.png                   | Bin 22163 -> 0 bytes
 docs/userguide/images/jails3.png                   | Bin 21202 -> 15412 bytes
 docs/userguide/images/ldap1.png                    | Bin 0 -> 17394 bytes
 docs/userguide/images/nis1.png                     | Bin 0 -> 17148 bytes
 docs/userguide/images/nt1.png                      | Bin 0 -> 24781 bytes
 docs/userguide/images/periodic1.png                | Bin 0 -> 43876 bytes
 docs/userguide/images/periodic2.png                | Bin 0 -> 23841 bytes
(Continue reading)

freenas | 20 Oct 21:42 2014

[freenas/freenas] 746f6d7: Add more forgotten features.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 746f6d7cb736463467d8a7b7054ca68355c9bd4d
Author: Jordan Hubbard <jkh@...>
Date:   Mon Oct 20 12:42:00 2014 -0700

    Add more forgotten features.
---
 ReleaseNotes | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/ReleaseNotes b/ReleaseNotes
index dac930f..858463a 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
 <at>  <at>  -93,7 +93,16  <at>  <at>  be managed from the same UI.

 ** Security **
 
-  Software updates are now cryptographically signed, rendering the hashes
-obsolete.
+  Software updates are cryptographically signed, rendering the hashes
+unnecessary for anything but manual updates.

-  Numerous security updates to various components (CVE list should go here)
+
+** Miscellaneous **
+
(Continue reading)

freenas | 20 Oct 20:47 2014

[freenas/freenas] 215c339: Fix .system paths in a couple of places.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 215c339aa881e7d32bd433749ad67f67e01f8ff8
Author: Jakub Klama <jakub@...>
Date:   Mon Oct 20 20:52:28 2014 +0200

    Fix .system paths in a couple of places.

    Ticket:	#6374
---
 gui/system/views.py                                | 35 ++++++++++++++--------
 .../usr/local/libexec/nas/generate_smb4_conf.py    |  5 ++--
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/gui/system/views.py b/gui/system/views.py
index 4d6ac01..9ace220 100644
--- a/gui/system/views.py
+++ b/gui/system/views.py
 <at>  <at>  -722,10 +722,11  <at>  <at>  def perftest(request):
             _('System dataset is required to perform this action.')
         )

-    dump = '/mnt/%s/perftest.txz' % basename
+    dump = os.path.join(notifier().system_dataset_path(), 'perftest.txz')
     perftestdataset = '%s/perftest' % basename
+    perftestdir = os.path.join(notifier().system_dataset_path(), 'perftest')

-    with mntlock(mntpt='/mnt/%s' % basename):
(Continue reading)

freenas | 20 Oct 20:31 2014

[freenas/freenas] ded4a79: Add some screenshots to Jails chapter.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit ded4a79c8f4aa25e81806758d7ca10270ca6ddc1
Author: dlavigne <dru <at> freebsd.org>
Date:   Mon Oct 20 14:31:07 2014 -0400

    Add some screenshots to Jails chapter.
---
 docs/userguide/freenas_jails.rst | 186 +++++++++++++++++++++------------------
 docs/userguide/images/jails1.png | Bin 18944 -> 11704 bytes
 docs/userguide/images/jails2.png | Bin 22163 -> 0 bytes
 docs/userguide/images/jails3.png | Bin 21202 -> 15412 bytes
 4 files changed, 102 insertions(+), 84 deletions(-)

diff --git a/docs/userguide/freenas_jails.rst b/docs/userguide/freenas_jails.rst
index 24e6b32..368e78d 100644
--- a/docs/userguide/freenas_jails.rst
+++ b/docs/userguide/freenas_jails.rst
 <at>  <at>  -68,42 +68,50  <at>  <at>  named *jail1*, it will be installed into its own dataset named :file:`/mnt/volum
 .. warning:: if you have already installed a plugin, all of the fields in this screen will automatically be
filled in. You should still double-check that
    the pre-configured IP addressing values are appropriate for your jails and will not conflict with
addresses used by other systems on the network.

-Table 13.1a summarizes the fields in this configuration screen. Some settings are only available in
"Advanced Mode". To see these settings, either click the
-"Advanced Mode" button or configure the system to always display these settings by checking the box "Show
advanced fields by default" in
(Continue reading)

freenas | 20 Oct 18:42 2014

[freenas/freenas] 31c9d40: Add screenshots to Plugins chapter.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 31c9d4088fa6d1c1e344f47ebb6c4d4cdeaf9e09
Author: dlavigne <dru <at> freebsd.org>
Date:   Mon Oct 20 12:42:25 2014 -0400

    Add screenshots to Plugins chapter.
---
 docs/userguide/freenas_plugins.rst |   4 ++--
 docs/userguide/images/plugins1.png | Bin 0 -> 73279 bytes
 docs/userguide/images/plugins2.png | Bin 0 -> 72295 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/freenas_plugins.rst b/docs/userguide/freenas_plugins.rst
index a3e10a3..5aef455 100644
--- a/docs/userguide/freenas_plugins.rst
+++ b/docs/userguide/freenas_plugins.rst
 <at>  <at>  -45,7 +45,7  <at>  <at>  To install a plugin, click "Plugins". As seen in Figure 12.1a, the list of avail
 |plugins1.png|

 .. |plugins1.png| image:: images/plugins1.png
-    :width: 11.1in
+    :width: 5.9in
     :height: 4.5in

 .. note:: if the list of available plugins is not displayed, open :ref:`Shell` and verify that the
FreeNASĀ® system can :command:`ping` an address on the
 <at>  <at>  -59,7 +59,7  <at>  <at>  installation.
(Continue reading)

freenas | 20 Oct 18:20 2014

[freenas/freenas] 28ef3d2: Add some screenshots to Services chapter.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 28ef3d22a59ef200abedf15901223d4ef738a0dd
Author: dlavigne <dru@...>
Date:   Mon Oct 20 12:20:19 2014 -0400

    Add some screenshots to Services chapter.
---
 docs/userguide/freenas_services.rst  |   4 ++--
 docs/userguide/images/chroot.png     | Bin 0 -> 24901 bytes
 docs/userguide/images/directory1.png | Bin 0 -> 27185 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/freenas_services.rst b/docs/userguide/freenas_services.rst
index 7f4c34b..0a6abd2 100644
--- a/docs/userguide/freenas_services.rst
+++ b/docs/userguide/freenas_services.rst
 <at>  <at>  -439,7 +439,7  <at>  <at>  Figure 11.4a shows the configuration screen for creating a domain controller and
 | Administrator password | string         | password to be used for the Active Directory administrator account                                                                                                                        |
 |                        |                |                                                                                                                                                                                           |
 +------------------------+----------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Kerberos Realm         | drop-down menu |                                                                                                                                                                                           |
+| Kerberos Realm         | drop-down menu | select the realm created using the instructions in :ref:`Kerberos
Realms`                                                                                                                 |
 |                        |                |                                                                                                                                                                                           |
 +------------------------+----------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+

 <at>  <at>  -1811,7 +1811,7  <at>  <at>  the following steps.
(Continue reading)

freenas | 20 Oct 17:57 2014

[freenas/freenas] 4cb6d9a: Add screenshots to Directory Services chapter.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 4cb6d9aec7ebb4a398e996f118a523b40c358652
Author: dlavigne <dru <at> freebsd.org>
Date:   Mon Oct 20 11:57:19 2014 -0400

    Add screenshots to Directory Services chapter.
---
 docs/userguide/freenas_directoryservice.rst |  72 ++++++++++++++++++----------
 docs/userguide/freenas_intro.rst            |   7 +--
 docs/userguide/images/ad1.png               | Bin 0 -> 18384 bytes
 docs/userguide/images/ldap1.png             | Bin 0 -> 17394 bytes
 docs/userguide/images/nis1.png              | Bin 0 -> 17148 bytes
 docs/userguide/images/nt1.png               | Bin 0 -> 24781 bytes
 docs/userguide/images/realm1.png            | Bin 0 -> 21059 bytes
 7 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/docs/userguide/freenas_directoryservice.rst b/docs/userguide/freenas_directoryservice.rst
index 73cadfd..75623b2 100644
--- a/docs/userguide/freenas_directoryservice.rst
+++ b/docs/userguide/freenas_directoryservice.rst
 <at>  <at>  -60,7 +60,11  <at>  <at>  display these settings by checking the box "Show advanced fields by default" in

 **Figure 9.1a: Configuring Active Directory**
 
-|Figure91a_png|
+|ad1.png|
+
(Continue reading)

freenas | 20 Oct 16:58 2014

[freenas/freenas] 0441a20: Add some screenshots to Storage chapter.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 0441a20faf146c45426654f74beef08944e62a8c
Author: dlavigne <dru@...>
Date:   Mon Oct 20 10:57:39 2014 -0400

    Add some screenshots to Storage chapter.
---
 docs/userguide/freenas_storage.rst  |   5 ++---
 docs/userguide/images/periodic1.png | Bin 0 -> 43876 bytes
 docs/userguide/images/periodic2.png | Bin 0 -> 23841 bytes
 docs/userguide/images/scrub.png     | Bin 0 -> 47448 bytes
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/userguide/freenas_storage.rst b/docs/userguide/freenas_storage.rst
index fd212be..cc505b9 100644
--- a/docs/userguide/freenas_storage.rst
+++ b/docs/userguide/freenas_storage.rst
 <at>  <at>  -1190,8 +1190,7  <at>  <at>  Figure 8.2a. Table 8.2a summarizes the fields in this screen.
 | **Setting**    | **Value**                  | **Description**                                                                                              |
 |                |                            |                                                                                                              |
 +================+============================+==============================================================================================================+
-| Volume/Dataset | drop-down menu             | select an existing ZFS volume, dataset, or zvol; if you select a
volume, separate snapshots will also be     |
-|                |                            | created for each of its datasets                                                                             |
+| Volume/Dataset | drop-down menu             | select an existing ZFS volume, dataset, or zvol                                                              |
 |                |                            |                                                                                                              |
 +----------------+----------------------------+--------------------------------------------------------------------------------------------------------------+
(Continue reading)

freenas | 20 Oct 15:30 2014

[freenas/freenas] 4498250: Add a checkbox to apply update after download

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 4498250b04bac6caaf860d50c3a5651a653a20ca
Author: William Grzybowski <wg@...>
Date:   Mon Oct 20 11:29:55 2014 -0200

    Add a checkbox to apply update after download

    Does not actually do anything in the backend yet.
---
 gui/templates/system/update_check.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gui/templates/system/update_check.html b/gui/templates/system/update_check.html
index 69a1c10..8bb6dc9 100644
--- a/gui/templates/system/update_check.html
+++ b/gui/templates/system/update_check.html
 <at>  <at>  -28,6 +28,7  <at>  <at>  doSubmit({
 {% endif %}
 {% trans "The following packages will be downloaded:" %}
 <pre style="padding: 8px; margin: 4px;">{{ handler.output }}</pre>
+<p><input data-dojo-type="dijit.form.CheckBox" name="apply" type="checkbox" checked="checked"
/> {% trans "Apply updates after downloading" %}</p>
 {% trans "Do you want to continue?" %}
 {% else %}
     <p>{% trans "No updates available" %}</p>
freenas | 20 Oct 14:10 2014

[freenas/freenas] 5a9a2a6: Rename "Check For Udpates" button to "Check Now"

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 5a9a2a6fd60ce50f93912b4529e81a50feb6101a
Author: William Grzybowski <wg@...>
Date:   Mon Oct 20 10:10:13 2014 -0200

    Rename "Check For Udpates" button to "Check Now"
---
 gui/freeadmin/static/lib/js/freeadmin/Update.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/freeadmin/static/lib/js/freeadmin/Update.js b/gui/freeadmin/static/lib/js/freeadmin/Update.js
index c3db6a9..b3b15aa 100644
--- a/gui/freeadmin/static/lib/js/freeadmin/Update.js
+++ b/gui/freeadmin/static/lib/js/freeadmin/Update.js
 <at>  <at>  -85,9 +85,9  <at>  <at>  define([
       }, me.dapManualUpdate);

       me._checkUpdate = new Button({
-        label: gettext("Check For Updates"),
+        label: gettext("Check Now"),
         onClick: function() {
-          editObject(gettext("Check For Updates"), me.checkUrl, [me.domNode]);
+          editObject(gettext("Check Now"), me.checkUrl, [me.domNode]);
         }
       }, me.dapCheckUpdateBtn);

Gmane