public_git
/
freenas-proxmox
mirror of https://github.com/TheGrandWazoo/freenas-proxmox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70 from TheGrandWazoo/master 

Update branch 2.0
This commit is contained in:
Kevin Scott Adams 2020-09-02 16:44:44 -04:00 committed by GitHub
parent a11d7de0c3 7c0738bab4
commit 324b893a7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1 @@
custom: "https://www.paypal.me/TheGrandWazoo69"

17
.github/workflows/action.yml vendored Normal file
View File

@ -0,0 +1,17 @@
name: Dispatch build of the freenas-proxmox plugin package
on:
push:
jobs:
dispatch:
name: Dispatch to the build and packager workflow.
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 }}"}'

21
LICENSE Normal file
View File

@ -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.

2
perl5/PVE/Storage/LunCmd/FreeNAS.pm
View File

@ -410,7 +410,7 @@ sub freenas_api_check {
} else { } else {
syslog("info", (caller(0))[3] . " : REST Client already initialized"); 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_methods = $freenas_api_version_matrix->{$freenas_api_version}->{'methods'};
$freenas_api_variables = $freenas_api_version_matrix->{$freenas_api_version}->{'variables'}; $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}; $freenas_global_config = $freenas_global_config_list->{$apihost} = (!defined($freenas_global_config_list->{$apihost})) ? freenas_iscsi_get_globalconfiguration($scfg) : $freenas_global_config_list->{$apihost};