Fix service name on FreeBSD/OPNsense

.github/workflows/release.yml

@@ -116,7 +116,7 @@ jobs:
           outPath: ${{ matrix.asset_name }}-${{ github.ref_name }}-${{ matrix.target }}.tar.gz
 
       - name: Upload release archive
-        uses: actions/upload-release-asset@v1.0.2
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -134,7 +134,7 @@ jobs:
 
       - name: Upload DEB
         if: matrix.build != 'freebsd'
-        uses: actions/upload-release-asset@v1.0.2
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -152,7 +152,7 @@ jobs:
 
       - name: Upload RPM
         if: matrix.build == 'linux'
-        uses: actions/upload-release-asset@v1.0.2
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -165,12 +165,16 @@ jobs:
         if: matrix.build == 'freebsd'
         uses: defGuard/fpm-action@main
         with:
-          fpm_args: "${{ matrix.asset_name }}-${{ github.ref_name }}=/usr/local/sbin/defguard-gateway defguard-gateway.service.freebsd=/usr/local/etc/rc.d/defguard-gateway example-config.toml=/etc/defguard/gateway.toml.sample defguard-rc.conf=/etc/rc.conf.d/defguard-gateway"
+          fpm_args:
+            "${{ matrix.asset_name }}-${{ github.ref_name }}=/usr/local/sbin/defguard-gateway
+            defguard-gateway.service.freebsd=/usr/local/etc/rc.d/defguard_gateway
+            example-config.toml=/etc/defguard/gateway.toml.sample
+            defguard-rc.conf=/etc/rc.conf.d/defguard_gateway"
           fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type freebsd --version ${{ env.VERSION }} --package defguard-gateway_${{ env.VERSION }}_${{ matrix.target }}.pkg --freebsd-osversion '*'"
 
       - name: Upload FreeBSD
         if: matrix.build == 'freebsd'
-        uses: actions/upload-release-asset@v1.0.2
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -185,9 +189,9 @@ jobs:
         with:
           fpm_args:
             "${{ matrix.asset_name }}-${{ github.ref_name }}=/usr/local/sbin/defguard-gateway
-            defguard-gateway.service.freebsd=/etc/rc.d/defguard-gateway
+            defguard-gateway.service.freebsd=/usr/local/etc/rc.d/defguard_gateway
             example-config.toml=/etc/defguard/gateway.toml.sample
-            defguard-rc.conf=/etc/rc.conf.d/defguard-gateway
+            defguard-rc.conf=/etc/rc.conf.d/defguard_gateway
             opnsense/src/opnsense/mvc/app/controllers/OPNsense/DefguardGateway/=/usr/local/opnsense/mvc/app/controllers/OPNsense/DefguardGateway
             opnsense/src/opnsense/mvc/app/models/OPNsense/DefguardGateway/=/usr/local/opnsense/mvc/app/models/OPNsense/DefguardGateway
             opnsense/src/opnsense/mvc/app/views/OPNsense/DefguardGateway/=usr/local/opnsense/mvc/app/views/OPNsense/DefguardGateway
@@ -197,7 +201,7 @@ jobs:
 
       - name: Upload OPNsense package
         if: matrix.build == 'freebsd'
-        uses: actions/upload-release-asset@v1.0.2
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

defguard-gateway.service.freebsd

@@ -6,13 +6,13 @@
 
 . /etc/rc.subr
 
-name="defguard-gateway"
+name="defguard_gateway"
 rcvar=defguard_gateway_enable
 command="/usr/local/sbin/defguard-gateway"
 config="/etc/defguard/gateway.toml"
 start_cmd="${name}_start"
 
-defguard_start()
+defguard_gateway_start()
 {
   ${command} --config ${config} &
 }

opnsense/src/opnsense/mvc/app/views/OPNsense/DefguardGateway/index.volt

@@ -21,12 +21,12 @@ $( document ).ready(function() {
 
     $("#startAct").click(function () {
         stdDialogConfirm(
-            '{{ lang._("Confirm gateway restart") }}',
-            '{{ lang._("Do you want to restart Defguard Gateway?") }}',
+            '{{ lang._("Confirm gateway (re)start") }}',
+            '{{ lang._("Do you want to (re)start Defguard Gateway?") }}',
             '{{ lang._("Yes") }}', '{{ lang._("Cancel") }}', function () {
                 $("#startAct").addClass("fa fa-spinner");
 				$("#responseMsg").removeClass("hidden");
-                ajaxCall(url="/api/defguardgateway/service/restart", sendData={}, callback=function(data,status) {
+                ajaxCall(url="/api/defguardgateway/service/restart", sendData={}, callback=function(data, status) {
                     $("#startAct").removeClass("fa fa-spinner fa-pulse");
     				$("#responseMsg").html(data['status']);
     				updateServiceControlUI("defguardgateway");

opnsense/src/opnsense/service/conf/actions.d/actions_defguardgateway.conf

@@ -1,23 +1,23 @@
 [start]
-command:service defguard start
+command:/usr/local/etc/rc.d/defguard_gateway start
 parameters:
 type:script
 message:starting Defguard Gateway
 
 [stop]
-command:service defguard stop
+command:/usr/local/etc/rc.d/defguard_gateway stop
 parameters:
 type:script
 message:stopping Defguard Gateway
 
 [restart]
-command:service defguard restart
+command:/usr/local/etc/rc.d/defguard_gateway restart
 parameters:
 type:script
 message:restarting Defguard Gateway
 
 [status]
-command:service defguard status
+command:/usr/local/etc/rc.d/defguard_gateway status
 parameters:
 type:script
-message:Defguard Gateway
+message:request Defguard Gateway status

opnsense/src/opnsense/service/templates/OPNsense/DefguardGateway/+TARGETS

@@ -1,2 +1,2 @@
 config.toml:/etc/defguard/gateway.toml
-rc.conf.d:/etc/rc.conf.d/defguard
+rc.conf.d:/etc/rc.conf.d/defguard_gateway

opnsense/src/opnsense/service/templates/OPNsense/DefguardGateway/rc.conf.d

@@ -1,5 +1,5 @@
 {% if helpers.exists("OPNsense.defguardgateway.general.Enabled") and OPNsense.defguardgateway.general.Enabled == '1' %}
-defguard_enable="YES"
+defguard_gateway_enable="YES"
 {% else %}
-defguard_enable="NO"
+defguard_gateway_enable="NO"
 {% endif %}