freenas | 19 Sep 07:30 2014

[freenas/freenas] 8c0e100: Plugins don't care how they get an IP address, so don't tell them

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 8c0e10018824818819c114b5f5c151f7cfde11d8
Author: John Hixson <john@...>
Date:   Thu Sep 18 22:29:27 2014 -0700

    Plugins don't care how they get an IP address, so don't tell them
---
 gui/plugins/api_calls.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gui/plugins/api_calls.py b/gui/plugins/api_calls.py
index c9b3ca1..79b7347 100644
--- a/gui/plugins/api_calls.py
+++ b/gui/plugins/api_calls.py
 <at>  <at>  -82,6 +82,17  <at>  <at>  def __get_plugins_jail_info(plugin_id):
         plugin = plugin[0]
         jail = Jails.objects.get(jail_host=plugin.plugin_jail)

+        #
+        # XXX Hackety hack hack! XXX
+        # 
+        # jail_ipv4|jail_ipv6, if using DHCP or AUTOCONF, will be 
+        # prefixed with "DHCP:"  and "AUTOCONF:". Current plugins aren't
+        # aware of this (nor do they really need to be), so we just pass
+        # it the property that only has the IP address.
+        #
+        jail.jail_ipv4 = jail.jail_ipv4_addr
(Continue reading)

freenas | 19 Sep 06:59 2014

[freenas/freenas] c548f62: Go through django now

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit c548f62feb03f891c2a8ce3ac66c5195fa68f4d9
Author: John Hixson <john@...>
Date:   Thu Sep 18 21:59:40 2014 -0700

    Go through django now
---
 src/freenas/etc/ix.rc.d/ix-nginx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/freenas/etc/ix.rc.d/ix-nginx b/src/freenas/etc/ix.rc.d/ix-nginx
index d36c4eb..7c8c277 100755
--- a/src/freenas/etc/ix.rc.d/ix-nginx
+++ b/src/freenas/etc/ix.rc.d/ix-nginx
 <at>  <at>  -451,8 +451,8  <at>  <at>  ix_nginx_start()
 	local httpsport=$(echo "${settings}"|cut -f5 -d"|")
 	local httpsredirect=$(echo "${settings}"|cut -f6 -d"|")

-	generate_plugins_conf
-	generate_fastcgi_params
+	#generate_plugins_conf
+	#generate_fastcgi_params

 	generate_nginx_conf "${proto}" "${addr}" "${addr6}" "${port}" "${httpsport}" "${httpsredirect}"
freenas | 19 Sep 06:52 2014

[freenas/freenas] 4b6ff8a: Exclude link local addresses

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 4b6ff8ae6b69a08080e6860b1f51787182cdff6f
Author: John Hixson <john@...>
Date:   Thu Sep 18 21:51:54 2014 -0700

    Exclude link local addresses
---
 src/pcbsd/warden/scripts/backend/functions.sh | 10 +++++----
 src/pcbsd/warden/scripts/backend/listjails.sh | 29 +++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/pcbsd/warden/scripts/backend/functions.sh b/src/pcbsd/warden/scripts/backend/functions.sh
index 5e9b489..fa309a9 100755
--- a/src/pcbsd/warden/scripts/backend/functions.sh
+++ b/src/pcbsd/warden/scripts/backend/functions.sh
 <at>  <at>  -536,7 +536,7  <at>  <at>  get_interface_ipv6_addresses()
    fi

    addrs="$(eval ${jexec} ifconfig "${iface}" | \
-      grep -w inet6 | awk '{ print $2 }')"
+      grep -w inet6 | grep -v scope | awk '{ print $2 }')"
    for addr in ${addrs} ; do
       echo "${addr}" | cut -f1 -d'%'
    done
 <at>  <at>  -584,7 +584,7  <at>  <at>  get_interface_ipv6_address()
    fi

(Continue reading)

freenas | 19 Sep 06:23 2014

[freenas/freenas] 1a1c44d: SILENCE!

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 1a1c44da0767b759766fe823777bd1ce10551757
Author: John Hixson <john@...>
Date:   Thu Sep 18 21:22:50 2014 -0700

    SILENCE!
---
 src/pcbsd/warden/scripts/backend/functions.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pcbsd/warden/scripts/backend/functions.sh b/src/pcbsd/warden/scripts/backend/functions.sh
index a7f1b33..5e9b489 100755
--- a/src/pcbsd/warden/scripts/backend/functions.sh
+++ b/src/pcbsd/warden/scripts/backend/functions.sh
 <at>  <at>  -666,8 +666,8  <at>  <at>  get_default_ipv4_route()
       jexec=""
    fi

-   eval ${jexec} route -nv show default | \
-      grep -w gateway | awk '{ print $2 }' | cut -f1 -d'%' 2>/dev/null
+   eval ${jexec} route -nv show default 2>/dev/null | \
+      grep -w gateway | awk '{ print $2 }' | cut -f1 -d'%'
 }

 get_default_ipv6_route()
 <at>  <at>  -680,8 +680,8  <at>  <at>  get_default_ipv6_route()
       jexec=""
(Continue reading)

freenas | 19 Sep 04:56 2014

[freenas/freenas] 72757df: Set to true instead of yes

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 72757dff434c2f7a371970e1c971b0916fe1dcf8
Author: John Hixson <john@...>
Date:   Thu Sep 18 18:47:31 2014 -0700

    Set to true instead of yes
---
 src/freenas/usr/local/libexec/nas/generate_smb4_conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freenas/usr/local/libexec/nas/generate_smb4_conf.py b/src/freenas/usr/local/libexec/nas/generate_smb4_conf.py
index 92067c5..918a65c 100755
--- a/src/freenas/usr/local/libexec/nas/generate_smb4_conf.py
+++ b/src/freenas/usr/local/libexec/nas/generate_smb4_conf.py
 <at>  <at>  -846,7 +846,7  <at>  <at>  def generate_smb4_shares(smb4_shares):

         confset1(smb4_shares, "nfs4:mode = special")
         confset1(smb4_shares, "nfs4:acedup = merge")
-        confset1(smb4_shares, "nfs4:chown = yes")
+        confset1(smb4_shares, "nfs4:chown = true")
         confset1(smb4_shares, "zfsacl:acesort = dontcare")

         for line in share.cifs_auxsmbconf.split('\n'):
freenas | 19 Sep 04:56 2014

[freenas/freenas] 303822b: Make plugins work with DHCP jails

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 303822b9d740a4da86862e23fd92cd1b04c462cb
Author: John Hixson <john@...>
Date:   Thu Sep 18 19:54:12 2014 -0700

    Make plugins work with DHCP jails
---
 build/nanobsd-cfg/Files/etc/rc.freenas | 24 ++++++++++++++++--------
 gui/jails/models.py                    | 16 ++++++++++++++++
 gui/jails/utils.py                     | 28 +++++++++++++++++-----------
 gui/plugins/views.py                   | 28 ++++++++++++++++++++--------
 src/freenas/etc/ix.rc.d/ix-nginx       |  2 +-
 5 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/build/nanobsd-cfg/Files/etc/rc.freenas b/build/nanobsd-cfg/Files/etc/rc.freenas
index 5ced1aa..3b11a03 100644
--- a/build/nanobsd-cfg/Files/etc/rc.freenas
+++ b/build/nanobsd-cfg/Files/etc/rc.freenas
 <at>  <at>  -382,7 +382,8  <at>  <at>  jail_get_ipv4()
 		return 1
 	fi

-	${WARDEN} list -v "${name}"|awk '/^ipv4:/ { print $2 }'
+	${WARDEN} list -v "${name}" | \
+            awk '/^ipv4:/ { print $2 }'|sed -E 's|DHCP:||'
 	return $?
 }
(Continue reading)

freenas | 19 Sep 04:56 2014

[freenas/freenas] 4f29ec6: Make winbind nss info configurable

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 4f29ec64b58b400b846a11f75fd48559b41f029e
Author: John Hixson <john@...>
Date:   Thu Sep 18 14:34:53 2014 -0700

    Make winbind nss info configurable
---
 gui/choices.py                                     |   7 +
 gui/directoryservice/forms.py                      |   1 +
 ..._auto__add_field_activedirectory_ad_nss_info.py | 226 +++++++++++++++++++++
 gui/directoryservice/models.py                     |  11 +
 .../usr/local/libexec/nas/generate_smb4_conf.py    |   4 +-
 5 files changed, 247 insertions(+), 2 deletions(-)

diff --git a/gui/choices.py b/gui/choices.py
index dce2f3c..81f5bdf 100644
--- a/gui/choices.py
+++ b/gui/choices.py
 <at>  <at>  -910,3 +910,10  <at>  <at>  class COUNTRY_CHOICES(object):
     def __iter__(self):
         return iter((c[self.__2li], c[self.__cni]) \
             for c in self.__country_list)
+
+
+NSS_INFO_CHOICES = (
+    ('sfu', 'sfu'), 
+    ('sfu20', 'sfu20'),
(Continue reading)

freenas | 19 Sep 04:56 2014

[freenas/freenas] 72e69ee: Various bits & pieces to get IPv4/IPv6 DHCP/AUTOCONF working with jails

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 72e69eedb4216b0b66a7af97c91770cfab9d05d3
Author: John Hixson <john@...>
Date:   Thu Sep 18 12:39:56 2014 -0700

    Various bits & pieces to get IPv4/IPv6 DHCP/AUTOCONF working with jails
---
 gui/freeadmin/static/lib/js/freeadmin.js       | 88 +++++++++++++++++++++++++
 gui/jails/forms.py                             | 89 +++++++++++++++-----------
 gui/jails/urls.py                              |  2 +
 gui/jails/utils.py                             | 51 ++++++++++-----
 gui/jails/views.py                             | 56 +++++++++++++---
 gui/templates/jails/edit.html                  |  2 +
 gui/templates/jails/jails_add.html             |  2 +
 src/pcbsd/warden/bin/warden                    |  7 +-
 src/pcbsd/warden/scripts/backend/createjail.sh | 26 +++++---
 src/pcbsd/warden/scripts/backend/functions.sh  | 28 ++++----
 src/pcbsd/warden/scripts/backend/listjails.sh  | 12 ++--
 src/pcbsd/warden/scripts/backend/startjail.sh  | 12 ++--
 12 files changed, 278 insertions(+), 97 deletions(-)

diff --git a/gui/freeadmin/static/lib/js/freeadmin.js b/gui/freeadmin/static/lib/js/freeadmin.js
index 27169b2..753d154 100644
--- a/gui/freeadmin/static/lib/js/freeadmin.js
+++ b/gui/freeadmin/static/lib/js/freeadmin.js
 <at>  <at>  -666,6 +666,94  <at>  <at>  require([
         }
(Continue reading)

freenas | 19 Sep 04:56 2014

[freenas/freenas] 957bd36: Add IPv4 DHCP and IPv6 Autoconf options to jails UI

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 957bd365c5f6f8959d01d3d60a75ead2e6ffe7a1
Author: John Hixson <john@...>
Date:   Wed Sep 17 22:51:28 2014 -0700

    Add IPv4 DHCP and IPv6 Autoconf options to jails UI
---
 gui/freeadmin/static/lib/js/freeadmin.js           |  38 +++++++
 gui/jails/forms.py                                 |  11 ++
 ...guration_jc_ipv4_dhcp__add_field_jailsconfig.py |  96 ++++++++++++++++++
 ...guration_jc_ipv6_network_start__chg_field_ja.py | 112 +++++++++++++++++++++
 gui/jails/models.py                                |  26 ++++-
 gui/jails/views.py                                 |  23 ++++-
 gui/middleware/notifier.py                         |   6 +-
 gui/templates/jails/index.html                     |   2 +-
 gui/templates/jails/jailsconfiguration.html        |  24 +++++
 gui/templates/jails/jailsconfiguration_edit.html   |  21 ----
 10 files changed, 325 insertions(+), 34 deletions(-)

diff --git a/gui/freeadmin/static/lib/js/freeadmin.js b/gui/freeadmin/static/lib/js/freeadmin.js
index 920067f..292ec1f 100644
--- a/gui/freeadmin/static/lib/js/freeadmin.js
+++ b/gui/freeadmin/static/lib/js/freeadmin.js
 <at>  <at>  -666,6 +666,44  <at>  <at>  require([
         }
     }

(Continue reading)

freenas | 19 Sep 04:56 2014

[freenas/freenas] d06618d: If the jail has disappeared and the mount is still up, catch the error

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit d06618dbf69c6a4c4df869d2295cf1943bada327
Author: John Hixson <john@...>
Date:   Wed Sep 17 10:32:31 2014 -0700

    If the jail has disappeared and the mount is still up, catch the error
---
 gui/jails/forms.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gui/jails/forms.py b/gui/jails/forms.py
index 8417938..e0e43cc 100644
--- a/gui/jails/forms.py
+++ b/gui/jails/forms.py
 <at>  <at>  -874,9 +874,13  <at>  <at>  class JailMountPointForm(ModelForm):
         if kwargs and 'instance' in kwargs:
             self.instance = kwargs.pop('instance')
             if not self.jail and self.instance.id:
-                self.jail = Jails.objects.filter(
-                    jail_host=self.instance.jail
-                )[0]
+                try:
+                    self.jail = Jails.objects.filter(
+                        jail_host=self.instance.jail
+                    )[0]
+                except:
+                    pass
(Continue reading)

freenas | 19 Sep 04:56 2014

[freenas/freenas] fcf00dc: Detect network settings when DHCP/Autoconfig is disabled

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit fcf00dc67be81ee51d13d7cbcb03ff97806320c7
Author: John Hixson <john@...>
Date:   Wed Sep 17 23:46:06 2014 -0700

    Detect network settings when DHCP/Autoconfig is disabled
---
 gui/freeadmin/static/lib/js/freeadmin.js | 38 +++++++++++++++++
 gui/jails/models.py                      | 15 +++++--
 gui/jails/urls.py                        |  1 +
 gui/jails/views.py                       | 71 ++++++++++++++++++++++++++++++++
 gui/middleware/notifier.py               |  8 +++-
 5 files changed, 128 insertions(+), 5 deletions(-)

diff --git a/gui/freeadmin/static/lib/js/freeadmin.js b/gui/freeadmin/static/lib/js/freeadmin.js
index 292ec1f..27169b2 100644
--- a/gui/freeadmin/static/lib/js/freeadmin.js
+++ b/gui/freeadmin/static/lib/js/freeadmin.js
 <at>  <at>  -666,6 +666,18  <at>  <at>  require([
         }
     }

+    get_jc_network_info = function()  {
+        jc_network_info = null;
+
+        xhr.get('/jails/jailsconfiguration/network/info/', {
+            sync: true
(Continue reading)


Gmane