Skip to content
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.

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

Pin niroco to port 55184 and open it to incoming VPN traffic #52

Merged
merged 1 commit into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ export libdir ?= $(exec_prefix)/lib
export sbindir ?= $(exec_prefix)/sbin
export sysconfdir ?= $(prefix)/etc

export nirococonfdir ?= $(datarootdir)/niroco.d

# BINARIES #

export PYTHON ?= python3
Expand Down Expand Up @@ -99,6 +101,11 @@ install : all mkinstalldirs $(DIST_FILES)
src/ni-wireguard-labview/ni-wireguard-labview.initd \
"$(DESTDIR)/etc/init.d/ni-wireguard-labview"

# firewall configuration pieces
install --mode=0644 \
src/x-niroco-static-port.ini \
"$(DESTDIR)$(nirococonfdir)"

# install python library
for pyfile in $(PYNILRT_SNAC_FILES); do \
install -D "$${pyfile}" "$(DESTDIR)$(libdir)/$(PACKAGE)/$${pyfile}"; \
Expand All @@ -121,6 +128,7 @@ mkinstalldirs :
mkdir -p "$(DESTDIR)$(docdir)/$(PACKAGE)"
mkdir -p "$(DESTDIR)$(libdir)/$(PACKAGE)"
mkdir -p "$(DESTDIR)$(sbindir)"
mkdir -p "$(DESTDIR)$(nirococonfdir)"


uninstall :
Expand All @@ -133,3 +141,4 @@ uninstall :
rm -vf "$(DESTDIR)/etc/init.d/ni-wireguard-labview"
rm -vf "$(DESTDIR)/etc/wireguard"/wglv0.*
rm -vf "$(DESTDIR)$(sbindir)/nilrt-snac"
rm -vf "$(DESTDIR)$(nirococonfdir)/x-niroco-static-port.ini"
4 changes: 4 additions & 0 deletions nilrt_snac/_configs/_firewall_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ def configure(self, args: argparse.Namespace) -> None:
"--add-service=ni-rpc-server",
"--add-service=ni-service-locator",
)
_offlinecmd("--policy=work-in",
# Temporary port add; see x-niroco-static-port.ini
"--add-port=55184/tcp",
)
_offlinecmd("--policy=work-out",
"--add-service=amqp",
"--add-service=salt-master",
Expand Down
2 changes: 2 additions & 0 deletions src/x-niroco-static-port.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[RemoteServer]
port=55184
Loading