Commit fde53369 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent ddd03028
# XXX -> ru/lopcomm # XXX -> ru/lopcomm
{# if ru == "lopcomm" #} {# if ru == "lopcomm" #}
{% if False %} {# XXX temp disabled #} {% if True %} {# XXX temp disabled #}
dhcp-leasefile={{ directory['etc'] }}/dnsmasq.leases dhcp-leasefile={{ directory['etc'] }}/dnsmasq.leases
port=5354 port=5354
dhcp-range=::1,::1,constructor:{{ slap_configuration.get('tap-name', '') }},ra-names,64,5m dhcp-range=::1,::1,constructor:{{ slap_configuration.get('tap-name', '') }},ra-names,64,5m
......
...@@ -20,9 +20,7 @@ parts = ...@@ -20,9 +20,7 @@ parts =
sshd-add-authorized-key sshd-add-authorized-key
sshd-promise sshd-promise
{% endif %} {% endif %}
{% if slapparameter_dict.get("dnsmasq", None) %}
dnsmasq-service dnsmasq-service
{% endif %}
check-baseband-latency.py check-baseband-latency.py
check-amarisoft-stats-log.py check-amarisoft-stats-log.py
...@@ -139,7 +137,6 @@ environment = ...@@ -139,7 +137,6 @@ environment =
LD_LIBRARY_PATH={{ openssl_location }}/lib LD_LIBRARY_PATH={{ openssl_location }}/lib
AMARISOFT_PATH=/opt/amarisoft/.amarisoft AMARISOFT_PATH=/opt/amarisoft/.amarisoft
{% if slapparameter_dict.get("dnsmasq", None) %}
[dnsmasq-service] [dnsmasq-service]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
port = 5353 port = 5353
...@@ -156,7 +153,6 @@ hash-files = ...@@ -156,7 +153,6 @@ hash-files =
#name = dnsmasq-port-listening.py #name = dnsmasq-port-listening.py
#config-host = ${dnsmasq-service:ip} #config-host = ${dnsmasq-service:ip}
#config-port = ${dnsmasq-service:port} #config-port = ${dnsmasq-service:port}
{% endif %}
[xamari-xlog-script] [xamari-xlog-script]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment