From 78a11055f3c6d688e50166dcb1aebf617abaa8b2 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 4 Feb 2015 00:46:21 +0100 Subject: [PATCH 1/3] improve documentation - add better README.rst - improve structure of docs/index.rst - add some words about deployment - remove old implemented ideas and add some new ideas --- README.rst | 13 ++++++++++--- docs/deploy.rst | 11 +++++++++-- docs/ideas.rst | 21 +++++---------------- docs/index.rst | 14 ++++++++------ 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/README.rst b/README.rst index 8aad2f0..3d7e316 100644 --- a/README.rst +++ b/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 +`_. 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. diff --git a/docs/deploy.rst b/docs/deploy.rst index 1e642c7..7b5f4fa 100644 --- a/docs/deploy.rst +++ b/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 diff --git a/docs/ideas.rst b/docs/ideas.rst index 8f5a9b0..46a7721 100644 --- a/docs/ideas.rst +++ b/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 diff --git a/docs/index.rst b/docs/index.rst index a151e54..a4707d9 100644 --- a/docs/index.rst +++ b/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` From 2af30d61487ea41c253f35e8210b2282ee21fbc9 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Fri, 6 Feb 2015 11:17:03 +0100 Subject: [PATCH 2/3] fix mail forwarding setup bug - fix wrong variable name in managemails.models.MailAddress.set_forward_addresses and typo in managemails.forms.EditMailAddressForm --- docs/changelog.rst | 4 ++++ gnuviechadmin/managemails/forms.py | 2 +- gnuviechadmin/managemails/models.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 715df28..aa04832 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,10 @@ Changelog ========= +* :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 diff --git a/gnuviechadmin/managemails/forms.py b/gnuviechadmin/managemails/forms.py index baa6273..bd6a056 100644 --- a/gnuviechadmin/managemails/forms.py +++ b/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 diff --git a/gnuviechadmin/managemails/models.py b/gnuviechadmin/managemails/models.py index f818b87..397189e 100644 --- a/gnuviechadmin/managemails/models.py +++ b/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 From 9cab6363513965a689300e7fdfb13ecde9efda6d Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Fri, 6 Feb 2015 11:20:47 +0100 Subject: [PATCH 3/3] bump version number, add release to changelog --- docs/changelog.rst | 1 + gnuviechadmin/gnuviechadmin/__init__.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index aa04832..8249f7c 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,7 @@ 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 diff --git a/gnuviechadmin/gnuviechadmin/__init__.py b/gnuviechadmin/gnuviechadmin/__init__.py index a34637d..47f224e 100644 --- a/gnuviechadmin/gnuviechadmin/__init__.py +++ b/gnuviechadmin/gnuviechadmin/__init__.py @@ -1,3 +1,3 @@ from gnuviechadmin.celery import app as celery_app -__version__ = '0.11.1' +__version__ = '0.11.2'