dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partial revert (#2508)

Browse Source
This commit is contained in:
Christophe Maudoux 2021-05-02 22:04:42 +02:00
parent de3164fea7
commit 8ae9985e7c
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lemonldap-ng-common/scripts/lemonldap-ng-cli
View File

@ -65,9 +65,8 @@ Options:
- safe <0|1> : fail in case the requested configuration is invalid
- force <0|1> : allow overwrite of existing config number
- cfgNum <num> : set new configuration number (requires -force 1)
- nohistory : do not increment configuration number (requires -force 1)
- sep <char> : separator of hierarchical values (by default: /)
- iniFile <file> : path to an alternative lemonldap-ng.ini file
- iniFile <file> : path to an alternate lemonldap-ng.ini file
See Lemonldap::NG::Manager::Cli(3) for more
};
@ -179,10 +178,6 @@ Allows you to force overwriting an existing configuration (default: 0)
Choose a particular configuration number (default: latest)
=item -nohistory
Allows you to keep current configuration number
=item -sep
Allows you to define hierarchical separator

13
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm
View File

@ -29,7 +29,6 @@ has format => ( is => 'rw', isa => 'Str', default => "%-25s | %-25s | %-25s" );
has yes => ( is => 'rw', isa => 'Bool', default => 0 );
has safe => ( is => 'rw', isa => 'Bool', default => 0 );
has force => ( is => 'rw', isa => 'Bool', default => 0 );
has nohistory => ( is => 'rw', isa => 'Bool', default => 0 );
has logger => ( is => 'ro', lazy => 1, builder => sub { $_[0]->mgr->logger } );
has userLogger =>
( is => 'ro', lazy => 1, builder => sub { $_[0]->mgr->userLogger } );
@ -356,7 +355,7 @@ sub rollback {
or die $Lemonldap::NG::Common::Conf::msg;
$conf->{cfgNum} = $lastCfg;
$conf->{cfgAuthor} = scalar( getpwuid $< ) . ' (command-line-interface)';
$conf->{cfgAuthor} = scalar( getpwuid $< ) . '(command-line-interface)';
chomp $conf->{cfgAuthor};
$conf->{cfgAuthorIP} = '127.0.0.1';
$conf->{cfgDate} = time;
@ -433,7 +432,6 @@ sub _save {
print STDERR "$msg\n";
}
}
my $saveParams = { force => $self->force };
if ( $self->force and $self->cfgNum ) {
$self->logger->debug( "CLI: cfgNum forced with " . $self->cfgNum );
@ -441,15 +439,6 @@ sub _save {
$saveParams->{cfgNum} = $self->cfgNum;
$saveParams->{cfgNumFixed} = 1;
}
if ( $self->force and $self->nohistory ) {
my $lastCfg = $self->mgr->confAcc->lastCfg;
$self->logger->debug(
"CLI: No history required. cfgNum forced with " . $lastCfg );
print STDERR "No history required. cfgNum forced with ", $lastCfg;
$saveParams->{cfgNum} = $lastCfg;
$saveParams->{cfgNumFixed} = 1;
}
$new->{cfgAuthor} = scalar( getpwuid $< ) . '(command-line-interface)';
chomp $new->{cfgAuthor};
$new->{cfgAuthorIP} = '127.0.0.1';