From 1570f3cb6076bdb6b8b67cbfe7488b5418413cef Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 27 Aug 2020 13:46:54 -0400 Subject: [PATCH 01/13] Create FUNDING.yml --- .github/FUNDING.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..4b16f59 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] From c23f037ab66d6f7066595afc0fda97ba1362e213 Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 27 Aug 2020 13:47:03 -0400 Subject: [PATCH 02/13] Create FUNDING.yml --- FUNDING.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 FUNDING.yml diff --git a/FUNDING.yml b/FUNDING.yml new file mode 100644 index 0000000..050e818 --- /dev/null +++ b/FUNDING.yml @@ -0,0 +1,4 @@ +# These are supported funding model platforms + +github: [TheGrandWazoo] + From 4c8564908e91085d7997b252a4b5e6c266dcce33 Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 27 Aug 2020 13:53:15 -0400 Subject: [PATCH 03/13] Update FUNDING.yml --- FUNDING.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/FUNDING.yml b/FUNDING.yml index 050e818..3cba436 100644 --- a/FUNDING.yml +++ b/FUNDING.yml @@ -1,4 +1,3 @@ -# These are supported funding model platforms - github: [TheGrandWazoo] +custom: ["https://www.paypal.me/TheGrandWazoo69", ksatechnologies.com] From 37e1da70aa606c6cead331b2daeab1d249ae0695 Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 27 Aug 2020 13:54:51 -0400 Subject: [PATCH 04/13] Update FUNDING.yml --- FUNDING.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FUNDING.yml b/FUNDING.yml index 3cba436..f3e13aa 100644 --- a/FUNDING.yml +++ b/FUNDING.yml @@ -1,3 +1,3 @@ -github: [TheGrandWazoo] -custom: ["https://www.paypal.me/TheGrandWazoo69", ksatechnologies.com] +github: TheGrandWazoo +custom: "https://www.paypal.me/TheGrandWazoo69" From 1356c4fad92b318ed260f168d23deb0f3c366015 Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 27 Aug 2020 13:57:51 -0400 Subject: [PATCH 05/13] Update FUNDING.yml --- FUNDING.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FUNDING.yml b/FUNDING.yml index f3e13aa..340adba 100644 --- a/FUNDING.yml +++ b/FUNDING.yml @@ -1,3 +1,3 @@ -github: TheGrandWazoo -custom: "https://www.paypal.me/TheGrandWazoo69" +github: [TheGrandWazoo] +custom: ["https://www.paypal.me/TheGrandWazoo69"] From 40c0dcff93b31bb9de551abe8309979c152db301 Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 27 Aug 2020 14:00:02 -0400 Subject: [PATCH 06/13] Update FUNDING.yml --- FUNDING.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/FUNDING.yml b/FUNDING.yml index 340adba..ef5977c 100644 --- a/FUNDING.yml +++ b/FUNDING.yml @@ -1,3 +1 @@ -github: [TheGrandWazoo] custom: ["https://www.paypal.me/TheGrandWazoo69"] - From 3f82fd8782f2379af124546344d39a2819fb17e1 Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 27 Aug 2020 15:05:27 -0400 Subject: [PATCH 07/13] Delete FUNDING.yml --- FUNDING.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 FUNDING.yml diff --git a/FUNDING.yml b/FUNDING.yml deleted file mode 100644 index ef5977c..0000000 --- a/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -custom: ["https://www.paypal.me/TheGrandWazoo69"] From e43ad9a94f97ca9f0925488eb25d7d520ac1dc9b Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 27 Aug 2020 15:06:04 -0400 Subject: [PATCH 08/13] Update FUNDING.yml --- .github/FUNDING.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 4b16f59..ea515db 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,12 +1,2 @@ -# These are supported funding model platforms - -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username -ko_fi: # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] +github: TheGrandWazoo +custom: "https://www.paypal.me/TheGrandWazoo69" From 13a93e653ba9744d780775e9b83fd9848e12fce1 Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 27 Aug 2020 15:10:14 -0400 Subject: [PATCH 09/13] Update FUNDING.yml --- .github/FUNDING.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index ea515db..da892ac 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1 @@ -github: TheGrandWazoo custom: "https://www.paypal.me/TheGrandWazoo69" From 06da4b488a32403f0e14af36e0a573b4b9c0808f Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 27 Aug 2020 15:16:14 -0400 Subject: [PATCH 10/13] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2a7bcd0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Kevin Scott Adams + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From a6e9229677f14524b0920959a9340de661b486f0 Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Fri, 28 Aug 2020 15:22:01 -0400 Subject: [PATCH 11/13] New build process - Testing the github actions to build the debian package. --- .github/workflows/action.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/action.yml diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml new file mode 100644 index 0000000..9bed970 --- /dev/null +++ b/.github/workflows/action.yml @@ -0,0 +1,17 @@ +name: Dispatch build of the freenas-proxmox plugin package + +on: + push: + +jobs: + dispatch: + name: Dispatch to build the package + runs-on: ubuntu-latest + steps: + - name: Send dispatch request to 'freenas-proxmox-packer' repo. + uses: peter-evans/repository-dispatch@v1 + with: + token: ${{ secrets.ACCESS_TOKEN }} + repository: TheGrandWazoo/freenas-proxmox-packer + event-type: build_push + client-payload: '{"ref" : "${{ github.ref }}", "sha": "${{ github.sha }}"}' From 3dd67fbf578bfda7f2d859be83c70602e7d2670c Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Tue, 1 Sep 2020 21:16:11 -0400 Subject: [PATCH 12/13] Trying GitVersioning - See if I can make a version number on builds using a premade action. --- .github/workflows/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 9bed970..35b9cfd 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -2,10 +2,12 @@ name: Dispatch build of the freenas-proxmox plugin package on: push: + branches: + - master jobs: dispatch: - name: Dispatch to build the package + name: Dispatch to the build and packager workflow. runs-on: ubuntu-latest steps: - name: Send dispatch request to 'freenas-proxmox-packer' repo. From 7c0738bab4ebb50d8c23905740c049f4ddfb8073 Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Wed, 2 Sep 2020 16:37:24 -0400 Subject: [PATCH 13/13] Added a space to kick off a build. - Checking the build of branch 2.0. --- .github/workflows/action.yml | 2 -- perl5/PVE/Storage/LunCmd/FreeNAS.pm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 35b9cfd..5d11233 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -2,8 +2,6 @@ name: Dispatch build of the freenas-proxmox plugin package on: push: - branches: - - master jobs: dispatch: diff --git a/perl5/PVE/Storage/LunCmd/FreeNAS.pm b/perl5/PVE/Storage/LunCmd/FreeNAS.pm index c3d3159..31b6c6c 100644 --- a/perl5/PVE/Storage/LunCmd/FreeNAS.pm +++ b/perl5/PVE/Storage/LunCmd/FreeNAS.pm @@ -410,7 +410,7 @@ sub freenas_api_check { } else { syslog("info", (caller(0))[3] . " : REST Client already initialized"); } - syslog("info", (caller(0))[3] . " : Using " . $product_name ." API version " . $freenas_api_version); + syslog("info", (caller(0))[3] . " : Using " . $product_name . " API version " . $freenas_api_version); $freenas_api_methods = $freenas_api_version_matrix->{$freenas_api_version}->{'methods'}; $freenas_api_variables = $freenas_api_version_matrix->{$freenas_api_version}->{'variables'}; $freenas_global_config = $freenas_global_config_list->{$apihost} = (!defined($freenas_global_config_list->{$apihost})) ? freenas_iscsi_get_globalconfiguration($scfg) : $freenas_global_config_list->{$apihost};