pangea/django-orchestra
7
0
Fork 0
Code Issues 1 Pull requests 2 Packages Projects Releases Wiki Activity

Fixed sieve scripts missing compilation

Browse source
This commit is contained in:
Marc Aymerich 2015-05-20 18:21:21 +00:00
parent 21b3544895
commit 2ac063ef23
10 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
TODO.md
View file

@ -376,4 +376,5 @@ method(
arg, arg, arg)
# Restart postfix on user pwd change/disabling
# dovecot sieve only allolws one fucking active script. refactor mailbox shit to replace active script symlink by orchestra. Create a generic wrapper that includes al filters (rc, imp and orchestra)
http://wiki2.dovecot.org/Pigeonhole/Sieve/Examples

3
orchestra/contrib/domains/forms.py
View file

@ -9,7 +9,8 @@ from .models import Domain
class BatchDomainCreationAdminForm(forms.ModelForm):
name = forms.CharField(label=_("Names"), widget=forms.Textarea(attrs={'rows': 5, 'cols': 50}),
help_text=_("Domain per line. All domains will have the provided account and records."))
help_text=_("Fully qualified domain name per line. "
"All domains will have the provided account and records."))
def clean_name(self):
self.extra_names = []

3
orchestra/contrib/domains/models.py
View file

@ -247,7 +247,8 @@ class Record(models.Model):
help_text=_("Record TTL, defaults to %s") % settings.DOMAINS_DEFAULT_TTL,
validators=[validators.validate_zone_interval])
type = models.CharField(_("type"), max_length=32, choices=TYPE_CHOICES)
value = models.CharField(_("value"), max_length=256)
value = models.CharField(_("value"), max_length=256, help_text=_("MX, NS and CNAME records "
"sould end with a dot."))
def __str__(self):
return "%s %s IN %s %s" % (self.domain, self.get_ttl(), self.type, self.value)

2
orchestra/contrib/mailboxes/admin.py
View file

@ -124,7 +124,7 @@ class AddressAdmin(SelectAccountAdminMixin, ExtendedModelAdmin):
list_filter = (HasMailboxListFilter, HasForwardListFilter)
fields = ('account_link', 'email_link', 'mailboxes', 'forward')
add_fields = ('account_link', ('name', 'domain'), 'mailboxes', 'forward')
inlines = [AutoresponseInline]
# inlines = [AutoresponseInline]
search_fields = ('forward', 'mailboxes__name', 'account__username', 'computed_email')
readonly_fields = ('account_link', 'domain_link', 'email_link')
actions = (SendAddressEmail(),)

4
orchestra/contrib/mailboxes/backends.py
View file

@ -31,12 +31,14 @@ class SieveFilteringMixin(object):
""") % context
)
context['filtering_path'] = settings.MAILBOXES_SIEVE_PATH % context
context['filtering_cpath'] = re.sub(r'\.sieve$', '.svbin', context['filtering_path'])
if content:
context['filtering'] = ('# %(banner)s\n' + content) % context
self.append(textwrap.dedent("""\
mkdir -p $(dirname '%(filtering_path)s')
echo '%(filtering)s' > %(filtering_path)s
chown %(user)s:%(group)s %(filtering_path)s
sievec %(filtering_path)s
chown %(user)s:%(group)s {%(filtering_path)s,%(filtering_cpath)s}
""") % context
)
else:

7
orchestra/contrib/mailboxes/settings.py
View file

@ -28,8 +28,11 @@ MAILBOXES_HOME = Setting('MAILBOXES_HOME',
MAILBOXES_SIEVE_PATH = Setting('MAILBOXES_SIEVE_PATH',
os.path.join('%(home)s/Maildir/sieve/orchestra.sieve'),
help_text="Available fromat names: <tt>%s</tt>" % ', '.join(_names),
os.path.join('%(home)s/sieve/orchestra.sieve'),
help_text="If you are using Dovecot you can use "
"<a href='http://wiki2.dovecot.org/Pigeonhole/Sieve/Configuration#line-130'>"
"<tt>sieve_before</tt></a> in order to make sure orchestra sieve script is exectued."
"<br>Available fromat names: <tt>%s</tt>" % ', '.join(_names),
validators=[Setting.string_format_validator(_backend_names)],
)

5
orchestra/contrib/webapps/options.py
View file

@ -95,7 +95,10 @@ class Processes(AppOption):
class PHPEnableFunctions(PHPAppOption):
name = 'enable_functions'
verbose_name = _("Enable functions")
help_text = ','.join(settings.WEBAPPS_PHP_DISABLED_FUNCTIONS)
help_text = '<tt>%s</tt>' % '<br>'.join([
','.join(settings.WEBAPPS_PHP_DISABLED_FUNCTIONS[i:i+10])
for i in range(0, len(settings.WEBAPPS_PHP_DISABLED_FUNCTIONS), 10)
])
regex = r'^[\w\.,-]+$'

16
orchestra/contrib/webapps/serializers.py
View file

@ -1,3 +1,4 @@
from django.db import models
from rest_framework import serializers
from orchestra.api.serializers import HyperlinkedModelSerializer
@ -18,14 +19,27 @@ class OptionSerializer(serializers.ModelSerializer):
return data
class DataField(serializers.Field):
def to_representation(self, data):
return data
class WebAppSerializer(AccountSerializerMixin, HyperlinkedModelSerializer):
options = OptionSerializer(required=False)
data = DataField()
class Meta:
model = WebApp
fields = ('url', 'id', 'name', 'type', 'options')
fields = ('url', 'id', 'name', 'type', 'options', 'data')
postonly_fields = ('name', 'type')
def __init__(self, *args, **kwargs):
super(WebAppSerializer, self).__init__(*args, **kwargs)
if isinstance(self.instance, models.Model):
type_serializer = self.instance.type_instance.serializer
if type_serializer:
self.fields['data'] = type_serializer()
def create(self, validated_data):
options_data = validated_data.pop('options')
webapp = super(WebAppSerializer, self).create(validated_data)

2
orchestra/contrib/websites/models.py
View file

@ -31,7 +31,7 @@ class Website(models.Model):
# port = models.PositiveIntegerField(_("port"),
# choices=settings.WEBSITES_PORT_CHOICES,
# default=settings.WEBSITES_DEFAULT_PORT)
domains = models.ManyToManyField(settings.WEBSITES_DOMAIN_MODEL,
domains = models.ManyToManyField(settings.WEBSITES_DOMAIN_MODEL, blank=True,
related_name='websites', verbose_name=_("domains"))
contents = models.ManyToManyField('webapps.WebApp', through='websites.Content')
is_active = models.BooleanField(_("active"), default=True)

2
requirements.txt
View file

@ -1,4 +1,4 @@
django==1.8.1
django==1.8.2
django-celery-email==1.0.4
django-fluent-dashboard==0.5
https://github.com/glic3rinu/django-admin-tools/archive/master.zip