Merge branch 'release/0.11.2' into production

* release/0.11.2:
  bump version number, add release to changelog
  fix mail forwarding setup bug
  improve documentation

README.rst

@@ -1,10 +1,17 @@
-=============
 gnuviechadmin
-=============
+-------------
 
-Customer center for gnuviech servers.
+This is the GNUViech Admin Customer Center for gnuviech servers.
+
+GNUViech Admin is a suite of tools for server management used for hosting
+customer management at `Jan Dittberner IT-Consulting & -Solutions
+<http://www.gnuviech-server.de>`_.
 
 Gnuviechadmin is based on Django_ and Celery_
 
 .. _Django: https://djangoproject.com/
 .. _Celery: http://www.celeryproject.com/
+
+The project page for gnuviechadmin is at http://dev.gnuviech-server.de/gva. If
+you find some problem or have some feature suggestions you can post a new
+ticket in our issue tracker on the project page.

docs/changelog.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+* :release:`0.11.2 <2015-02-06>`
+* :bug:`-` fix wrong variable name in
+  managemails.models.MailAddress.set_forward_addresses and typo in
+  managemails.forms.EditMailAddressForm
+
 * :release:`0.11.1 <2015-02-01>`
 * :bug:`-` fix translation of contact form by using ugettext_lazy and adding
   contact_form to INSTALLED_APPS

docs/deploy.rst

@@ -1,4 +1,11 @@
 Deploy
-========
+======
 
-This is where you describe how the project is deployed in production.
+The production deployment for gnuviechadmin is performed using saltstack and
+consists of the following steps:
+
+* installation of native dependencies
+* setup of a virtualenv
+* installation of gnuviechadmin production dependencies inside the virtualenv
+* setup of uwsgi application for the web interface
+* setup of nginx with certificates and UWSGI support

docs/ideas.rst

@@ -1,19 +1,8 @@
 Development ideas and planned features
 ======================================
 
-* password reset for
-
-  - OS users
-  - mailboxes
-
-* add ssh key management for sftp users
-
-* link to phpmyadmin and phppgadmin
-
-* link to webmail
-
-* list mail domains
-
-* CRUD for mailboxes
-
-* CRUD for mail addresses
+* add pure redirect websites
+* add management for rewrite rules
+* add accounts without SFTP (for pure mail hosting)
+* allow generation of Key and CSR, add upload of certificates for HTTPS sites
+* add XMPP management

docs/index.rst

@@ -3,20 +3,22 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
+=========================================
+Welcome to gnuviechadmin's documentation!
+=========================================
+
 .. include:: ../README.rst
 
 License
-=======
+-------
 
 gnuviechadmin is licensed under the terms of the MIT license:
 
 .. include:: ../LICENSE.txt
    :literal:
 
-Welcome to gnuviechadmin's documentation!
-=========================================
-
-Contents:
+Contents
+--------
 
 .. toctree::
    :maxdepth: 2
@@ -30,7 +32,7 @@ Contents:
 
 
 Indices and tables
-==================
+------------------
 
 * :ref:`genindex`
 * :ref:`modindex`

gnuviechadmin/gnuviechadmin/__init__.py

@@ -1,3 +1,3 @@
 from gnuviechadmin.celery import app as celery_app
 
-__version__ = '0.11.1'
+__version__ = '0.11.2'

gnuviechadmin/managemails/forms.py

@@ -290,5 +290,5 @@ class EditMailAddressForm(forms.ModelForm, MailAddressFieldMixin):
             self.instance.set_mailbox(data['mailbox'], commit)
         elif data['mailbox_or_forwards'] == MAILBOX_OR_FORWARDS.forwards:
             targets = [part.strip() for part in data['forwards'].split(',')]
-            self.instance.set_foward_addresses(targets, commit)
+            self.instance.set_forward_addresses(targets, commit)
         return self.instance

gnuviechadmin/managemails/models.py

@@ -209,13 +209,13 @@ class MailAddress(ActivateAbleMixin, TimeStampedModel, models.Model):
                     mafwd = MailAddressForward(mailaddress=self, target=target)
                     if commit:
                         mafwd.save()
-                    retval.append(item)
+                    retval.append(mafwd)
         else:
             for target in addresses:
                 mafwd = MailAddressForward(mailaddress=self, target=target)
                 if commit:
                     mafwd.save()
-                retval.append(item)
+                retval.append(mafwd)
         return retval