-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'lmConfigEditorJson' into experimental
- Loading branch information
Showing
8 changed files
with
132 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| --- a/usr/share/lemonldap-ng/bin/lmConfigEditor | ||
| +++ b/usr/share/lemonldap-ng/bin/lmConfigEditor | ||
| @@ -18,10 +18,12 @@ my $cli = Lemonldap::NG::Manager::Cli::Lib->new; | ||
|
|
||
| our $opt_user = 'www-data'; | ||
| our $opt_group = 'www-data'; | ||
| +our $opt_json; | ||
|
|
||
| GetOptions( | ||
| "user=s" => \$opt_user, | ||
| - "group=s" => \$opt_group | ||
| + "group=s" => \$opt_group, | ||
| + "json" => \$opt_json, | ||
| ) or die("Error in command line arguments\n"); | ||
|
|
||
| eval { | ||
| @@ -45,10 +47,17 @@ delete $refConf->{cfgAuthorIP}; | ||
| delete $refConf->{cfgDate}; | ||
| $refConf->{cfgLog} = ''; | ||
|
|
||
| -# Sort keys | ||
| -$Data::Dumper::Sortkeys = 1; | ||
| -$Data::Dumper::Useperl = 1; | ||
| -my $tmp = Dumper($refConf); | ||
| +my $tmp; | ||
| +if ($opt_json) { | ||
| + require JSON; | ||
| + $tmp = JSON->new->pretty->canonical->encode($refConf); | ||
| +} | ||
| +else { | ||
| + # Sort keys | ||
| + $Data::Dumper::Sortkeys = 1; | ||
| + $Data::Dumper::Useperl = 1; | ||
| + $tmp = Dumper($refConf); | ||
| +} | ||
|
|
||
| my $refFile = File::Temp->new( UNLINK => 1 ); | ||
| my $editFile = File::Temp->new( UNLINK => 1 ); | ||
| @@ -73,8 +82,14 @@ if ( $rc == 0 and compare( $refFile->filename, $editFile->filename ) == 1 ) { | ||
| my $buf = join( '', <$F1> ); | ||
| close $F1; | ||
|
|
||
| - my $newConf = Safe->new->reval($buf); | ||
| - die $EVAL_ERROR if $EVAL_ERROR; | ||
| + my $newConf; | ||
| + if ($opt_json) { | ||
| + $newConf = JSON::from_json($buf); | ||
| + } | ||
| + else { | ||
| + $newConf = Safe->new->reval($buf); | ||
| + die $EVAL_ERROR if $EVAL_ERROR; | ||
| + } | ||
|
|
||
| # Update author and date | ||
| $newConf->{cfgAuthor} = |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| --- a/usr/share/lemonldap-ng/bin/lmConfigEditor | ||
| +++ b/usr/share/lemonldap-ng/bin/lmConfigEditor | ||
| @@ -18,10 +18,12 @@ my $cli = Lemonldap::NG::Manager::Cli::Lib->new; | ||
|
|
||
| our $opt_user = 'www-data'; | ||
| our $opt_group = 'www-data'; | ||
| +our $opt_json; | ||
|
|
||
| GetOptions( | ||
| "user=s" => \$opt_user, | ||
| - "group=s" => \$opt_group | ||
| + "group=s" => \$opt_group, | ||
| + "json" => \$opt_json, | ||
| ) or die("Error in command line arguments\n"); | ||
|
|
||
| eval { | ||
| @@ -45,10 +47,17 @@ delete $refConf->{cfgAuthorIP}; | ||
| delete $refConf->{cfgDate}; | ||
| $refConf->{cfgLog} = ''; | ||
|
|
||
| -# Sort keys | ||
| -$Data::Dumper::Sortkeys = 1; | ||
| -$Data::Dumper::Useperl = 1; | ||
| -my $tmp = Dumper($refConf); | ||
| +my $tmp; | ||
| +if ($opt_json) { | ||
| + require JSON; | ||
| + $tmp = JSON->new->pretty->canonical->encode($refConf); | ||
| +} | ||
| +else { | ||
| + # Sort keys | ||
| + $Data::Dumper::Sortkeys = 1; | ||
| + $Data::Dumper::Useperl = 1; | ||
| + $tmp = Dumper($refConf); | ||
| +} | ||
|
|
||
| my $refFile = File::Temp->new( UNLINK => 1 ); | ||
| my $editFile = File::Temp->new( UNLINK => 1 ); | ||
| @@ -73,8 +82,14 @@ if ( $rc == 0 and compare( $refFile->filename, $editFile->filename ) == 1 ) { | ||
| my $buf = join( '', <$F1> ); | ||
| close $F1; | ||
|
|
||
| - my $newConf = Safe->new->reval($buf); | ||
| - die $EVAL_ERROR if $EVAL_ERROR; | ||
| + my $newConf; | ||
| + if ($opt_json) { | ||
| + $newConf = JSON::from_json($buf); | ||
| + } | ||
| + else { | ||
| + $newConf = Safe->new->reval($buf); | ||
| + die $EVAL_ERROR if $EVAL_ERROR; | ||
| + } | ||
|
|
||
| # Update author and date | ||
| $newConf->{cfgAuthor} = |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.