Update GH action workflow

jamesmcm · Feb 29, 2024 · 11f8062 · 11f8062
1 parent ab194d7
commit 11f8062
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -238,7 +238,7 @@ jobs:
  with:
  upload_url: ${{ steps.create_release.outputs.upload_url }}
  asset_path: ./x86_64-musl-deb/vopono_${{needs.quickcheck.outputs.version}}_amd64.deb
- asset_name: 'vopono_${{needs.quickcheck.outputs.version}}_amd64.deb'
+ asset_name: 'vopono_${{needs.quickcheck.outputs.version}}-1_amd64.deb'
  asset_content_type: application/vnd.debian.binary-package
  - name: Upload armv7 deb Release Asset
  uses: actions/upload-release-asset@v1
@@ -247,7 +247,7 @@ jobs:
  with:
  upload_url: ${{ steps.create_release.outputs.upload_url }}
  asset_path: ./armv7-deb/vopono_${{needs.quickcheck.outputs.version}}_armhf.deb
- asset_name: 'vopono_${{needs.quickcheck.outputs.version}}_armhf.deb'
+ asset_name: 'vopono_${{needs.quickcheck.outputs.version}}-1_armhf.deb'
  asset_content_type: application/vnd.debian.binary-package
  - name: Upload armv5 deb Release Asset
  uses: actions/upload-release-asset@v1
@@ -256,7 +256,7 @@ jobs:
  with:
  upload_url: ${{ steps.create_release.outputs.upload_url }}
  asset_path: ./armv5-deb/vopono_${{needs.quickcheck.outputs.version}}_armel.deb
- asset_name: 'vopono_${{needs.quickcheck.outputs.version}}_armel.deb'
+ asset_name: 'vopono_${{needs.quickcheck.outputs.version}}-1_armel.deb'
  asset_content_type: application/vnd.debian.binary-package
  - name: Upload aarch64 deb Release Asset
  uses: actions/upload-release-asset@v1
@@ -265,7 +265,7 @@ jobs:
  with:
  upload_url: ${{ steps.create_release.outputs.upload_url }}
  asset_path: ./aarch64-deb/vopono_${{needs.quickcheck.outputs.version}}_arm64.deb
- asset_name: 'vopono_${{needs.quickcheck.outputs.version}}_arm64.deb'
+ asset_name: 'vopono_${{needs.quickcheck.outputs.version}}-1_arm64.deb'
  asset_content_type: application/vnd.debian.binary-package
  - name: Upload amd64 rpm fedora Release Asset
  uses: actions/upload-release-asset@v1

diff --git a/vopono_core/src/network/openvpn.rs b/vopono_core/src/network/openvpn.rs
@@ -50,6 +50,8 @@ impl OpenVpn {
  File::create(&log_file_str)?;
  }
 
+ // TODO: Check config file for up and down script entries and warn on their presence
+
  let config_file_path = config_file.canonicalize().context("Invalid path given")?;
  set_config_permissions()?;
  info!("Launching OpenVPN...");