Fix vhost rename (closes: #1038)

environments/ppa-mbqj77/deployments/1
Xavier Guimard 9 years ago
parent 574057be22
commit 9cca6ae712
  1. 11
      lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm
  2. 1
      lemonldap-ng-portal/TODO.md

@ -208,7 +208,8 @@ sub _scanNodes {
elsif ( $leaf->{id} =~
/^($specialNodeKeys)\/([^\/]+)\/([^\/]+)(?:\/(.*))?$/io )
{
my ( $base, $key, $target, $h ) = ( $1, $newNames{$2}, $3, $4 );
my ( $base, $key, $oldName, $target, $h ) =
( $1, $newNames{$2}, $2, $3, $4 );
hdebug(
"Special node chield subnode detected $leaf->{id}",
" base $base, key $key, target $target, h "
@ -222,7 +223,7 @@ sub _scanNodes {
if ( $leaf->{cnodes} ) {
hdebug(' unopened subnode');
$self->newConf->{$target}->{$key} =
$self->refConf->{$target}->{$key} // {};
$self->refConf->{$target}->{$oldName} // {};
}
elsif ($h) {
@ -302,7 +303,7 @@ sub _scanNodes {
if ( $leaf->{cnodes} ) {
hdebug(" $target: unopened node");
$self->newConf->{$target}->{$key} =
$self->refConf->{$target}->{$key} // {};
$self->refConf->{$target}->{$oldName} // {};
}
elsif ($h) {
hdebug(" $target: opened node");
@ -358,7 +359,7 @@ sub _scanNodes {
if ( $leaf->{cnodes} ) {
hdebug(' unopened');
$self->newConf->{$target}->{$key} =
$self->refConf->{$target}->{$key} // {};
$self->refConf->{$target}->{$oldName} // {};
}
elsif ($h) {
hdebug(' opened');
@ -377,7 +378,7 @@ sub _scanNodes {
if ( $leaf->{cnodes} ) {
hdebug(' unopened');
$self->newConf->{$target}->{$key} =
$self->refConf->{$target}->{$key} // {};
$self->refConf->{$target}->{$oldName} // {};
}
elsif ($h) {
hdebug(' opened');

@ -5,4 +5,5 @@
# Other
* Verify `useSafeJail=0`
* Finish IssuerGet logout (-> info())

Loading…
Cancel
Save