Commit f748c78d authored by Jérome Perrin's avatar Jérome Perrin

erp5: include generic hostnames in $HOSTS

Otherwise, hostnames such as localhost or this machine hostname will be
resolved by DNS server.
Some DNS servers ( for example 208.67.222.222 or 8.8.8.8, but 1.1.1.1
does ) do not resolve localhost.
parent 096993a3
...@@ -71,7 +71,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0 ...@@ -71,7 +71,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = eba0b4596484dcf24b1da29ddeac453d md5sum = e34d544f41057eafaa459d65bfa04aa6
[monitor-template-dummy] [monitor-template-dummy]
filename = dummy.cfg filename = dummy.cfg
...@@ -87,7 +87,7 @@ md5sum = d1f33d406d528ae27d973e2dd0efb1ba ...@@ -87,7 +87,7 @@ md5sum = d1f33d406d528ae27d973e2dd0efb1ba
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = 3fdfbc82c450c35a9a444dfbc0a1c196 md5sum = 115e48926bdb73ca042f6b5c38bdadfa
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -171,6 +171,8 @@ context = key host_dict hosts-parameter:hostalias-dict ...@@ -171,6 +171,8 @@ context = key host_dict hosts-parameter:hostalias-dict
[hosts] [hosts]
< = jinja2-template-base < = jinja2-template-base
template = inline: {{ ' template = inline: {{ '
127.0.0.1 localhost
127.0.1.1 {% socket.getfqdn() %} {% socket.gethostname() %}
{% for alias, aliased in host_dict.items() -%} {% for alias, aliased in host_dict.items() -%}
{{ aliased }} {{ alias }} {{ aliased }} {{ alias }}
{% endfor %} {% endfor %}
......
...@@ -150,6 +150,7 @@ extra-context = ...@@ -150,6 +150,7 @@ extra-context =
import urlparse urlparse import urlparse urlparse
import hashlib hashlib import hashlib hashlib
import itertools itertools import itertools itertools
import socket socket
[dynamic-template-kumofs-parameters] [dynamic-template-kumofs-parameters]
dash-location = {{ dash_location }} dash-location = {{ dash_location }}
......
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