freifunk/node_hierarchy
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed issue #3.

Browse source 
Content of generated nginx file is sorted now.
This commit is contained in:
Simon Wüllhorst 2016-07-19 16:31:53 +02:00
parent adf3839da6
commit b1303a76d9
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
generator/NginxConfGen.py
View file

@ -1,5 +1,7 @@
from exceptions.HieraException import HieraException from exceptions.HieraException import HieraException
from generator.Filter import Filter from generator.Filter import Filter
from collections import OrderedDict
class NginxConfGen(object): class NginxConfGen(object):
def __init__(self, domains, args): def __init__(self, domains, args):
self.__domains__ = domains self.__domains__ = domains
@ -35,9 +37,9 @@ class NginxConfGen(object):
def __genNginxConfigFileContent__(self): def __genNginxConfigFileContent__(self):
content = '' content = ''
for k, v in self.__generatedDomains__.items(): for k, v in OrderedDict(sorted(self.__generatedDomains__.items())).items():
content += 'geo $' + k + ' {\n default 0;' content += 'geo $' + k + ' {\n default 0;'
for ksub, vsub in v.items(): for ksub, vsub in OrderedDict(sorted(v.items())).items():
for address in vsub['ipv6_addresses']: for address in vsub['ipv6_addresses']:
content += '\n ' + address + ' 1; #' + vsub['hostname'] content += '\n ' + address + ' 1; #' + vsub['hostname']
content += '\n}\n' content += '\n}\n'