Skip to content

Commit a1756a3

Browse files
committed
Removed old legacy patches, cleaned up repo, added new V2 API Authentication
1 parent 9021ec2 commit a1756a3

File tree

90 files changed

+351
-11393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+351
-11393
lines changed

.github/FUNDING.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Number of days of inactivity before an issue becomes stale
2-
daysUntilStale: 60
2+
daysUntilStale: 90
33
# Number of days of inactivity before a stale issue is closed
4-
daysUntilClose: 7
4+
daysUntilClose: 30
55
# Issues with these labels will never be considered stale
66
exemptLabels:
77
- pinned

.github/workflows/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
uses: peter-evans/repository-dispatch@v1
1313
with:
1414
token: ${{ secrets.ACCESS_TOKEN }}
15-
repository: TheGrandWazoo/freenas-proxmox-packer
15+
repository: eCiceron/freenas-proxmox-packer
1616
event-type: build_push
1717
client-payload: '{"ref" : "${{ github.ref }}", "sha": "${{ github.sha }}"}'

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# TrueNAS ZFS over iSCSI interface [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TCLNEMBUYQUXN&source=url)
22

3-
### Updates 2022-06-04<br/> - New Repos available. See [!ATTENTION!](#NewRepo) below.<br/> - Support for TrueNAS 13 is available<br/> - Patched for issues with TrueNAS-Scale paths that had more then one level (e.g. Tank/Disk/vDisks) when converting slashes to dashes.
4-
#### Roadmap
3+
### Modified by eCiceron AB 2023-01-24
4+
* Added support for new V2 Authentication token
5+
- Jim Nelin ([email protected])
6+
7+
## Updates 2022-06-04<br/> - New Repos available. See [!ATTENTION!](#NewRepo) below.<br/> - Support for TrueNAS 13 is available<br/> - Patched for issues with TrueNAS-Scale paths that had more then one level (e.g. Tank/Disk/vDisks) when converting slashes to dashes.
8+
### Roadmap
59
* Fix automated builds.
610
* Beta - 'testing' repo component.
711
* Production - 'main' repo component.

perl5/PVE/Storage/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
/ZFSPlugin.pm
22
/ZFSPoolPlugin.pm
3-
/ZFSPlugin-new.pm
4-
/ZFSPlugin-newver.patch

perl5/PVE/Storage/LunCmd/FreeNAS.pm

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,10 @@ sub run_lun_command {
128128

129129
syslog("info",(caller(0))[3] . " : $method(@params)");
130130

131-
if(!defined($scfg->{'freenas_user'}) || !defined($scfg->{'freenas_password'})) {
132-
die "Undefined freenas_user and/or freenas_password.";
131+
if (!defined($scfg->{'freenas_api_token'})) {
132+
if(!defined($scfg->{'freenas_user'}) || !defined($scfg->{'freenas_password'})) {
133+
die "Undefined freenas_user and/or freenas_password.";
134+
}
133135
}
134136

135137
if (!defined $freenas_server_list->{defined($scfg->{freenas_apiv4_host}) ? $scfg->{freenas_apiv4_host} : $scfg->{portal}}) {
@@ -341,7 +343,14 @@ sub freenas_api_connect {
341343
}
342344
$freenas_server_list->{$apihost}->setHost($scheme . '://' . $apihost);
343345
$freenas_server_list->{$apihost}->addHeader('Content-Type', 'application/json');
344-
$freenas_server_list->{$apihost}->addHeader('Authorization', 'Basic ' . encode_base64($scfg->{freenas_user} . ':' . $scfg->{freenas_password}));
346+
347+
#$freenas_server_list->{$apihost}->addHeader('Authorization', 'Basic ' . encode_base64($scfg->{freenas_user} . ':' . $scfg->{freenas_password}));
348+
if (defined($scfg->{'freenas_api_token'})) {
349+
$freenas_server_list->{$apihost}->addHeader('Authorization', 'Bearer ' . $scfg->{freenas_api_token});
350+
} else {
351+
$freenas_server_list->{$apihost}->addHeader('Authorization', 'Basic ' . encode_base64($scfg->{freenas_user} . ':' . $scfg->{freenas_password}));
352+
}
353+
345354
# If using SSL, don't verify SSL certs
346355
if ($scfg->{freenas_use_ssl}) {
347356
$freenas_server_list->{$apihost}->getUseragent()->ssl_opts(verify_hostname => 0);

perl5/PVE/Storage/ZFSPlugin-5.0-30.pm.patch

Lines changed: 0 additions & 140 deletions
This file was deleted.

perl5/PVE/Storage/ZFSPlugin-5.0-33_1.pm.hotfix.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

perl5/PVE/Storage/ZFSPlugin-5.0-33_1.pm.patch

Lines changed: 0 additions & 147 deletions
This file was deleted.

0 commit comments

Comments
 (0)