Fixed SRV subdomains

This commit is contained in:
Marc 2014-10-20 10:20:18 +00:00
parent 50072b756f
commit 781a873f61
5 changed files with 11 additions and 11 deletions

View File

@ -147,7 +147,7 @@ Remember that, as always with QuerySets, any subsequent chained methods which im
textwrap.dedent( \\) textwrap.dedent( \\)
* accounts * accounts
* short name / long name * short name / long name, account name really needed? address? only minimal info..
* contact inlines * contact inlines
* autocreate stuff (email/<account>.orchestra.lan/plans) * autocreate stuff (email/<account>.orchestra.lan/plans)
* account username should be domain freiendly withot lines * account username should be domain freiendly withot lines

View File

@ -98,11 +98,11 @@ class Domain(models.Model):
settings.DOMAINS_DEFAULT_MIN_CACHING_TIME settings.DOMAINS_DEFAULT_MIN_CACHING_TIME
] ]
records.insert(0, AttrDict(type=Record.SOA, value=' '.join(soa))) records.insert(0, AttrDict(type=Record.SOA, value=' '.join(soa)))
no_cname = Record.CNAME not in types is_a = not types or Record.A in types or Record.AAAA in types
if Record.MX not in types and no_cname: if Record.MX not in types and is_a:
for mx in settings.DOMAINS_DEFAULT_MX: for mx in settings.DOMAINS_DEFAULT_MX:
records.append(AttrDict(type=Record.MX, value=mx)) records.append(AttrDict(type=Record.MX, value=mx))
if (Record.A not in types and Record.AAAA not in types) and no_cname: if (Record.A not in types and Record.AAAA not in types) and is_a:
records.append(AttrDict(type=Record.A, value=settings.DOMAINS_DEFAULT_A)) records.append(AttrDict(type=Record.A, value=settings.DOMAINS_DEFAULT_A))
result = '' result = ''
for record in records: for record in records:

View File

@ -13,7 +13,7 @@ class Command(BaseCommand):
self.option_list = BaseCommand.option_list + ( self.option_list = BaseCommand.option_list + (
make_option('--username', dest='username', default='orchestra', make_option('--username', dest='username', default='orchestra',
help='Specifies the system user that would run celeryd.'), help='Specifies the system user that would run celeryd.'),
make_option('--processes', dest='processes', default=5, make_option('--processes', dest='processes', default=2,
help='Number of celeryd processes.'), help='Number of celeryd processes.'),
make_option('--noinput', action='store_false', dest='interactive', default=True, make_option('--noinput', action='store_false', dest='interactive', default=True,
help='Tells Django to NOT prompt the user for input of any kind. ' help='Tells Django to NOT prompt the user for input of any kind. '

View File

@ -34,7 +34,6 @@
<!-- Container --> <!-- Container -->
{% block container-stetic %}<div id="container">{% endblock %} {% block container-stetic %}<div id="container">{% endblock %}
{% if not is_popup %} {% if not is_popup %}
<!-- Header --> <!-- Header -->
{% block header-stetic %}<div id="header"><div id="header-wrapper">{% endblock %} {% block header-stetic %}<div id="header"><div id="header-wrapper">{% endblock %}
@ -44,13 +43,13 @@
{% block nav-global %}{% endblock %} {% block nav-global %}{% endblock %}
</div></div> </div></div>
<!-- END Header --> <!-- END Header -->
<div class="outer-breadcrumbs">{% block breadcrumbs %}<div class="breadcrumbs"><a href="{{ root_path }}">{% trans 'Home' %}</a>{% if title %} &rsaquo; {{ title }}{% endif %}</div>{% endblock %}</div> <div class="outer-breadcrumbs">{% block breadcrumbs %}<div class="breadcrumbs">{% trans 'Home' %}</div>{% endblock %}</div>
{% endif %} {% endif %}
{% block messages %} {% block messages %}
{% if messages %} {% if messages %}
<ul class="messagelist" >{% for message in messages %} <ul class="messagelist" >{% for message in messages %}
<div style="background: {% if message.tags == 'warning' %}#ffc{% else %}#dfd{% endif %} 5px .3em no-repeat;border-bottom: 1px solid #ddd;"> <div style="background: {% if message.tags == 'warning' %}#ffc{% elif message.tags == 'error' %}#ffefef{% else %}#dfd{% endif %} 5px .3em no-repeat;border-bottom: 1px solid #ddd;">
<li{% if message.tags %} class="{{ message.tags }}"{% endif %} style="max-width:1130px;margin:auto;margin-bottom:-1px;">{{ message }}</li></div> <li{% if message.tags %} class="{{ message.tags }}"{% endif %} style="max-width:1130px;margin:auto;margin-bottom:-1px;">{{ message }}</li></div>
{% endfor %}</ul> {% endfor %}</ul>
{% endif %} {% endif %}

View File

@ -19,6 +19,7 @@ echo "account = Account.objects.get(pk=1)"
ERRORS="" ERRORS=""
while read name; do while read name; do
[[ -f $name ]] && { [[ -f $name ]] && {
[[ ! $(echo "$name" | grep '/' > /dev/null ) ]] && name="./${name}"
ZONE_PATH=${name%/*} ZONE_PATH=${name%/*}
name=${name##*/} name=${name##*/}
} }