yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cifs: move plugin related code into plugin

Browse Source
This commit is contained in:
Dietmar Maurer
2018-03-16 13:07:05 +01:00
parent 304344ce34
commit a9db2ca8a5
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
PVE/API2/Storage/Config.pm
View File

@ -9,6 +9,7 @@ use PVE::Cluster qw(cfs_read_file cfs_write_file);
use PVE::Storage; use PVE::Storage;
use PVE::Storage::Plugin; use PVE::Storage::Plugin;
use PVE::Storage::LVMPlugin; use PVE::Storage::LVMPlugin;
use PVE::Storage::CIFSPlugin;
use HTTP::Status qw(:constants); use HTTP::Status qw(:constants);
use Storable qw(dclone); use Storable qw(dclone);
use PVE::JSONSchema qw(get_standard_option); use PVE::JSONSchema qw(get_standard_option);
@ -37,22 +38,6 @@ my $api_storage_config = sub {
return $scfg; return $scfg;
}; };
my $cifs_cred_file_name = sub {
my ($storeid) = @_;
return "/etc/pve/priv/${storeid}.cred";
};
my $set_cifs_credentials = sub {
my ($password, $storeid) = @_;
my $cred_file = $cifs_cred_file_name->($storeid);
PVE::Tools::file_set_contents($cred_file, "password=$password\n");
return $cred_file;
};
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'index', name => 'index',
path => '', path => '',
@ -204,8 +189,8 @@ __PACKAGE__->register_method ({
} }
# create a password file in /etc/pve/priv, # create a password file in /etc/pve/priv,
# this file is used as a cert_file at mount time. # this file is used as a cert_file at mount time.
my $cred_file = &$set_cifs_credentials($password, $storeid) my $cred_file = PVE::Storage::cifs_set_credentials($password, $storeid)
if defined($password); if $type eq 'cifs' && defined($password);
eval { eval {
# try to activate if enabled on local node, # try to activate if enabled on local node,
@ -300,7 +285,7 @@ __PACKAGE__->register_method ({
if PVE::Storage::storage_is_used($cfg, $storeid); if PVE::Storage::storage_is_used($cfg, $storeid);
if ($scfg->{type} eq 'cifs') { if ($scfg->{type} eq 'cifs') {
my $cred_file = $cifs_cred_file_name->($storeid); my $cred_file = PVE::Storage::cifs_cred_file_name($storeid);
if (-f $cred_file) { if (-f $cred_file) {
unlink($cred_file) or warn "removing cifs credientials '$cred_file' failed: $!\n"; unlink($cred_file) or warn "removing cifs credientials '$cred_file' failed: $!\n";
} }

23
PVE/Storage/CIFSPlugin.pm
View File

@ -28,15 +28,28 @@ sub cifs_is_mounted {
return undef; return undef;
} }
sub cifs_cred_file_name {
my ($storeid) = @_;
return "/etc/pve/priv/${storeid}.cred";
}
sub cifs_set_credentials {
my ($password, $storeid) = @_;
my $cred_file = cifs_cred_file_name($storeid);
PVE::Tools::file_set_contents($cred_file, "password=$password\n");
return $cred_file;
}
sub get_cred_file { sub get_cred_file {
my ($storeid) = @_; my ($storeid) = @_;
my $cred_file = '/etc/pve/priv/'.$storeid.'.cred'; my $cred_file = cifs_cred_file_name($storeid);
if (-e $cred_file) { return -e $cred_file ? $cred_file : undef;
return $cred_file;
}
return undef;
} }
sub cifs_mount { sub cifs_mount {