rc/friwall
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Rename networks.json to ipsets.json

Browse source 
Getting ready for some changes.
This commit is contained in:
Timotej Lazar 2023-07-06 16:28:15 +02:00
parent 1ff6c9d0d3
commit 8b8c675759
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/system.py
View file

@ -70,7 +70,7 @@ def save_config():
# Populate IP sets and translation maps for NAT. # Populate IP sets and translation maps for NAT.
ipsets = collections.defaultdict(set) ipsets = collections.defaultdict(set)
for name, network in db.read('networks').items(): for name, network in db.read('ipsets').items():
ipsets[name].update(network.get('ip', ())) ipsets[name].update(network.get('ip', ()))
ipsets[f'{name}/6'].update(network.get('ip6', ())) ipsets[f'{name}/6'].update(network.get('ip6', ()))

2
web/templates/index.html
View file

@ -6,7 +6,7 @@
<section> <section>
<dt><a href="{{ url_for('config.index') }}">Nastavitve</a> <dt><a href="{{ url_for('config.index') }}">Nastavitve</a>
<dd>nastavitve aplikacije FRIwall <dd>nastavitve aplikacije FRIwall
<dt><a href="{{ url_for('config.edit', name='networks') }}">Omrežja</a> <dt><a href="{{ url_for('config.edit', name='ipsets') }}">Obsegi IP</a>
<dd>definicije obsegov IP <dd>definicije obsegov IP
<dt><a href="{{ url_for('rules.index') }}">Urejanje pravil</a> <dt><a href="{{ url_for('rules.index') }}">Urejanje pravil</a>
<dd>pravila za posredovanje prometa <dd>pravila za posredovanje prometa