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

Vhost aliases in Manager (#558)

Browse Source
This commit is contained in:
Clément Oudot 2013-10-03 09:58:19 +00:00
parent 1935000579
commit 2900d0a6a2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
View File

@ -48,12 +48,15 @@ sub cstruct {
_help => 'post',
},
vhostOptions => {
_nodes => [qw(vhostPort vhostHttps vhostMaintenance)],
_nodes => [
qw(vhostPort vhostHttps vhostMaintenance vhostAliases)
],
vhostPort => "int:/vhostOptions/$k2/vhostPort",
vhostHttps => "trool:/vhostOptions/$k2/vhostHttps",
vhostMaintenance =>
"bool:/vhostOptions/$k2/vhostMaintenance",
_help => 'vhostOptions',
vhostAliases => "text:/vhostOptions/$k2/vhostAliases",
_help => 'vhostOptions',
},
}
}
@ -1678,7 +1681,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
keyTest => Lemonldap::NG::Common::Regexp::HOSTNAME(),
keyMsgFail => 'Bad virtual host name',
'*' => {
keyTest => qr/^vhost(Port|Https|Maintenance)$/,
keyTest => qr/^vhost(Port|Https|Maintenance|Aliases)$/,
keyMsgFail => 'Bad option name',
},
},

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
View File

@ -372,6 +372,7 @@ sub en {
useRedirectOnForbidden => 'Redirect on forbidden',
useSafeJail => 'Use Safe jail',
variables => "Variables",
vhostAliases => 'Aliases',
vhostHttps => 'HTTPS',
vhostMaintenance => 'Maintenance mode',
vhostOptions => 'Options',
@ -845,6 +846,7 @@ sub fr {
useRedirectOnForbidden => 'Redirection pour les accès interdits',
useSafeJail => 'Utiliser la cage Safe',
variables => "Variables",
vhostAliases => 'Alias',
vhostHttps => 'HTTPS',
vhostMaintenance => 'Mode maintenance',
vhostOptions => 'Options',