Modified workflows to add controller scripts to router package, added…

… fw-init.service to make install.sh router option
netfoundry · Mar 28, 2024 · eacd170 · eacd170
1 parent e0d12a2
commit eacd170
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -89,7 +89,11 @@ jobs:
         run: |
           cp -p files/services/fw-init.service ${{ steps.deb_dir.outputs.deb_dir }}/etc/systemd/system/
           cp -p files/scripts/revert_ebpf_router.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
+          cp -p files/scripts/start_ebpf_controller.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
+          cp -p files/scripts/revert_ebpf_controller.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
           chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/revert_ebpf_router.py
+          chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/start_ebpf_controller.py
+          chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/revert_ebpf_controller.py
 
       - name: Build Deb package    
         run: |
@@ -181,7 +185,11 @@ jobs:
         run: |
           cp -p files/services/fw-init.service ${{ steps.deb_dir.outputs.deb_dir }}/etc/systemd/system/
           cp -p files/scripts/revert_ebpf_router.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
+          cp -p files/scripts/start_ebpf_controller.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
+          cp -p files/scripts/revert_ebpf_controller.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
           chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/revert_ebpf_router.py
+          chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/start_ebpf_controller.py
+          chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/revert_ebpf_controller.py
 
       - name: Build Deb package    
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -85,12 +85,17 @@ jobs:
           cp -p files/bin/zfw_tunnwrapper ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
           chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/zfw_tunnwrapper
 
-      - name: Standalone FW service and router revert
+      - name: Standalone FW service, controller and router revert
         if: ${{ matrix.ziti_type == 'router' }}
         run: |
           cp -p files/services/fw-init.service ${{ steps.deb_dir.outputs.deb_dir }}/etc/systemd/system/
           cp -p files/scripts/revert_ebpf_router.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
+          cp -p files/scripts/start_ebpf_controller.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
+          cp -p files/scripts/revert_ebpf_controller.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
           chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/revert_ebpf_router.py
+          chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/start_ebpf_controller.py
+          chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/revert_ebpf_controller.py
+          
           
       - name: Build Deb package    
         run: |
@@ -177,12 +182,16 @@ jobs:
           cp -p files/bin/zfw_tunnwrapper ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
           chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/zfw_tunnwrapper
       
-      - name: Standalone FW service and router revert
+      - name: Standalone FW service, controller and router revert
         if: ${{ matrix.ziti_type == 'router' }}
         run: |
           cp -p files/services/fw-init.service ${{ steps.deb_dir.outputs.deb_dir }}/etc/systemd/system/
           cp -p files/scripts/revert_ebpf_router.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
+          cp -p files/scripts/start_ebpf_controller.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
+          cp -p files/scripts/revert_ebpf_controller.py ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/
           chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/revert_ebpf_router.py
+          chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/start_ebpf_controller.py
+          chmod 744 ${{ steps.deb_dir.outputs.deb_dir }}/opt/openziti/bin/revert_ebpf_controller.py
 
       - name: Build Deb package    
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
-# [0.5.13] - 2024-03-16
+# [0.5.13] - 2024-03-28
 
 ###
 
@@ -12,6 +12,9 @@ All notable changes to this project will be documented in this file. The format
 - Added optional logging systemd service with log rotation support
 - Updated make install.sh for controller install and logging service files
 - Removed -p from cp commands in make install.sh so files are installed as owned by root user   
+- Added fw-init-router.service for standalone firewall deployment in make install.sh
+- Updated workflows to add new / updated files
+
 # [0.5.12] - 2024-03-14
 
 ###

diff --git a/src/install.sh b/src/install.sh
@@ -52,7 +52,7 @@ then
       cp ../files/scripts/user_rules.sh.sample /opt/openziti/bin/user
       cp ../files/json/ebpf_config.json.sample /opt/openziti/etc
       cp ../files/services/ziti-wrapper.service /etc/systemd/system
-      cp ../files/services/ziti-fw-init.service /etc/systemd/system
+      cp ../files/services/fw-init.service /etc/systemd/system
       cp ../files/services/zfw-logging.service /etc/systemd/system
       chmod 744 /opt/openziti/bin/start_ebpf_tunnel.py
       chmod 744 /opt/openziti/bin/set_xdp_redirect.py