freenas | 1 Oct 18:13 2014

[freenas/freenas] 9102751: Update environment to track http proxy

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 9102751b5940f7df9937041b28ffa50c974f3a38
Author: William Grzybowski <wg@...>
Date:   Wed Oct 1 13:14:25 2014 -0300

    Update environment to track http proxy

    Ticket:	#4866
---
 gui/network/forms.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gui/network/forms.py b/gui/network/forms.py
index e193e02..1377068 100644
--- a/gui/network/forms.py
+++ b/gui/network/forms.py
 <at>  <at>  -26,8 +26,10  <at>  <at> 
 #####################################################################
 from struct import pack
 import logging
+import os
 import re
 import socket
+import urllib2

 from django.core.validators import RegexValidator
 from django.db import transaction
(Continue reading)

freenas | 1 Oct 16:35 2014

[freenas/freenas] 2317e93: Set http_proxy env var if configured

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 2317e93040cbd5bbc403aa62333fc3e0ddec10f1
Author: William Grzybowski <wg@...>
Date:   Wed Oct 1 11:36:25 2014 -0300

    Set http_proxy env var if configured

    Ticket:	#4866
---
 src/freenas/usr/local/etc/rc.d/django | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/freenas/usr/local/etc/rc.d/django b/src/freenas/usr/local/etc/rc.d/django
index 8663ce5..a2667ef 100755
--- a/src/freenas/usr/local/etc/rc.d/django
+++ b/src/freenas/usr/local/etc/rc.d/django
 <at>  <at>  -31,7 +31,7  <at>  <at> 
 # SUCH DAMAGE.
 #

-. /etc/rc.subr
+. /etc/rc.freenas

 name="django"
 rcvar="django_enable"
 <at>  <at>  -61,6 +61,13  <at>  <at>  start_command()
 	new_string=`dd if=/dev/random bs=32 count=1 2>/dev/null | /usr/local/bin/base64`
(Continue reading)

freenas | 1 Oct 16:28 2014

[freenas/freenas] 2438ac3: Add 2 new alert conditions for TrueNAS.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 2438ac3a0016196b196ab4cb40da4ed53c062f29
Author: dlavigne <dru@...>
Date:   Wed Oct 1 10:27:51 2014 -0400

    Add 2 new alert conditions for TrueNAS.
---
 docs/userguide/truenas_options.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/userguide/truenas_options.rst b/docs/userguide/truenas_options.rst
index 8839380..20a2fd2 100644
--- a/docs/userguide/truenas_options.rst
+++ b/docs/userguide/truenas_options.rst
 <at>  <at>  -199,3 +199,6  <at>  <at>  alert is detected. Some of the conditions that trigger an alert include:

 *   the system can not find an IP address configured on an iSCSI portal

+*   a hot spare is automatically replaced
+
+*   a HA system can not sync to its peer
freenas | 1 Oct 16:24 2014

[freenas/freenas] e045264: More improvements to Storage chapter.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit e0452644c9221b7fe5db0399c48f6853f9ee428e
Author: dlavigne <dru <at> freebsd.org>
Date:   Wed Oct 1 10:23:15 2014 -0400

    More improvements to Storage chapter.
---
 docs/userguide/freenas_storage.rst | 157 +++++++++++++++++++------------------
 docs/userguide/images/auto1.png    | Bin 0 -> 25517 bytes
 docs/userguide/images/auto2.png    | Bin 0 -> 23112 bytes
 docs/userguide/images/dataset.png  | Bin 0 -> 93597 bytes
 docs/userguide/images/import.png   | Bin 0 -> 27006 bytes
 5 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/docs/userguide/freenas_storage.rst b/docs/userguide/freenas_storage.rst
index a771463..4ea595c 100644
--- a/docs/userguide/freenas_storage.rst
+++ b/docs/userguide/freenas_storage.rst
 <at>  <at>  -343,25 +343,21  <at>  <at>  be used to fine-tune the permissions as required.
 Create Dataset
 ~~~~~~~~~~~~~~

-An existing ZFS volume can be divided into datasets. Permissions, compression, deduplication, and
quotas can be set on a per dataset basis, allowing more
+An existing ZFS volume can be divided into datasets. Permissions, compression, deduplication, and
quotas can be set on a per-dataset basis, allowing more
 granular control over access to storage data. A dataset is similar to a folder in that you can set
(Continue reading)

freenas | 1 Oct 15:21 2014

[freenas/freenas] a08195d: Regenerate sys_uuid if its empty

branch: 9.2.1-BRANCH
Repository: freenas/freenas
Pushed by: git
Pushed to: branch 9.2.1-BRANCH
commit a08195d220e6a6cf2bf1ca2a9ebd248c36ecc9f8
Author: William Grzybowski <wg@...>
Date:   Wed Oct 1 10:22:24 2014 -0300

    Regenerate sys_uuid if its empty

    (cherry picked from commit d48167bde31c68f98811768d9a6c367a8628e6c5)
---
 gui/middleware/notifier.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gui/middleware/notifier.py b/gui/middleware/notifier.py
index 808857c..7b7fc53 100644
--- a/gui/middleware/notifier.py
+++ b/gui/middleware/notifier.py
 <at>  <at>  -4966,6 +4966,10  <at>  <at>  class notifier:
         except:
             systemdataset = SystemDataset.objects.create()

+        if not systemdataset.sys_uuid:
+            systemdataset.new_uuid()
+            systemdataset.save()
+
         # If there is a pool configured make sure the volume exists
         # Otherwise reset it to blank
         # TODO: Maybe it would be better to use a ForeignKey
(Continue reading)

freenas | 1 Oct 15:21 2014

[freenas/freenas] 210825f: Regenerate sys_uuid if its empty

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 210825ffe725379bd80be9eec840219825ece907
Author: William Grzybowski <wg@...>
Date:   Wed Oct 1 10:22:24 2014 -0300

    Regenerate sys_uuid if its empty
---
 gui/middleware/notifier.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gui/middleware/notifier.py b/gui/middleware/notifier.py
index 2fc6393..dcfdfbc 100644
--- a/gui/middleware/notifier.py
+++ b/gui/middleware/notifier.py
 <at>  <at>  -5174,6 +5174,10  <at>  <at>  class notifier:
         except:
             systemdataset = SystemDataset.objects.create()

+        if not systemdataset.sys_uuid:
+            systemdataset.new_uuid()
+            systemdataset.save()
+
         # If there is a pool configured make sure the volume exists
         # Otherwise reset it to blank
         # TODO: Maybe it would be better to use a ForeignKey
freenas | 1 Oct 01:29 2014

[freenas/freenas] 03e032c: Unbreak device extents when the device is not a zvol.

branch: 9.2.1-BRANCH
Repository: freenas/freenas
Pushed by: git
Pushed to: branch 9.2.1-BRANCH
commit 03e032c819e67ce28bd82d2c430dbccb696b88b4
Author: Josh Paetzel <josh@...>
Date:   Tue Sep 30 16:28:10 2014 -0700

    Unbreak device extents when the device is not a zvol.

    (cherry picked from commit 451a894fb93d65b20af1a32497794da34751108d)
---
 nanobsd/Files/usr/local/libexec/nas/generate_ctl_conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nanobsd/Files/usr/local/libexec/nas/generate_ctl_conf.py b/nanobsd/Files/usr/local/libexec/nas/generate_ctl_conf.py
index 4fee459..53e8777 100755
--- a/nanobsd/Files/usr/local/libexec/nas/generate_ctl_conf.py
+++ b/nanobsd/Files/usr/local/libexec/nas/generate_ctl_conf.py
 <at>  <at>  -150,9 +150,9  <at>  <at>  def main():
                     continue
                 disk = disk[0]
                 if disk.disk_multipath_name:
-                    path = "multipath/%s" % disk.disk_multipath_name
+                    path = "/dev/multipath/%s" % disk.disk_multipath_name
                 else:
-                    path = disk.identifier_to_device()
+                    path = "/dev/%s" % disk.identifier_to_device()
             else:
                 if not path.startswith("/mnt"):
(Continue reading)

freenas | 1 Oct 01:29 2014

[freenas/freenas] 451a894: Unbreak device extents when the device is not a zvol.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 451a894fb93d65b20af1a32497794da34751108d
Author: Josh Paetzel <josh@...>
Date:   Tue Sep 30 16:28:10 2014 -0700

    Unbreak device extents when the device is not a zvol.
---
 src/freenas/usr/local/libexec/nas/generate_ctl_conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/freenas/usr/local/libexec/nas/generate_ctl_conf.py b/src/freenas/usr/local/libexec/nas/generate_ctl_conf.py
index 3ba0aad..4c90878 100755
--- a/src/freenas/usr/local/libexec/nas/generate_ctl_conf.py
+++ b/src/freenas/usr/local/libexec/nas/generate_ctl_conf.py
 <at>  <at>  -150,9 +150,9  <at>  <at>  def main():
                     continue
                 disk = disk[0]
                 if disk.disk_multipath_name:
-                    path = "multipath/%s" % disk.disk_multipath_name
+                    path = "/dev/multipath/%s" % disk.disk_multipath_name
                 else:
-                    path = disk.identifier_to_device()
+                    path = "/dev/%s" % disk.identifier_to_device()
             else:
                 if not path.startswith("/mnt"):
                     path = "/dev/" + path
(Continue reading)

freenas | 1 Oct 01:22 2014

[freenas/freenas] 31651f3: Use the package checksum.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 31651f3ee2bcb67664093e829a47c0f0dc3560f1
Author: Sean Fagan <sef@...>
Date:   Tue Sep 30 16:22:35 2014 -0700

    Use the package checksum.
---
 src/freenas-pkgtools/freenas-release/freenas-release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freenas-pkgtools/freenas-release/freenas-release.py b/src/freenas-pkgtools/freenas-release/freenas-release.py
index 4e034a7..6394435 100644
--- a/src/freenas-pkgtools/freenas-release/freenas-release.py
+++ b/src/freenas-pkgtools/freenas-release/freenas-release.py
 <at>  <at>  -804,7 +804,7  <at>  <at>  class SQLiteReleaseDB(ReleaseDB):
         rv = []
         for pkg in packages:
             if debug:  print >> sys.stderr, "Found package %s-%s" % (pkg['PkgName'], pkg['PkgVersion'])
-            p = Package.Package(pkg["PkgName"], pkg["PkgVersion"], None)
+            p = Package.Package(pkg["PkgName"], pkg["PkgVersion"], pkg["Checksum"])
             rv.append(p)
         if rv and name:
             if len(rv) > 1:
freenas | 1 Oct 01:17 2014

[freenas/freenas] e30fc1b: Fix unintentional linebreak

branch: 9.2.1-BRANCH
Repository: freenas/freenas
Pushed by: git
Pushed to: branch 9.2.1-BRANCH
commit e30fc1b1226be536f9dcca5e41f243b7d89d96cc
Author: Josh Paetzel <josh@...>
Date:   Tue Sep 30 16:16:40 2014 -0700

    Fix unintentional linebreak

    (cherry picked from commit 239af2f51417d244db5285e0f89c3fe37f921c6f)
---
 nanobsd/Files/etc/ix.rc.d/ix-collectd | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nanobsd/Files/etc/ix.rc.d/ix-collectd b/nanobsd/Files/etc/ix.rc.d/ix-collectd
index 800084a..e88c147 100755
--- a/nanobsd/Files/etc/ix.rc.d/ix-collectd
+++ b/nanobsd/Files/etc/ix.rc.d/ix-collectd
 <at>  <at>  -34,8 +34,7  <at>  <at>  use_rrd_dataset()
 		then
 			echo "1"
 		else
-			local failover="$(/usr/local/bin/python /usr/local/www/freenasUI/middleware/notif
-ier.py failover_status 2> /dev/null)"
+			local failover="$(/usr/local/bin/python /usr/local/www/freenasUI/middleware/notifier.py
failover_status 2> /dev/null)"
 			if [ "x${failover}" = "xBACKUP" ]; then
 				echo "1"
 			else
(Continue reading)

freenas | 1 Oct 01:17 2014

[freenas/freenas] 239af2f: Fix unintentional linebreak

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 239af2f51417d244db5285e0f89c3fe37f921c6f
Author: Josh Paetzel <josh@...>
Date:   Tue Sep 30 16:16:40 2014 -0700

    Fix unintentional linebreak
---
 src/freenas/etc/ix.rc.d/ix-collectd | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/freenas/etc/ix.rc.d/ix-collectd b/src/freenas/etc/ix.rc.d/ix-collectd
index 800084a..e88c147 100755
--- a/src/freenas/etc/ix.rc.d/ix-collectd
+++ b/src/freenas/etc/ix.rc.d/ix-collectd
 <at>  <at>  -34,8 +34,7  <at>  <at>  use_rrd_dataset()
 		then
 			echo "1"
 		else
-			local failover="$(/usr/local/bin/python /usr/local/www/freenasUI/middleware/notif
-ier.py failover_status 2> /dev/null)"
+			local failover="$(/usr/local/bin/python /usr/local/www/freenasUI/middleware/notifier.py
failover_status 2> /dev/null)"
 			if [ "x${failover}" = "xBACKUP" ]; then
 				echo "1"
 			else

Gmane