Skip to content

fix(flashstart): reloading firewall instead of restarting #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Tbaile wants to merge 2 commits into from
Closed

fix(flashstart): reloading firewall instead of restarting #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0460d22
fix(reverse proxy): switch default certificate for all domains (#1403)
Tbaile Oct 22, 2025
0d0ea89
fix(flashstart): reloading firewall instead of restarting
Tbaile Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/ns-api/files/ns.reverseproxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,22 @@ elif cmd == 'call':
if data['name'] not in valid_certificates:
raise ValidationError('name', 'invalid', data['name'])

old_ssl_certificate = e_uci.get("nginx", "_lan", "ssl_certificate")
old_ssl_certificate_key = e_uci.get("nginx", "_lan", "ssl_certificate_key")

# set default certificate for _lan
e_uci.set('nginx', '_lan', 'ssl_certificate', valid_certificates[data['name']]['cert_path'])
e_uci.set('nginx', '_lan', 'ssl_certificate_key', valid_certificates[data['name']]['key_path'])
e_uci.set('nginx', '_lan', 'uci_manage_ssl', 'custom')

for domain in e_uci.get('nginx', dtype=str, list=True):
if e_uci.get('nginx', domain) != 'server':
continue
if e_uci.get('nginx', domain, 'ssl_certificate', default='') == old_ssl_certificate:
e_uci.set('nginx', domain, 'ssl_certificate', valid_certificates[data['name']]['cert_path'])
if e_uci.get('nginx', domain, 'ssl_certificate_key', default='') == old_ssl_certificate_key:
e_uci.set('nginx', domain, 'ssl_certificate_key', valid_certificates[data['name']]['key_path'])

# submit changes
e_uci.save('nginx')

Expand Down
6 changes: 2 additions & 4 deletions packages/ns-flashstart/files/ns-flashstart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,8 @@ def __save(pending_changes: bool):
if pending_dhcp:
subprocess.run(['ubus', 'call', 'uci', 'commit', json.dumps({'config': 'dhcp'})], check=True)
if pending_firewall:
# reload the firewall if changes are there, this is done cause sets are not reloaded correctly after the
# commit this 100% needs to be fixed upstream.
e_uci.commit('firewall')
subprocess.run(['fw4', 'restart'], capture_output=True)
subprocess.run(['ubus', 'call', 'uci', 'commit', json.dumps({'config': 'firewall'})], check=True)
subprocess.run(['fw4', 'reload-sets'], capture_output=True)


def __add_bypass_ipset():
Expand Down
Loading