Fix #381: expose ports nginx listens on not services

radiasoft · Sep 4, 2023 · d8ab1ec · d8ab1ec
1 parent 8417f3f
commit d8ab1ec
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/rsconf/component/rsiviz.py b/rsconf/component/rsiviz.py
@@ -46,7 +46,7 @@ def internal_build_compile(self):
             docker_exec=f"bash {db.user_home_path(z._run_u)}/.radia-run/start",
         )
         self.buildt.get_component("network").add_public_tcp_ports(
-            (z.index_iframe_port, z.server_port)
+            (_PORTS.index_port, _PORTS.flask_port)
         )
 
     def internal_build_write(self):

diff --git a/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/etc/sysconfig/iptables b/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/etc/sysconfig/iptables
@@ -9,7 +9,7 @@
     -A INPUT -i lo -j ACCEPT
     -A INPUT -i em1 -j ACCEPT
 -A INPUT -i em2 -m state --state RELATED,ESTABLISHED -j ACCEPT
-    -A INPUT -i em2 -p tcp -m state --state NEW -m tcp --match multiport --dports 3100,3101,3102,3103,8000,8002,9999,http,pop3s,smtp,submission -j ACCEPT
+    -A INPUT -i em2 -p tcp -m state --state NEW -m tcp --match multiport --dports 3100,3101,3102,3103,8880,8882,9999,http,pop3s,smtp,submission -j ACCEPT
         -A INPUT -i em2 -s 192.168.1.0/24 -p tcp -m state --state NEW -m tcp --dport https  -j ACCEPT
         -A INPUT -i em2 -s 127.0.0.1 -p tcp -m state --state NEW -m tcp --dport https  -j ACCEPT
 -A INPUT -i em2 -m state --state INVALID -j REJECT --reject-with icmp-port-unreachable

diff --git a/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/network.sh b/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/network.sh
@@ -6,7 +6,7 @@ rsconf_install_access '444' 'root' 'root'
 rsconf_install_file '/etc/resolv.conf' 'c333a7a816c03062d4e61effd6d2a8ce'
 rsconf_install_file '/etc/sysconfig/network-scripts/ifcfg-em1' 'e225a3f7b4b071e5c204b1182c17ab94'
 rsconf_install_file '/etc/sysconfig/network-scripts/ifcfg-em2' '4f8c01335a3bf1a8a89ba5d09fdf28df'
-rsconf_install_file '/etc/sysconfig/iptables' '958f6f8fd43b50be100472adbf1369cb'
+rsconf_install_file '/etc/sysconfig/iptables' '89c09daef6c2c0095183a65d04adfded'
 network_main
 }
 #!/bin/bash