Merge branch 'dev' of github.com:Eugeny/ajenti into dev

tacid · May 26, 2011 · 4805450 · 4805450
2 parents f99af29 + a7b7043
commit 4805450
Show file tree

Hide file tree

Showing 21 changed files with 25 additions and 23 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,4 @@
-ajenti (0.5-4) UNRELEASED; urgency=low
+ajenti (0.5-5) UNRELEASED; urgency=low
 
   * Initial release.
 

diff --git a/ajenti/__init__.py b/ajenti/__init__.py
@@ -1,7 +1,7 @@
 import subprocess
 
 def version():
-    release = '0.5-4'
+    release = '0.5-5'
     p = subprocess.Popen('git describe 2> /dev/null', 
             shell=True,
             stdout=subprocess.PIPE)

diff --git a/plugins/apache/__init__.py b/plugins/apache/__init__.py
@@ -16,6 +16,6 @@
 NAME = 'Apache'
 PLATFORMS = ['any']
 DESCRIPTION = 'Apache webserver control plugin'
-VERSION = '0:1.0'
+VERSION = '0:2'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/cron/__init__.py b/plugins/cron/__init__.py
@@ -10,6 +10,6 @@
 NAME = 'Cron'
 PLATFORMS = ['any']
 DESCRIPTION = 'Edit crontabs easily'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/dns/__init__.py b/plugins/dns/__init__.py
@@ -5,6 +5,6 @@
 NAME = 'DNS Servers'
 PLATFORMS = ['any']
 DESCRIPTION = 'Edit nameserver options'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/filesystems/__init__.py b/plugins/filesystems/__init__.py
@@ -5,6 +5,6 @@
 NAME = 'Filesystems'
 PLATFORMS = ['any']
 DESCRIPTION = 'Edit fstab'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/fm/__init__.py b/plugins/fm/__init__.py
@@ -5,6 +5,6 @@
 NAME = 'File manager'
 PLATFORMS = ['any']
 DESCRIPTION = 'Simple remote file manager'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/hosts/__init__.py b/plugins/hosts/__init__.py
@@ -5,6 +5,6 @@
 NAME = 'Hosts'
 PLATFORMS = ['any']
 DESCRIPTION = 'Edit hosts file'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/iptables/__init__.py b/plugins/iptables/__init__.py
@@ -10,6 +10,6 @@
 NAME = 'IP tables'
 PLATFORMS = ['debian', 'arch', 'centos', 'fedora']
 DESCRIPTION = 'Netfilter rules control plugin'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/iptables/main.py b/plugins/iptables/main.py
@@ -26,7 +26,7 @@ def on_session_start(self):
         self._editing_table = None
         self._editing_chain = None
         self._editing_rule = None
-        self._error = ''
+        self._error = None
 
     def get_ui(self):
         ui = self.app.inflate('iptables:main')
@@ -60,8 +60,10 @@ def get_ui(self):
                 vc.append(uic)
             vc.append(UI.Button(text='Add new chain to '+t.name, id='addchain/'+t.name))
             tc.add(t.name, vc)
-
-#!!!!!            put_message('err', self._error)
+
+        if self._error is not None and len(self._error) > 0:            
+            self.put_message('warn', self._error)
+            self._error = None
 
         if self._shuffling != None:
             ui.append('root', self.get_ui_shuffler())

diff --git a/plugins/lighttpd/__init__.py b/plugins/lighttpd/__init__.py
@@ -11,6 +11,6 @@
 NAME = 'lighttpd'
 PLATFORMS = ['any']
 DESCRIPTION = 'lighttpd webserver control plugin'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/logs/__init__.py b/plugins/logs/__init__.py
@@ -5,6 +5,6 @@
 NAME = 'Logs'
 PLATFORMS = ['any']
 DESCRIPTION = 'Read system logs'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/network/__init__.py b/plugins/network/__init__.py
@@ -24,6 +24,6 @@
 NAME = 'Network'
 PLATFORMS = ['arch', 'centos', 'debian', 'fedora', 'freebsd']
 DESCRIPTION = 'Network interfaces management'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/nginx/__init__.py b/plugins/nginx/__init__.py
@@ -11,6 +11,6 @@
 NAME = 'nginx'
 PLATFORMS = ['any']
 DESCRIPTION = 'nginx webserver control plugin'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/notepad/__init__.py b/plugins/notepad/__init__.py
@@ -5,6 +5,6 @@
 NAME = 'Notepad'
 PLATFORMS = ['any']
 DESCRIPTION = 'Configuration files editor'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/pkgman/__init__.py b/plugins/pkgman/__init__.py
@@ -18,6 +18,6 @@
 NAME = 'Package manager'
 PLATFORMS = ['debian', 'arch', 'freebsd', 'centos', 'fedora']
 DESCRIPTION = 'Manage software packages'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/samba/__init__.py b/plugins/samba/__init__.py
@@ -10,6 +10,6 @@
 NAME = 'Samba'
 PLATFORMS = ['any']
 DESCRIPTION = 'Control Samba server'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/squid/__init__.py b/plugins/squid/__init__.py
@@ -11,6 +11,6 @@
 NAME = 'Squid'
 PLATFORMS = ['any']
 DESCRIPTION = 'Control Squid caching proxy server'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/squid_sarg/__init__.py b/plugins/squid_sarg/__init__.py
@@ -11,6 +11,6 @@
 NAME = 'SARG'
 PLATFORMS = ['any']
 DESCRIPTION = 'Control Squid report generator'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/plugins/users/__init__.py b/plugins/users/__init__.py
@@ -5,6 +5,6 @@
 NAME = 'Users'
 PLATFORMS = ['any']
 DESCRIPTION = 'Manage user accounts'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
 AUTHOR = 'Ajenti team'
 HOMEPAGE = 'http://ajenti.org'
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='Ajenti',
-    version='0.5-4',
+    version='0.5-5',
     description='The server administration panel',
     author='Eugeny Pankov',
     author_email='e@ajenti.org',