diff --git a/TODO.md b/TODO.md index a16e0a27..6dd5925e 100644 --- a/TODO.md +++ b/TODO.md @@ -60,7 +60,7 @@ * print open invoices as proforma? -* env ORCHESTRA_MASTER_SERVER='test1.orchestra.lan' ORCHESTRA_SECOND_SERVER='test2.orchestra.lan' ORCHESTRA_SLAVE_SERVER='test3.orchestra.lan' python3 manage.py test orchestra.contrib.domains.tests.functional_tests.tests:AdminBind9BackendDomainTest --nologcapture +* env ORCHESTRA_MASTER_SERVER='test1.orchestra.lan' ORCHESTRA_SECOND_SERVER='test2.orchestra.lan' ORCHESTRA_SLAVE_SERVER='test3.orchestra.lan' python3 manage.py test orchestra.contrib.domains.tests.functional_tests.tests:AdminBind9BackendDomainTest --nologcapture --keepdb * ForeignKey.swappable * Field.editable @@ -386,4 +386,26 @@ http://wiki2.dovecot.org/Pigeonhole/Sieve/Examples Bash/Python/PHPBackend -# Gandi sync domains cancelled +# bill action view on a separate process. check memory consumption without debug (236m) + +# services.handler as generator in order to save memory? not swell like a balloon +# mailboxes group username instead of mainuser + +import uwsgi +from uwsgidecorators import timer +from django.utils import autoreload + +@timer(3) +def change_code_gracefull_reload(sig): + if autoreload.code_changed(): + uwsgi.reload() +# using kill to send the signal +kill -HUP `cat /tmp/project-master.pid` +# or the convenience option --reload +uwsgi --reload /tmp/project-master.pid +# or if uwsgi was started with touch-reload=/tmp/somefile +touch /tmp/somefile + + + +# Pending vs bill(): get_billing_point() returns the next billing point, no matter if nbp > now(). pending filter filters by billed_until < now() diff --git a/orchestra/api/options.py b/orchestra/api/options.py index 1dc864db..060121ef 100644 --- a/orchestra/api/options.py +++ b/orchestra/api/options.py @@ -78,7 +78,7 @@ class LinkHeaderRouter(DefaultRouter): return viewset msg = "%s does not have a regiestered viewset" % prefix_or_model raise KeyError(msg) - + def insert(self, prefix_or_model, name, field, **kwargs): """ Dynamically add new fields to an existing serializer """ viewset = self.get_viewset(prefix_or_model) diff --git a/orchestra/contrib/mailboxes/api.py b/orchestra/contrib/mailboxes/api.py index 2d498f1e..16d926d3 100644 --- a/orchestra/contrib/mailboxes/api.py +++ b/orchestra/contrib/mailboxes/api.py @@ -10,6 +10,7 @@ from .serializers import AddressSerializer, MailboxSerializer class AddressViewSet(LogApiMixin, AccountApiMixin, viewsets.ModelViewSet): queryset = Address.objects.select_related('domain').prefetch_related('mailboxes').all() serializer_class = AddressSerializer + filter_fields = ('domain', 'mailboxes__name') class MailboxViewSet(LogApiMixin, SetPasswordApiMixin, AccountApiMixin, viewsets.ModelViewSet): diff --git a/orchestra/contrib/mailboxes/backends.py b/orchestra/contrib/mailboxes/backends.py index ccb77011..4de35c93 100644 --- a/orchestra/contrib/mailboxes/backends.py +++ b/orchestra/contrib/mailboxes/backends.py @@ -60,9 +60,6 @@ class UNIXUserMaildirBackend(SieveFilteringMixin, ServiceController): verbose_name = _("UNIX maildir user") model = 'mailboxes.Mailbox' - doc_settings = (settings, - ('MAILBOXES_USE_ACCOUNT_AS_GROUP',) - ) def save(self, mailbox): context = self.get_context(mailbox) @@ -123,10 +120,9 @@ class UNIXUserMaildirBackend(SieveFilteringMixin, ServiceController): super(UNIXUserMaildirBackend, self).commit() def get_context(self, mailbox): - account_as_group = settings.MAILBOXES_USE_ACCOUNT_AS_GROUP context = { 'user': mailbox.name, - 'group': mailbox.account.username if account_as_group else mailbox.name, + 'group': mailbox.name, 'name': mailbox.name, 'password': mailbox.password if mailbox.active else '*%s' % mailbox.password, 'home': mailbox.get_home(), diff --git a/orchestra/contrib/mailboxes/settings.py b/orchestra/contrib/mailboxes/settings.py index 49aa1361..150f9d0b 100644 --- a/orchestra/contrib/mailboxes/settings.py +++ b/orchestra/contrib/mailboxes/settings.py @@ -48,12 +48,6 @@ MAILBOXES_SIEVETEST_BIN_PATH = Setting('MAILBOXES_SIEVETEST_BIN_PATH', ) -MAILBOXES_USE_ACCOUNT_AS_GROUP = Setting('MAILBOXES_USE_ACCOUNT_AS_GROUP', - False, - help_text="Group used for system user based mailboxes. If False mailbox.name will be used as group." -) - - MAILBOXES_VIRTUAL_MAILBOX_MAPS_PATH = Setting('MAILBOXES_VIRTUAL_MAILBOX_MAPS_PATH', '/etc/postfix/virtual_mailboxes' ) @@ -81,34 +75,99 @@ MAILBOXES_PASSWD_PATH = Setting('MAILBOXES_PASSWD_PATH', ) +MAILBOXES_SPAM_SCORE_HEADER = Setting('MAILBOXES_SPAM_SCORE_HEADER', + 'X-Spam-Score' +) + + +MAILBOXES_SPAM_SCORE_SYMBOL = Setting('MAILBOXES_SPAM_SCORE_SYMBOL', + '', + help_text="Blank for numeric spam score.", +) + + MAILBOXES_MAILBOX_FILTERINGS = Setting('MAILBOXES_MAILBOX_FILTERINGS', { # value: (verbose_name, filter) 'DISABLE': (_("Disable"), ''), - 'REJECT': (mark_safe_lazy(_("Reject spam (Score≥9)")), textwrap.dedent("""\ - require ["fileinto","regex","envelope","vacation","reject","relational","comparator-i;ascii-numeric"]; - if header :value "ge" :comparator "i;ascii-numeric" "X-Spam-Score" "9" { - discard; - stop; - }""")), - 'REJECT5': (mark_safe_lazy(_("Reject spam (Score≥5)")), textwrap.dedent("""\ - require ["fileinto","regex","envelope","vacation","reject","relational","comparator-i;ascii-numeric"]; - if header :value "ge" :comparator "i;ascii-numeric" "X-Spam-Score" "5" { - discard; - stop; - }""")), - 'REDIRECT': (mark_safe_lazy(_("Archive spam (Score≥9)")), textwrap.dedent("""\ - require ["fileinto","regex","envelope","vacation","reject","relational","comparator-i;ascii-numeric"]; - if header :value "ge" :comparator "i;ascii-numeric" "X-Spam-Score" "9" { - fileinto "Spam"; - stop; - }""")), - 'REDIRECT5': (mark_safe_lazy(_("Archive spam (Score≥5)")), textwrap.dedent("""\ - require ["fileinto","regex","envelope","vacation","reject","relational","comparator-i;ascii-numeric"]; - if header :value "ge" :comparator "i;ascii-numeric" "X-Spam-Score" "5" { - fileinto "Spam"; - stop; - }""")), + 'REJECT': (mark_safe_lazy(_("Reject spam (Score≥8)")), ( + textwrap.dedent("""\ + if header :contains "%(score_header)s" "%(score_value)s" { + discard; + stop; + }""") if MAILBOXES_SPAM_SCORE_SYMBOL else + textwrap.dedent("""\ + require ["relational","comparator-i;ascii-numeric"]; + if allof ( + not header :matches "%(score_header)s" "-*", + header :value "ge" :comparator "i;ascii-numeric" "%(score_header)s" "8" ) + { + discard; + stop; + }""")) % { + 'score_header': MAILBOXES_SPAM_SCORE_HEADER, + 'score_value': MAILBOXES_SPAM_SCORE_SYMBOL*8 + } + ), + 'REJECT5': (mark_safe_lazy(_("Reject spam (Score≥5)")), ( + textwrap.dedent("""\ + if header :contains "%(score_header)s" "%(score_value)s" { + discard; + stop; + }""") if MAILBOXES_SPAM_SCORE_SYMBOL else + textwrap.dedent("""\ + require ["relational","comparator-i;ascii-numeric"]; + if allof ( + not header :matches "%(score_header)s" "-*", + header :value "ge" :comparator "i;ascii-numeric" "%(score_header)s" "5" ) + { + discard; + stop; + }""")) % { + 'score_header': MAILBOXES_SPAM_SCORE_HEADER, + 'score_value': MAILBOXES_SPAM_SCORE_SYMBOL*5 + } + ), + 'REDIRECT': (mark_safe_lazy(_("Archive spam (Score≥8)")), ( + textwrap.dedent("""\ + require "fileinto"; + if header :contains "%(score_header)s" "%(score_value)s" { + fileinto "Spam"; + stop; + }""") if MAILBOXES_SPAM_SCORE_SYMBOL else + textwrap.dedent("""\ + require ["fileinto","relational","comparator-i;ascii-numeric"]; + if allof ( + not header :matches "%(score_header)s" "-*", + header :value "ge" :comparator "i;ascii-numeric" "%(score_header)s" "8" ) + { + fileinto "Spam"; + stop; + }""")) % { + 'score_header': MAILBOXES_SPAM_SCORE_HEADER, + 'score_value': MAILBOXES_SPAM_SCORE_SYMBOL*8 + } + ), + 'REDIRECT5': (mark_safe_lazy(_("Archive spam (Score≥5)")), ( + textwrap.dedent("""\ + require "fileinto"; + if header :contains "%(score_header)s" "%(score_value)s" { + fileinto "Spam"; + stop; + }""") if MAILBOXES_SPAM_SCORE_SYMBOL else + textwrap.dedent("""\ + require ["fileinto","relational","comparator-i;ascii-numeric"]; + if allof ( + not header :matches "%(score_header)s" "-*", + header :value "ge" :comparator "i;ascii-numeric" "%(score_header)s" "5" ) + { + fileinto "Spam"; + stop; + }""")) % { + 'score_header': MAILBOXES_SPAM_SCORE_HEADER, + 'score_value': MAILBOXES_SPAM_SCORE_SYMBOL*5 + } + ), 'CUSTOM': (_("Custom filtering"), lambda mailbox: mailbox.custom_filtering), } ) diff --git a/orchestra/contrib/orders/actions.py b/orchestra/contrib/orders/actions.py index 090baa9b..0965d302 100644 --- a/orchestra/contrib/orders/actions.py +++ b/orchestra/contrib/orders/actions.py @@ -29,7 +29,10 @@ class BillSelectedOrders(object): 'queryset': queryset, 'action_checkbox_name': admin.helpers.ACTION_CHECKBOX_NAME, } - return self.set_options(request) + ret = self.set_options(request) + del(self.queryset) + del(self.context) + return ret def set_options(self, request): form = BillSelectedOptionsForm() @@ -42,7 +45,6 @@ class BillSelectedOrders(object): proforma=form.cleaned_data['proforma'], new_open=form.cleaned_data['new_open'], ) - print(self.options) if int(request.POST.get('step')) != 3: return self.select_related(request) else: @@ -142,4 +144,3 @@ def mark_as_not_ignored(modeladmin, request, queryset): _("%i selected orders have been marked as not ignored.") % num, num) modeladmin.message_user(request, msg) - diff --git a/orchestra/contrib/orders/forms.py b/orchestra/contrib/orders/forms.py index 2cdde9f8..c0d436bf 100644 --- a/orchestra/contrib/orders/forms.py +++ b/orchestra/contrib/orders/forms.py @@ -44,6 +44,7 @@ class BillSelectRelatedForm(AdminFormMixin, forms.Form): # initial=False, required=False, help_text=_("The price may vary " # "depending on the billed orders. This options designates whether " # "all existing orders will be used for price computation or not.")) + select_all = forms.BooleanField(label=_("Select all"), required=False) selected_related = forms.ModelMultipleChoiceField(label=_("Related orders"), queryset=Order.objects.none(), widget=forms.CheckboxSelectMultiple, required=False) diff --git a/orchestra/contrib/orders/templates/admin/orders/order/bill_selected_options.html b/orchestra/contrib/orders/templates/admin/orders/order/bill_selected_options.html index 18222cad..0408c3c1 100644 --- a/orchestra/contrib/orders/templates/admin/orders/order/bill_selected_options.html +++ b/orchestra/contrib/orders/templates/admin/orders/order/bill_selected_options.html @@ -12,6 +12,20 @@ {% endblock %} +{% block extrahead %} +{{ block.super }} + + + +{% endblock %} {% block breadcrumbs %}
diff --git a/orchestra/contrib/plans/ratings.py b/orchestra/contrib/plans/ratings.py index d9a69903..ec8d9494 100644 --- a/orchestra/contrib/plans/ratings.py +++ b/orchestra/contrib/plans/ratings.py @@ -24,7 +24,7 @@ def _compute_steps(rates, metric): quantity = metric - accumulated next_barrier = quantity else: - quantity = rates[ix+1].quantity - rates[ix].quantity + quantity = rates[ix+1].quantity - max(rates[ix].quantity, 1) next_barrier = quantity if rates[ix+1].price > rates[ix].price: quantity *= fold @@ -52,13 +52,13 @@ def _standardize(rates): std_rates = [] minimal = rates[0].quantity for rate in rates: - if rate.quantity == 0: - rate.quantity = 1 - elif rate.quantity == minimal and rate.quantity > 1: + #if rate.quantity == 0: + # rate.quantity = 1 + if rate.quantity == minimal and rate.quantity > 0: service = rate.service rate_class = type(rate) std_rates.append( - rate_class(service=service, plan=rate.plan, quantity=1, price=service.nominal_price) + rate_class(service=service, plan=rate.plan, quantity=0, price=service.nominal_price) ) std_rates.append(rate) return std_rates diff --git a/orchestra/contrib/resources/admin.py b/orchestra/contrib/resources/admin.py index 46d8c3ca..4679b8b2 100644 --- a/orchestra/contrib/resources/admin.py +++ b/orchestra/contrib/resources/admin.py @@ -1,7 +1,8 @@ from django.conf.urls import url from django.contrib import admin, messages +from django.contrib.contenttypes.admin import GenericTabularInline +from django.contrib.contenttypes.forms import BaseGenericInlineFormSet from django.contrib.admin.utils import unquote -from django.contrib import contenttypes from django.core.urlresolvers import reverse from django.shortcuts import redirect from django.utils.functional import cached_property @@ -185,7 +186,7 @@ admin.site.register(MonitorData, MonitorDataAdmin) # Mokey-patching def resource_inline_factory(resources): - class ResourceInlineFormSet(contenttypes.forms.BaseGenericInlineFormSet): + class ResourceInlineFormSet(BaseGenericInlineFormSet): def total_form_count(self, resources=resources): return len(resources) @@ -225,7 +226,7 @@ def resource_inline_factory(resources): forms.append(self._construct_form(i, resource=resource)) return forms - class ResourceInline(contenttypes.admin.GenericTabularInline): + class ResourceInline(GenericTabularInline): model = ResourceData verbose_name_plural = _("resources") form = ResourceForm diff --git a/orchestra/contrib/services/handlers.py b/orchestra/contrib/services/handlers.py index b2ce7d4c..ab1645f4 100644 --- a/orchestra/contrib/services/handlers.py +++ b/orchestra/contrib/services/handlers.py @@ -136,8 +136,8 @@ class ServiceHandler(plugins.Plugin, metaclass=plugins.PluginMount): return eval(self.order_description, safe_locals) def get_billing_point(self, order, bp=None, **options): - not_cachable = self.billing_point == self.FIXED_DATE and options.get('fixed_point') - if not_cachable or bp is None: + cachable = bool(self.billing_point == self.FIXED_DATE and not options.get('fixed_point')) + if not cachable or bp is None: bp = options.get('billing_point') or timezone.now().date() if not options.get('fixed_point'): msg = ("Support for '%s' period and '%s' point is not implemented" diff --git a/orchestra/contrib/services/tests/functional_tests/test_domain.py b/orchestra/contrib/services/tests/functional_tests/test_domain.py index 990b39a1..423a166e 100644 --- a/orchestra/contrib/services/tests/functional_tests/test_domain.py +++ b/orchestra/contrib/services/tests/functional_tests/test_domain.py @@ -25,7 +25,7 @@ class DomainBillingTest(BaseTestCase): nominal_price=10 ) plan = Plan.objects.create(is_default=True, name='Default') - service.rates.create(plan=plan, quantity=1, price=0) + service.rates.create(plan=plan, quantity=0, price=0) service.rates.create(plan=plan, quantity=2, price=10) service.rates.create(plan=plan, quantity=4, price=9) service.rates.create(plan=plan, quantity=6, price=6) diff --git a/orchestra/contrib/services/tests/functional_tests/test_traffic.py b/orchestra/contrib/services/tests/functional_tests/test_traffic.py index cc27a06a..d435a8a1 100644 --- a/orchestra/contrib/services/tests/functional_tests/test_traffic.py +++ b/orchestra/contrib/services/tests/functional_tests/test_traffic.py @@ -19,6 +19,7 @@ class FTPTrafficMonitor(ServiceMonitor): class BaseTrafficBillingTest(BaseTestCase): TRAFFIC_METRIC = 'account.resources.traffic.used' + DEPENDENCIES = ('orchestra.contrib.resources',) def create_traffic_service(self): service = Service.objects.create( diff --git a/orchestra/contrib/settings/admin.py b/orchestra/contrib/settings/admin.py index 27a94be1..a145d58b 100644 --- a/orchestra/contrib/settings/admin.py +++ b/orchestra/contrib/settings/admin.py @@ -67,11 +67,10 @@ class SettingView(generic.edit.FormView): context = self.get_context_data(form=form) context['diff'] = diff return self.render_to_response(context) - + n = len(changes) # Save changes parser.save(changes) sys.touch_wsgi() - n = len(changes) context = { 'message': ngettext( _("One change successfully applied, orchestra is being restarted."), diff --git a/orchestra/contrib/settings/parser.py b/orchestra/contrib/settings/parser.py index 66885570..07c3345e 100644 --- a/orchestra/contrib/settings/parser.py +++ b/orchestra/contrib/settings/parser.py @@ -1,4 +1,5 @@ import ast +import copy import os import re @@ -98,6 +99,7 @@ def apply(changes, settings_file=get_settings_file()): """ returns settings_file content with applied changes """ updates = _find_updates(changes, settings_file) content = [] + _changes = copy.copy(changes) inside = False lineno = None if updates: @@ -107,7 +109,7 @@ def apply(changes, settings_file=get_settings_file()): for num, line in enumerate(handler.readlines(), 1): line = line.rstrip() if num == lineno: - value = changes.pop(name) + value = _changes.pop(name) line = _format_setting(name, value) if line: content.append(line) @@ -134,7 +136,7 @@ def apply(changes, settings_file=get_settings_file()): inside = False # insert new variables at the end of file - for name, value in changes.items(): + for name, value in _changes.items(): content.append(_format_setting(name, value)) return '\n'.join(content) diff --git a/orchestra/contrib/settings/templates/admin/settings/reload.html b/orchestra/contrib/settings/templates/admin/settings/reload.html index 751a4be1..3c6cd609 100644 --- a/orchestra/contrib/settings/templates/admin/settings/reload.html +++ b/orchestra/contrib/settings/templates/admin/settings/reload.html @@ -17,7 +17,7 @@ right: 0; margin: auto; margin-top: 100px; - } + } .alert-box span { font-weight:bold; text-transform:uppercase; @@ -41,14 +41,14 @@ count--; } } - var count = 4; + var count = 3; var timer = setInterval(function() { handleTimer(count); }, 1000); - +
-
notice: {{ message }}
Refreshing in 5.
+
notice: {{ message }}
Refreshing in 2.
diff --git a/orchestra/contrib/webapps/backends/php.py b/orchestra/contrib/webapps/backends/php.py index 8bf483e4..1af396cc 100644 --- a/orchestra/contrib/webapps/backends/php.py +++ b/orchestra/contrib/webapps/backends/php.py @@ -142,7 +142,11 @@ class PHPBackend(WebAppServiceMixin, ServiceController): } if [[ $is_last -eq 1 ]]; then if [[ $UPDATED_APACHE -eq 1 || "$state" =~ .*RESTART$ ]]; then - service apache2 status && service apache2 reload || service apache2 start + if [[ $(service apache2 status) ]]; then + service apache2 reload + else + service apache2 start + fi fi rm /dev/shm/restart.apache2.locked else diff --git a/orchestra/contrib/websites/api.py b/orchestra/contrib/websites/api.py index af4d7fb3..bf0d1fe0 100644 --- a/orchestra/contrib/websites/api.py +++ b/orchestra/contrib/websites/api.py @@ -11,7 +11,7 @@ from .serializers import WebsiteSerializer class WebsiteViewSet(LogApiMixin, AccountApiMixin, viewsets.ModelViewSet): queryset = Website.objects.prefetch_related('domains', 'content_set__webapp', 'directives').all() serializer_class = WebsiteSerializer - filter_fields = ('name',) + filter_fields = ('name', 'domains__name') def options(self, request): metadata = super(WebsiteViewSet, self).options(request) diff --git a/orchestra/contrib/websites/backends/apache.py b/orchestra/contrib/websites/backends/apache.py index c2b19fee..83deb1f5 100644 --- a/orchestra/contrib/websites/backends/apache.py +++ b/orchestra/contrib/websites/backends/apache.py @@ -67,7 +67,8 @@ class Apache2Backend(ServiceController): SuexecUserGroup {{ user }} {{ group }}\ {% for line in extra_conf.splitlines %} {{ line | safe }}{% endfor %} - """) + + """) ).render(Context(context)) def render_redirect_https(self, context): @@ -84,7 +85,8 @@ class Apache2Backend(ServiceController): RewriteEngine On RewriteCond %{HTTPS} off RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} - """) + + """) ).render(Context(context)) def save(self, site): @@ -111,7 +113,7 @@ class Apache2Backend(ServiceController): }""") % context ) if context['server_name'] and site.active: - self.append(textwrap.dedent("""\ + self.append(textwrap.dedent(""" # Enable site %(site_name)s if [[ ! -f %(sites_enabled)s ]]; then a2ensite %(site_unique_name)s.conf @@ -119,7 +121,7 @@ class Apache2Backend(ServiceController): fi""") % context ) else: - self.append(textwrap.dedent("""\ + self.append(textwrap.dedent(""" # Disable site %(site_name)s if [[ -f %(sites_enabled)s ]]; then a2dissite %(site_unique_name)s.conf; @@ -160,7 +162,11 @@ class Apache2Backend(ServiceController): } if [[ $is_last -eq 1 ]]; then if [[ $UPDATED_APACHE -eq 1 || "$state" =~ .*RESTART$ ]]; then - service apache2 status && service apache2 reload || service apache2 start + if [[ $(service apache2 status) ]]; then + service apache2 reload + else + service apache2 start + fi fi rm /dev/shm/restart.apache2.locked else diff --git a/orchestra/utils/sys.py b/orchestra/utils/sys.py index f21e34a2..ba631535 100644 --- a/orchestra/utils/sys.py +++ b/orchestra/utils/sys.py @@ -212,6 +212,6 @@ class LockFile(object): self.release() -def touch_wsgi(delay=5): +def touch_wsgi(delay=0): from . import paths run('{ sleep %i && touch %s/wsgi.py; } &' % (delay, paths.get_project_dir()), async=True)