Revision: 10682
http://freenas.svn.sourceforge.net/freenas/?rev=10682&view=rev
Author: yaberauneya
Date: 2012-03-15 09:50:14 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Merge changes from trunk in preparation for collapse
Modified Paths:
--------------
branches/8.2-nup/gui/locale/cs/LC_MESSAGES/django.po
branches/8.2-nup/gui/locale/cs/LC_MESSAGES/djangojs.po
branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po
branches/8.2-nup/gui/services/forms.py
branches/8.2-nup/gui/services/migrations/0005_auto__add_iscsitargetauthorizedinitiator__add_iscsitargetextent__add_i.py
branches/8.2-nup/gui/services/models.py
branches/8.2-nup/src/autotune/files/autotune.py
Added Paths:
-----------
branches/8.2-nup/gui/services/migrations/0061_auto__chg_field_iscsitargetglobalconfiguration_iscsi_luc_authnetwork.py
Property Changed:
----------------
branches/8.2-nup/
Property changes on: branches/8.2-nup
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:7833-7857,10603-10638,10641-10666
+ /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:7833-7857,10603-10638,10641-10666,10673-10680
Modified: branches/8.2-nup/gui/locale/cs/LC_MESSAGES/django.po
===================================================================
--- branches/8.2-nup/gui/locale/cs/LC_MESSAGES/django.po 2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/locale/cs/LC_MESSAGES/django.po 2012-03-15 09:50:14 UTC (rev 10682)
@@ -8,7 +8,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-03-06 09:48-0800\n"
-"PO-Revision-Date: 2012-01-29 07:14+0200\n"
+"PO-Revision-Date: 2012-03-14 14:37+0200\n"
"Last-Translator: lubos <lubosboucek@..."
"Language-Team: LANGUAGE <LL@..."
"Language: cs\n"
@@ -398,7 +398,7 @@
#: choices.py:502
msgid "Read and Write"
-msgstr ""
+msgstr "Čtení a zápis"
#: choices.py:506 choices.py:507
#, fuzzy, python-format
@@ -461,16 +461,15 @@
#: choices.py:529
msgid "Offline Immediate Test (ATA only)"
-msgstr ""
+msgstr "Okamžitý offline test (pouze ATA)"
#: choices.py:558
-#, fuzzy
msgid "Rsync module"
-msgstr "Asynchronní režim"
+msgstr "Rsync modul"
#: choices.py:559
msgid "Rsync over SSH"
-msgstr ""
+msgstr "Rsync přes SSH"
#: choices.py:563
msgid "Push"
@@ -1084,7 +1083,7 @@
#: network/models.py:254
msgid "Aliases"
-msgstr ""
+msgstr "Aliasy"
#: network/models.py:266 templates/network/lagg.html:5
#: templates/network/vlan.html:5
@@ -1447,7 +1446,7 @@
#: services/forms.py:392
msgid "The activedirectory service failed to reload."
-msgstr ""
+msgstr "Službě activedirectory se nepodařilo znovu načíst."
#: services/forms.py:403
msgid "The ldap service failed to reload."
@@ -1503,7 +1502,7 @@
#: services/forms.py:885 services/forms.py:940 services/models.py:492
#: services/models.py:709
msgid "The iSCSI service failed to reload."
-msgstr ""
+msgstr "Nepodařilo se znovu načíst službu iSCSI."
#: services/forms.py:510
msgid "LUN already exists in the same target."
@@ -1574,7 +1573,7 @@
#: services/forms.py:859
#, python-format
msgid "Your Group ID cannot be higher than %d"
-msgstr ""
+msgstr "Vaše skupinové ID nemůže být vyšší než %d"
#: services/forms.py:877
msgid ""
@@ -1611,7 +1610,7 @@
#: services/models.py:46
msgid "Enable Service"
-msgstr ""
+msgstr "Povolit službu"
#: services/models.py:49 services/models.py:50 services/nav.py:7
#: templates/menubar.html:28 templates/services/index.html:3
@@ -1620,7 +1619,7 @@
#: services/models.py:62
msgid "Authentication Model"
-msgstr ""
+msgstr "Ověřovací model"
#: services/models.py:63
msgid ""
@@ -1633,7 +1632,7 @@
#: services/models.py:71
msgid "Workgroup"
-msgstr ""
+msgstr "Pracovní skupina"
#: services/models.py:72
msgid ""
@@ -1647,11 +1646,11 @@
#: services/models.py:84
msgid "DOS charset"
-msgstr ""
+msgstr "DOS znaková sada"
#: services/models.py:90
msgid "UNIX charset"
-msgstr ""
+msgstr "UNIX znaková sada"
#: services/models.py:96
msgid "Log level"
@@ -1685,15 +1684,15 @@
#: services/models.py:110
msgid "Allow guest access"
-msgstr ""
+msgstr "Povolit účet hosta"
#: services/models.py:112
msgid "Only allow guest access"
-msgstr ""
+msgstr "Povolit pouze účet hosta"
#: services/models.py:115 services/models.py:959
msgid "File mask"
-msgstr ""
+msgstr "Maska souboru"
#: services/models.py:117
msgid "Use this option to override the file creation mask (0666 by default)."
@@ -1701,12 +1700,12 @@
#: services/models.py:121 services/models.py:965
msgid "Directory mask"
-msgstr ""
+msgstr "Maska adresáře"
#: services/models.py:123
msgid ""
"Use this option to override the directory creation mask (0777 by default)."
-msgstr ""
+msgstr "Použijte tuto možnost k přepsání masky (výchozí hodnota 0777)."
#: services/models.py:126
msgid "Large RW support"
Modified: branches/8.2-nup/gui/locale/cs/LC_MESSAGES/djangojs.po
===================================================================
--- branches/8.2-nup/gui/locale/cs/LC_MESSAGES/djangojs.po 2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/locale/cs/LC_MESSAGES/djangojs.po 2012-03-15 09:50:14 UTC (rev 10682)
@@ -8,7 +8,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-03-06 09:50-0800\n"
-"PO-Revision-Date: 2012-01-29 07:14+0200\n"
+"PO-Revision-Date: 2012-03-14 14:17+0200\n"
"Last-Translator: lubos <lubosboucek@..."
"Language-Team: LANGUAGE <LL@..."
"Language: cs\n"
@@ -36,7 +36,7 @@
#: freeadmin/static/lib/js/freeadmin.js:184
msgid "Plugins"
-msgstr ""
+msgstr "Moduly"
#: freeadmin/static/lib/js/freeadmin.js:215
msgid "Services"
@@ -61,7 +61,7 @@
#: freeadmin/static/lib/js/freeadmin.js:608
#: freeadmin/static/lib/js/freeadmin.js:710
msgid "Please wait..."
-msgstr ""
+msgstr "Čekejte prosím..."
#: freeadmin/static/lib/js/freeadmin.js:657
#: freeadmin/static/lib/js/freeadmin.js:775
Modified: branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po
===================================================================
--- branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po 2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/locale/tr/LC_MESSAGES/django.po 2012-03-15 09:50:14 UTC (rev 10682)
@@ -8,7 +8,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-03-06 09:46-0800\n"
-"PO-Revision-Date: 2012-03-14 07:54+0200\n"
+"PO-Revision-Date: 2012-03-15 09:06+0200\n"
"Last-Translator: Ersan <yakazan@..."
"Language-Team: LANGUAGE <LL@..."
"Language: tr\n"
@@ -562,7 +562,7 @@
#: account/forms.py:251 account/forms.py:504
msgid "SSH Public Key"
-msgstr "SSH Genel Anahtarı"
+msgstr "SSH genel anahtarı"
#: account/forms.py:256
msgid "Home Directory Mode"
@@ -1077,7 +1077,7 @@
#: network/models.py:266 templates/network/lagg.html:5
#: templates/network/vlan.html:5
msgid "Virtual Interface"
-msgstr "Sanal Arabirim"
+msgstr "Sanal arabirim"
#: network/models.py:267
msgid "Interface names must be vlanXX where XX is a number. Example: vlan0."
@@ -1768,7 +1768,7 @@
#: services/models.py:159
msgid "Unix Extensions"
-msgstr "Unix Uzantıları"
+msgstr "Unix uzantıları"
#: services/models.py:161
msgid ""
@@ -1804,7 +1804,7 @@
#: services/models.py:181
msgid "Zeroconf share discovery"
-msgstr ""
+msgstr "Sıfır ayarlama paylaşım keşfi"
#: services/models.py:183
msgid ""
@@ -1873,7 +1873,7 @@
"Enable asynchronous mode, which will help performance beyond gigabit network "
"speed."
msgstr ""
-"Gigabit ağ hızı aşan performansa yardımcı olamak için uyumsuz biçimi "
+"Gigabit ağ hızı aşan performansa yardımcı olmak için uyumsuz biçimi "
"etkinleştirin."
#: services/models.py:241 services/models.py:242
@@ -2783,7 +2783,7 @@
#: services/models.py:1178
msgid "Allow Trusted Domains"
-msgstr "İzin Verilen Güvenilir Alan Adları"
+msgstr "İzin verilen güvenilir alan adları"
#: services/models.py:1182
msgid "Administrator Name"
@@ -3156,7 +3156,7 @@
#: sharing/forms.py:81
msgid "Confirm Share Password"
-msgstr "Paylaşılan Parola Onayı"
+msgstr "Paylaşılan parola onayı"
#: sharing/forms.py:123
#, python-format
@@ -4099,7 +4099,7 @@
#: storage/models.py:625 storage/models.py:679
#: templates/storage/replications.html:20 templates/storage/tasks.html:21
msgid "Filesystem/Volume"
-msgstr "DosyaSistem/Birim"
+msgstr "Dosya Sistemi/Birim"
#: storage/models.py:630
msgid "Last snapshot sent to remote side (leave blank for full replication)"
@@ -4168,7 +4168,7 @@
#: storage/models.py:698
msgid "Do not snapshot before"
-msgstr "Önce anlık durum görüntüsünü yapmayın"
+msgstr "Daha önce anlık durum görüntüsü alma"
#: storage/models.py:702
msgid "End"
@@ -4176,7 +4176,7 @@
#: storage/models.py:703
msgid "Do not snapshot after"
-msgstr "Sonra anlık durum görüntüsünü yapmayın"
+msgstr "Daha sonra anlık durum görüntüsü alma"
#: storage/models.py:709
msgid "Interval"
@@ -4186,7 +4186,7 @@
msgid ""
"How many minutes passed before a new snapshot is made after the last one."
msgstr ""
-"Son bir yeni anlık durum görüntüsü yapılmadan önce kaç dakikada geçilecek."
+"Son bir yeni anlık durum görüntüsü yapılmadan önce ne kadar zaman geçecek."
#: storage/models.py:716
msgid "Occurrence"
@@ -4536,12 +4536,12 @@
#: system/models.py:128
#, fuzzy
msgid "NTP Server"
-msgstr "NTP sunucu 1"
+msgstr "NTP Sunucu"
#: system/models.py:129
#, fuzzy
msgid "NTP Servers"
-msgstr "NTP sunucu 1"
+msgstr "NTP Sunucu"
#: system/models.py:141
msgid "Enable Console Menu"
@@ -4779,7 +4779,7 @@
#: system/models.py:456
msgid ""
"Push - From local to remote machine. Pull - From remote to local machine."
-msgstr ""
+msgstr "Bas - Yerelden uzak makineye. Çek - Uzaktan yerel makineye."
#: system/models.py:500
msgid "Recurse into directories"
@@ -4799,7 +4799,7 @@
#: system/models.py:510
msgid "Compress data during the transfer"
-msgstr "veriyi aktarım sırasında sıkıştır"
+msgstr "Veriyi aktarım sırasında sıkıştır"
#: system/models.py:514
msgid "Archive"
@@ -6213,12 +6213,12 @@
#: templates/system/ntpserver.html:44
#, fuzzy
msgid "Add NTP server"
-msgstr "NTP sunucu 1"
+msgstr "NTP Sunucu ekle"
#: templates/system/ntpserver.html:46
#, fuzzy
msgid "Add NTP Server"
-msgstr "NTP sunucu 1"
+msgstr "NTP Sunucu Ekle"
#: templates/system/reboot_dialog.html:3
#: templates/system/shutdown_dialog.html:3
@@ -6375,7 +6375,7 @@
#: templates/system/system_info.html:34
msgid "Connected through"
-msgstr ""
+msgstr "Bağlantı adresi"
#: templates/system/tunable.html:32
#, fuzzy
Modified: branches/8.2-nup/gui/services/forms.py
===================================================================
--- branches/8.2-nup/gui/services/forms.py 2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/services/forms.py 2012-03-15 09:50:14 UTC (rev 10682)
@@ -521,11 +521,13 @@
iscsi_luc_authgroup = forms.ChoiceField(label=_("Controller Auth Group"),
help_text=_("The istgtcontrol can access the targets with correct user and secret in specific Auth Group."))
iscsi_discoveryauthgroup = forms.ChoiceField(label=_("Discovery Auth Group"))
+
class Meta:
model = models.iSCSITargetGlobalConfiguration
widgets = {
'iscsi_lucport': forms.widgets.TextInput(),
}
+
def __init__(self, *args, **kwargs):
super(iSCSITargetGlobalConfigurationForm, self).__init__(*args, **kwargs)
self.fields['iscsi_luc_authgroup'].required = False
@@ -611,6 +613,14 @@
return None
return lucgroup
+ def clean_iscsi_luc_authnetwork(self):
+ network = self.cleaned_data.get('iscsi_luc_authnetwork').strip()
+ try:
+ network = IPNetwork(network.encode('utf-8'))
+ except (NetmaskValueError, ValueError):
+ raise forms.ValidationError(_("This is not a valid network"))
+ return str(network)
+
def clean(self):
cdata = self.cleaned_data
@@ -634,6 +644,7 @@
if started is False and models.services.objects.get(srv_service='iscsitarget').srv_enable:
raise ServiceFailed("iscsitarget", _("The iSCSI service failed to reload."))
+
class iSCSITargetFileExtentForm(ModelForm):
class Meta:
model = models.iSCSITargetExtent
Modified: branches/8.2-nup/gui/services/migrations/0005_auto__add_iscsitargetauthorizedinitiator__add_iscsitargetextent__add_i.py
===================================================================
--- branches/8.2-nup/gui/services/migrations/0005_auto__add_iscsitargetauthorizedinitiator__add_iscsitargetextent__add_i.py 2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/services/migrations/0005_auto__add_iscsitargetauthorizedinitiator__add_iscsitargetextent__add_i.py 2012-03-15 09:50:14 UTC (rev 10682)
@@ -59,7 +59,7 @@
('iscsi_toggleluc', self.gf('django.db.models.fields.BooleanField')(default=False)),
('iscsi_lucip', self.gf('django.db.models.fields.CharField')(default='127.0.0.1', max_length=120)),
('iscsi_lucport', self.gf('django.db.models.fields.IntegerField')(default=3261, max_length=120)),
- ('iscsi_luc_authnetwork', self.gf('django.db.models.fields.CharField')(default='255.255.255.0', max_length=120)),
+ ('iscsi_luc_authnetwork', self.gf('django.db.models.fields.CharField')(default='127.0.0.1/8', max_length=120)),
('iscsi_luc_authmethod', self.gf('django.db.models.fields.CharField')(default='CHAP', max_length=120)),
('iscsi_luc_authgroup', self.gf('django.db.models.fields.IntegerField')(default=1, max_length=120)),
))
Copied: branches/8.2-nup/gui/services/migrations/0061_auto__chg_field_iscsitargetglobalconfiguration_iscsi_luc_authnetwork.py (from rev 10680, trunk/gui/services/migrations/0061_auto__chg_field_iscsitargetglobalconfiguration_iscsi_luc_authnetwork.py)
===================================================================
--- branches/8.2-nup/gui/services/migrations/0061_auto__chg_field_iscsitargetglobalconfiguration_iscsi_luc_authnetwork.py (rev 0)
+++ branches/8.2-nup/gui/services/migrations/0061_auto__chg_field_iscsitargetglobalconfiguration_iscsi_luc_authnetwork.py 2012-03-15 09:50:14 UTC (rev 10682)
@@ -0,0 +1,344 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+
+ # Changing field 'iSCSITargetGlobalConfiguration.iscsi_luc_authnetwork'
+ db.alter_column('services_iscsitargetglobalconfiguration', 'iscsi_luc_authnetwork', self.gf('django.db.models.fields.CharField')(max_length=120))
+
+
+ def backwards(self, orm):
+
+ # Changing field 'iSCSITargetGlobalConfiguration.iscsi_luc_authnetwork'
+ db.alter_column('services_iscsitargetglobalconfiguration', 'iscsi_luc_authnetwork', self.gf('django.db.models.fields.IPAddressField')(max_length=15))
+
+
+ models = {
+ 'network.alias': {
+ 'Meta': {'object_name': 'Alias'},
+ 'alias_interface': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['network.Interfaces']"}),
+ 'alias_v4address': ('freenasUI.contrib.IPAddressField.IP4AddressField', [], {'default': "''", 'blank': 'True'}),
+ 'alias_v4netmaskbit': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}),
+ 'alias_v6address': ('freenasUI.contrib.IPAddressField.IP6AddressField', [], {'default': "''", 'blank': 'True'}),
+ 'alias_v6netmaskbit': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'network.interfaces': {
+ 'Meta': {'ordering': "['int_interface']", 'object_name': 'Interfaces'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'int_dhcp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'int_interface': ('django.db.models.fields.CharField', [], {'max_length': '300'}),
+ 'int_ipv4address': ('freenasUI.contrib.IPAddressField.IPAddressField', [], {'default': "''", 'blank': 'True'}),
+ 'int_ipv6address': ('freenasUI.contrib.IPAddressField.IPAddressField', [], {'default': "''", 'blank': 'True'}),
+ 'int_ipv6auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'int_name': ('django.db.models.fields.CharField', [], {'max_length': "'120'"}),
+ 'int_options': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'int_v4netmaskbit': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}),
+ 'int_v6netmaskbit': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '4', 'blank': 'True'})
+ },
+ 'services.activedirectory': {
+ 'Meta': {'object_name': 'ActiveDirectory'},
+ 'ad_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ad_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ad_allow_trusted_doms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ad_dcname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ad_domainname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ad_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ad_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'services.afp': {
+ 'Meta': {'object_name': 'AFP'},
+ 'afp_srv_connections_limit': ('django.db.models.fields.IntegerField', [], {'default': '50', 'max_length': '120'}),
+ 'afp_srv_guest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'afp_srv_guest_user': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+ 'afp_srv_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'services.cifs': {
+ 'Meta': {'object_name': 'CIFS'},
+ 'cifs_srv_aio_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cifs_srv_aio_rs': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+ 'cifs_srv_aio_ws': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+ 'cifs_srv_authmodel': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+ 'cifs_srv_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'cifs_srv_dirmask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'cifs_srv_dosattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cifs_srv_doscharset': ('django.db.models.fields.CharField', [], {'default': "'CP437'", 'max_length': '120'}),
+ 'cifs_srv_easupport': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cifs_srv_filemask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'cifs_srv_guest': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+ 'cifs_srv_homedir': ('freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+ 'cifs_srv_homedir_aux': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'cifs_srv_homedir_browseable_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cifs_srv_homedir_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cifs_srv_largerw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cifs_srv_localmaster': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cifs_srv_loglevel': ('django.db.models.fields.CharField', [], {'default': "'Minimum'", 'max_length': '120'}),
+ 'cifs_srv_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'cifs_srv_nullpw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cifs_srv_sendfile': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cifs_srv_smb_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'cifs_srv_timeserver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cifs_srv_unixcharset': ('django.db.models.fields.CharField', [], {'default': "'UTF-8'", 'max_length': '120'}),
+ 'cifs_srv_unixext': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'cifs_srv_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'cifs_srv_zeroconf': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'services.dynamicdns': {
+ 'Meta': {'object_name': 'DynamicDNS'},
+ 'ddns_domain': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ddns_fupdateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ddns_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'ddns_password': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ddns_provider': ('django.db.models.fields.CharField', [], {'default': "'dyndns'", 'max_length': '120', 'blank': 'True'}),
+ 'ddns_updateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ddns_username': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'services.ftp': {
+ 'Meta': {'object_name': 'FTP'},
+ 'ftp_anonpath': ('freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+ 'ftp_anonuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'ftp_anonuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'ftp_banner': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ftp_clients': ('django.db.models.fields.PositiveIntegerField', [], {'default': '32'}),
+ 'ftp_defaultroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ftp_dirmask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+ 'ftp_filemask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+ 'ftp_fxp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ftp_ident': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ftp_ipconnections': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'ftp_localuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'ftp_localuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'ftp_loginattempt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '3'}),
+ 'ftp_masqaddress': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ftp_onlyanonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ftp_onlylocal': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ftp_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ftp_passiveportsmax': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'ftp_passiveportsmin': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'ftp_port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '21'}),
+ 'ftp_resume': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ftp_reversedns': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ftp_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ftp_ssltls': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ftp_timeout': ('django.db.models.fields.PositiveIntegerField', [], {'default': '120'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'services.iscsitarget': {
+ 'Meta': {'object_name': 'iSCSITarget'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iscsi_target_alias': ('django.db.models.fields.CharField', [], {'max_length': '120', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+ 'iscsi_target_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+ 'iscsi_target_authtype': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+ 'iscsi_target_flags': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+ 'iscsi_target_initialdigest': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+ 'iscsi_target_initiatorgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetAuthorizedInitiator']"}),
+ 'iscsi_target_logical_blocksize': ('django.db.models.fields.IntegerField', [], {'default': '512', 'max_length': '3'}),
+ 'iscsi_target_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+ 'iscsi_target_portalgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"}),
+ 'iscsi_target_queue_depth': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '3'}),
+ 'iscsi_target_serial': ('django.db.models.fields.CharField', [], {'default': "'10000001'", 'max_length': '16'}),
+ 'iscsi_target_type': ('django.db.models.fields.CharField', [], {'default': "'Disk'", 'max_length': '120'})
+ },
+ 'services.iscsitargetauthcredential': {
+ 'Meta': {'object_name': 'iSCSITargetAuthCredential'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iscsi_target_auth_peersecret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'iscsi_target_auth_peeruser': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'iscsi_target_auth_secret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'iscsi_target_auth_tag': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+ 'iscsi_target_auth_user': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+ },
+ 'services.iscsitargetauthorizedinitiator': {
+ 'Meta': {'object_name': 'iSCSITargetAuthorizedInitiator'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iscsi_target_initiator_auth_network': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+ 'iscsi_target_initiator_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'iscsi_target_initiator_initiators': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+ 'iscsi_target_initiator_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'unique': 'True'})
+ },
+ 'services.iscsitargetextent': {
+ 'Meta': {'object_name': 'iSCSITargetExtent'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iscsi_target_extent_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'iscsi_target_extent_filesize': ('django.db.models.fields.CharField', [], {'default': '0', 'max_length': '120'}),
+ 'iscsi_target_extent_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+ 'iscsi_target_extent_path': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'iscsi_target_extent_type': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+ },
+ 'services.iscsitargetglobalconfiguration': {
+ 'Meta': {'object_name': 'iSCSITargetGlobalConfiguration'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iscsi_basename': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'iscsi_defaultt2r': ('django.db.models.fields.IntegerField', [], {'default': '60', 'max_length': '120'}),
+ 'iscsi_defaultt2w': ('django.db.models.fields.IntegerField', [], {'default': '2', 'max_length': '120'}),
+ 'iscsi_discoveryauthgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+ 'iscsi_discoveryauthmethod': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+ 'iscsi_firstburst': ('django.db.models.fields.IntegerField', [], {'default': '65536', 'max_length': '120'}),
+ 'iscsi_iotimeout': ('django.db.models.fields.IntegerField', [], {'default': '30', 'max_length': '120'}),
+ 'iscsi_luc_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+ 'iscsi_luc_authmethod': ('django.db.models.fields.CharField', [], {'default': "'chap'", 'max_length': '120', 'blank': 'True'}),
+ 'iscsi_luc_authnetwork': ('django.db.models.fields.CharField', [], {'default': "'127.0.0.1/8'", 'max_length': '120', 'blank': 'True'}),
+ 'iscsi_lucip': ('django.db.models.fields.IPAddressField', [], {'default': "'127.0.0.1'", 'max_length': '15', 'blank': 'True'}),
+ 'iscsi_lucport': ('django.db.models.fields.IntegerField', [], {'default': '3261', 'null': 'True', 'blank': 'True'}),
+ 'iscsi_maxburst': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+ 'iscsi_maxconnect': ('django.db.models.fields.IntegerField', [], {'default': '8', 'max_length': '120'}),
+ 'iscsi_maxoutstandingr2t': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+ 'iscsi_maxrecdata': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+ 'iscsi_maxsesh': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+ 'iscsi_nopinint': ('django.db.models.fields.IntegerField', [], {'default': '20', 'max_length': '120'}),
+ 'iscsi_r2t': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '120'}),
+ 'iscsi_toggleluc': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+ },
+ 'services.iscsitargetportal': {
+ 'Meta': {'object_name': 'iSCSITargetPortal'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iscsi_target_portal_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'iscsi_target_portal_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '120'})
+ },
+ 'services.iscsitargetportalip': {
+ 'Meta': {'unique_together': "(('iscsi_target_portalip_ip', 'iscsi_target_portalip_port'),)", 'object_name': 'iSCSITargetPortalIP'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iscsi_target_portalip_ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
+ 'iscsi_target_portalip_port': ('django.db.models.fields.SmallIntegerField', [], {'default': '3260'}),
+ 'iscsi_target_portalip_portal': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"})
+ },
+ 'services.iscsitargettoextent': {
+ 'Meta': {'object_name': 'iSCSITargetToExtent'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iscsi_extent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetExtent']", 'unique': 'True'}),
+ 'iscsi_target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITarget']"})
+ },
+ 'services.ldap': {
+ 'Meta': {'object_name': 'LDAP'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'ldap_anonbind': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ldap_basedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ldap_groupsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ldap_hostname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ldap_machinesuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ldap_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ldap_passwordsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ldap_pwencryption': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ldap_rootbasedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ldap_rootbindpw': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ldap_ssl': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ldap_tls_cacertfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'ldap_usersuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+ },
+ 'services.nfs': {
+ 'Meta': {'object_name': 'NFS'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'nfs_srv_async': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'nfs_srv_servers': ('django.db.models.fields.PositiveIntegerField', [], {'default': '4'})
+ },
+ 'services.plugins': {
+ 'Meta': {'object_name': 'Plugins'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'jail_ip': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['network.Alias']"}),
+ 'jail_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+ 'jail_path': ('freeadmin.models.PathField', [], {'max_length': '255'}),
+ 'plugins_path': ('freeadmin.models.PathField', [], {'max_length': '255'})
+ },
+ 'services.rsyncd': {
+ 'Meta': {'object_name': 'Rsyncd'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'rsyncd_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'rsyncd_port': ('django.db.models.fields.IntegerField', [], {'default': '873'})
+ },
+ 'services.rsyncmod': {
+ 'Meta': {'ordering': "['rsyncmod_name']", 'object_name': 'RsyncMod'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'rsyncmod_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'rsyncmod_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'rsyncmod_group': ('freeadmin.models.GroupField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'}),
+ 'rsyncmod_hostsallow': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'rsyncmod_hostsdeny': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'rsyncmod_maxconn': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'rsyncmod_mode': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+ 'rsyncmod_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'rsyncmod_path': ('freeadmin.models.PathField', [], {'max_length': '255'}),
+ 'rsyncmod_user': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'})
+ },
+ 'services.services': {
+ 'Meta': {'object_name': 'services'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'srv_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'srv_service': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+ },
+ 'services.smart': {
+ 'Meta': {'object_name': 'SMART'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'smart_critical': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'smart_difference': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'smart_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'smart_informal': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'smart_interval': ('django.db.models.fields.IntegerField', [], {'default': '30'}),
+ 'smart_powermode': ('django.db.models.fields.CharField', [], {'default': "'never'", 'max_length': '60'})
+ },
+ 'services.snmp': {
+ 'Meta': {'object_name': 'SNMP'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'snmp_community': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'snmp_contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'snmp_location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'snmp_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'snmp_traps': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+ },
+ 'services.ssh': {
+ 'Meta': {'object_name': 'SSH'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'ssh_compression': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ssh_host_dsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ssh_host_dsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ssh_host_ecdsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ssh_host_ecdsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ssh_host_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ssh_host_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ssh_host_rsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ssh_host_rsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ssh_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ssh_passwordauth': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ssh_privatekey': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'blank': 'True'}),
+ 'ssh_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ssh_tcpfwd': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ssh_tcpport': ('django.db.models.fields.PositiveIntegerField', [], {})
+ },
+ 'services.tftp': {
+ 'Meta': {'object_name': 'TFTP'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'tftp_directory': ('freeadmin.models.PathField', [], {'max_length': '255'}),
+ 'tftp_newfiles': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'tftp_options': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'tftp_port': ('django.db.models.fields.PositiveIntegerField', [], {}),
+ 'tftp_umask': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'tftp_username': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'})
+ },
+ 'services.ups': {
+ 'Meta': {'object_name': 'UPS'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'ups_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ups_driver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ups_emailnotify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ups_extrausers': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'ups_identifier': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ups_masterpwd': ('django.db.models.fields.CharField', [], {'default': "'fixmepass'", 'max_length': '30'}),
+ 'ups_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'ups_port': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+ 'ups_rmonitor': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ups_shutdown': ('django.db.models.fields.CharField', [], {'default': "'batt'", 'max_length': '120'}),
+ 'ups_shutdowntimer': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ups_subject': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+ 'ups_toemail': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+ }
+ }
+
+ complete_apps = ['services']
Modified: branches/8.2-nup/gui/services/models.py
===================================================================
--- branches/8.2-nup/gui/services/models.py 2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/gui/services/models.py 2012-03-15 09:50:14 UTC (rev 10682)
@@ -348,17 +348,18 @@
blank=True,
null=True,
)
- iscsi_luc_authnetwork = models.IPAddressField(
+ iscsi_luc_authnetwork = models.CharField(
max_length=120,
- verbose_name=_("Controller Authorized netmask"),
- default = "255.255.255.0",
- help_text=_("Logical Unit Controller Authorized netmask (255.255.255.0 by default)"),
+ verbose_name=_("Controller Authorized Network"),
+ default="127.0.0.1/8",
+ help_text=_("Logical Unit Controller Authorized netmask "
+ "(127.0.0.1/8 by default)"),
blank=True,
)
iscsi_luc_authmethod = models.CharField(
max_length=120,
choices=choices.AUTHMETHOD_CHOICES,
- default = "chap",
+ default="chap",
verbose_name=_("Controller Auth Method"),
help_text=_("The method can be accepted in the controller."),
blank=True,
@@ -366,7 +367,8 @@
iscsi_luc_authgroup = models.IntegerField(
max_length=120,
verbose_name=_("Controller Auth Group"),
- help_text=_("The istgtcontrol can access the targets with correct user and secret in specific Auth Group."),
+ help_text=_("The istgtcontrol can access the targets with correct "
+ "user and secret in specific Auth Group."),
blank=True,
null=True,
)
Modified: branches/8.2-nup/src/autotune/files/autotune.py
===================================================================
--- branches/8.2-nup/src/autotune/files/autotune.py 2012-03-15 09:47:06 UTC (rev 10681)
+++ branches/8.2-nup/src/autotune/files/autotune.py 2012-03-15 09:50:14 UTC (rev 10682)
@@ -26,7 +26,11 @@
setup_environ(settings)
-from freenasUI.system.models import Advanced, Sysctl, Tunable
+try:
+ from freenasUI.system.models import Advanced, Sysctl, Tunable
+except ImportError:
+ # Not working state, abort
+ sys.exit(1)
MB = 1024 * 1024
GB = 1024 * MB
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|