Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
lemonldap-ng
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Bachelot
lemonldap-ng
Commits
df3c1efb
Commit
df3c1efb
authored
Apr 12, 2017
by
Yadd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle 404 and 502 error codes (fixes: #1211)
parent
68707a0b
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
35 additions
and
1 deletion
+35
-1
_example/etc/handler-apache2.4.conf
_example/etc/handler-apache2.4.conf
+2
-0
_example/etc/handler-apache2.X.conf
_example/etc/handler-apache2.X.conf
+2
-0
_example/etc/handler-apache2.conf
_example/etc/handler-apache2.conf
+2
-0
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
+1
-1
lemonldap-ng-portal/site/htdocs/static/languages/de.json
lemonldap-ng-portal/site/htdocs/static/languages/de.json
+2
-0
lemonldap-ng-portal/site/htdocs/static/languages/en.json
lemonldap-ng-portal/site/htdocs/static/languages/en.json
+2
-0
lemonldap-ng-portal/site/htdocs/static/languages/es.json
lemonldap-ng-portal/site/htdocs/static/languages/es.json
+2
-0
lemonldap-ng-portal/site/htdocs/static/languages/fr.json
lemonldap-ng-portal/site/htdocs/static/languages/fr.json
+2
-0
lemonldap-ng-portal/site/htdocs/static/languages/it.json
lemonldap-ng-portal/site/htdocs/static/languages/it.json
+2
-0
lemonldap-ng-portal/site/htdocs/static/languages/nl.json
lemonldap-ng-portal/site/htdocs/static/languages/nl.json
+2
-0
lemonldap-ng-portal/site/htdocs/static/languages/pt.json
lemonldap-ng-portal/site/htdocs/static/languages/pt.json
+2
-0
lemonldap-ng-portal/site/htdocs/static/languages/ro.json
lemonldap-ng-portal/site/htdocs/static/languages/ro.json
+2
-0
lemonldap-ng-portal/site/templates/bootstrap/error.tpl
lemonldap-ng-portal/site/templates/bootstrap/error.tpl
+12
-0
No files found.
_example/etc/handler-apache2.4.conf
View file @
df3c1efb
...
...
@@ -21,7 +21,9 @@ PerlModule Lemonldap::NG::Handler
# Common error page and security parameters
ErrorDocument
403
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
403
ErrorDocument
404
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
404
ErrorDocument
500
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
500
ErrorDocument
502
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
502
ErrorDocument
503
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
503
<
VirtualHost
__
VHOSTLISTEN__
>
...
...
_example/etc/handler-apache2.X.conf
View file @
df3c1efb
...
...
@@ -21,7 +21,9 @@ PerlModule Lemonldap::NG::Handler
# Common error page and security parameters
ErrorDocument
403
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
403
ErrorDocument
404
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
404
ErrorDocument
500
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
500
ErrorDocument
502
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
502
ErrorDocument
503
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
503
<
VirtualHost
__
VHOSTLISTEN__
>
...
...
_example/etc/handler-apache2.conf
View file @
df3c1efb
...
...
@@ -21,7 +21,9 @@ PerlModule Lemonldap::NG::Handler
# Common error page and security parameters
ErrorDocument
403
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
403
ErrorDocument
404
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
404
ErrorDocument
500
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
500
ErrorDocument
502
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
502
ErrorDocument
503
http
://
auth
.
__
DNSDOMAIN__
/
lmerror
/
503
<
VirtualHost
__
VHOSTLISTEN__
>
...
...
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
View file @
df3c1efb
...
...
@@ -748,7 +748,7 @@ sub lmError {
# Error code
$templateParams
{"
ERROR
$_
"}
=
(
$httpError
==
$_
?
1
:
0
)
foreach
(
403
,
500
,
503
);
foreach
(
403
,
404
,
500
,
502
,
503
);
return
$self
->
sendHtml
(
$req
,
'
error
',
params
=>
\
%templateParams
);
}
...
...
lemonldap-ng-portal/site/htdocs/static/languages/de.json
View file @
df3c1efb
...
...
@@ -144,6 +144,7 @@
"newPassword"
:
"New password"
,
"newPwdSentTo"
:
"A confirmation has been sent to your mail address."
,
"noHistory"
:
"This is your first connection, welcome!"
,
"notFound"
:
"Not found: you try to access to an unavailable page"
,
"oidcConsent"
:
"The application %s would like to know:"
,
"openidAp"
:
"Do you agree to provide the following parameters?"
,
"openIdExample"
:
"for example:http://myopenid.org/toto"
,
...
...
@@ -155,6 +156,7 @@
"otherSessions"
:
"Other active sessions"
,
"password"
:
"Password"
,
"ppGrace"
:
"authentications remaining, change your password!"
,
"proxyError"
:
"Bad gateway: unable to join remote server"
,
"pwdChange"
:
"Password change"
,
"pwd"
:
"Password"
,
"pwdResetAlreadyIssued"
:
"A password reset request was already issued on "
,
...
...
lemonldap-ng-portal/site/htdocs/static/languages/en.json
View file @
df3c1efb
...
...
@@ -144,6 +144,7 @@
"newPassword"
:
"New password"
,
"newPwdSentTo"
:
"A confirmation has been sent to your mail address."
,
"noHistory"
:
"This is your first connection, welcome!"
,
"notFound"
:
"Not found: you try to access to an unavailable page"
,
"oidcConsent"
:
"The application %s would like to know:"
,
"openidAp"
:
"Do you agree to provide the following parameters?"
,
"openIdExample"
:
"for example:http://myopenid.org/toto"
,
...
...
@@ -155,6 +156,7 @@
"otherSessions"
:
"Other active sessions"
,
"password"
:
"Password"
,
"ppGrace"
:
"authentications remaining, change your password!"
,
"proxyError"
:
"Bad gateway: unable to join remote server"
,
"pwdChange"
:
"Password change"
,
"pwd"
:
"Password"
,
"pwdResetAlreadyIssued"
:
"A password reset request was already issued on "
,
...
...
lemonldap-ng-portal/site/htdocs/static/languages/es.json
View file @
df3c1efb
...
...
@@ -144,6 +144,7 @@
"newPassword"
:
"New password"
,
"newPwdSentTo"
:
"A confirmation has been sent to your mail address."
,
"noHistory"
:
"This is your first connection, welcome!"
,
"notFound"
:
"Not found: you try to access to an unavailable page"
,
"oidcConsent"
:
"The application %s would like to know:"
,
"openidAp"
:
"Do you agree to provide the following parameters?"
,
"openIdExample"
:
"for example:http://myopenid.org/toto"
,
...
...
@@ -155,6 +156,7 @@
"otherSessions"
:
"Other active sessions"
,
"password"
:
"Password"
,
"ppGrace"
:
"authentications remaining, change your password!"
,
"proxyError"
:
"Bad gateway: unable to join remote server"
,
"pwdChange"
:
"Password change"
,
"pwd"
:
"Password"
,
"pwdResetAlreadyIssued"
:
"A password reset request was already issued on "
,
...
...
lemonldap-ng-portal/site/htdocs/static/languages/fr.json
View file @
df3c1efb
...
...
@@ -144,6 +144,7 @@
"newPassword"
:
"Nouveau mot de passe"
,
"newPwdSentTo"
:
"Une confirmation a été envoyée à votre adresse mail."
,
"noHistory"
:
"Ceci est votre première connexion, bienvenue !"
,
"notFound"
:
"Non trouvé: vous tentez d'accéder à une page non disponible"
,
"oidcConsent"
:
"L'application %s voudrait connaître :"
,
"openidAp"
:
"Consentez-vous à communiquer les paramètres suivants ?"
,
"openIdExample"
:
"par exemple :http://myopenid.org/toto"
,
...
...
@@ -155,6 +156,7 @@
"otherSessions"
:
"Autres sessions ouvertes"
,
"password"
:
"Mot-de-passe"
,
"ppGrace"
:
"authentifications restantes, changez votre mot de passe !"
,
"proxyError"
:
"Mauvaise passerelle: impossible de joindre le serveur amont"
,
"pwdChange"
:
"Changement de mot de passe"
,
"pwd"
:
"Mot de passe"
,
"pwdResetAlreadyIssued"
:
"Une demande de réinitialisation de mot de passe a déjà été faite le "
,
...
...
lemonldap-ng-portal/site/htdocs/static/languages/it.json
View file @
df3c1efb
...
...
@@ -144,6 +144,7 @@
"newPassword"
:
"New password"
,
"newPwdSentTo"
:
"A confirmation has been sent to your mail address."
,
"noHistory"
:
"This is your first connection, welcome!"
,
"notFound"
:
"Not found: you try to access to an unavailable page"
,
"oidcConsent"
:
"The application %s would like to know:"
,
"openidAp"
:
"Do you agree to provide the following parameters?"
,
"openIdExample"
:
"for example:http://myopenid.org/toto"
,
...
...
@@ -155,6 +156,7 @@
"otherSessions"
:
"Other active sessions"
,
"password"
:
"Password"
,
"ppGrace"
:
"authentications remaining, change your password!"
,
"proxyError"
:
"Bad gateway: unable to join remote server"
,
"pwdChange"
:
"Password change"
,
"pwd"
:
"Password"
,
"pwdResetAlreadyIssued"
:
"A password reset request was already issued on "
,
...
...
lemonldap-ng-portal/site/htdocs/static/languages/nl.json
View file @
df3c1efb
...
...
@@ -144,6 +144,7 @@
"newPassword"
:
"New password"
,
"newPwdSentTo"
:
"A confirmation has been sent to your mail address."
,
"noHistory"
:
"This is your first connection, welcome!"
,
"notFound"
:
"Not found: you try to access to an unavailable page"
,
"oidcConsent"
:
"The application %s would like to know:"
,
"openidAp"
:
"Do you agree to provide the following parameters?"
,
"openIdExample"
:
"for example:http://myopenid.org/toto"
,
...
...
@@ -155,6 +156,7 @@
"otherSessions"
:
"Other active sessions"
,
"password"
:
"Password"
,
"ppGrace"
:
"authentications remaining, change your password!"
,
"proxyError"
:
"Bad gateway: unable to join remote server"
,
"pwdChange"
:
"Password change"
,
"pwd"
:
"Password"
,
"pwdResetAlreadyIssued"
:
"A password reset request was already issued on "
,
...
...
lemonldap-ng-portal/site/htdocs/static/languages/pt.json
View file @
df3c1efb
...
...
@@ -144,6 +144,7 @@
"newPassword"
:
"New password"
,
"newPwdSentTo"
:
"A confirmation has been sent to your mail address."
,
"noHistory"
:
"This is your first connection, welcome!"
,
"notFound"
:
"Not found: you try to access to an unavailable page"
,
"oidcConsent"
:
"The application %s would like to know:"
,
"openidAp"
:
"Do you agree to provide the following parameters?"
,
"openIdExample"
:
"for example:http://myopenid.org/toto"
,
...
...
@@ -155,6 +156,7 @@
"otherSessions"
:
"Other active sessions"
,
"password"
:
"Password"
,
"ppGrace"
:
"authentications remaining, change your password!"
,
"proxyError"
:
"Bad gateway: unable to join remote server"
,
"pwdChange"
:
"Password change"
,
"pwd"
:
"Password"
,
"pwdResetAlreadyIssued"
:
"A password reset request was already issued on "
,
...
...
lemonldap-ng-portal/site/htdocs/static/languages/ro.json
View file @
df3c1efb
...
...
@@ -144,6 +144,7 @@
"newPassword"
:
"New password"
,
"newPwdSentTo"
:
"A confirmation has been sent to your mail address."
,
"noHistory"
:
"This is your first connection, welcome!"
,
"notFound"
:
"Not found: you try to access to an unavailable page"
,
"oidcConsent"
:
"The application %s would like to know:"
,
"openidAp"
:
"Do you agree to provide the following parameters?"
,
"openIdExample"
:
"for example:http://myopenid.org/toto"
,
...
...
@@ -155,6 +156,7 @@
"otherSessions"
:
"Other active sessions"
,
"password"
:
"Password"
,
"ppGrace"
:
"authentications remaining, change your password!"
,
"proxyError"
:
"Bad gateway: unable to join remote server"
,
"pwdChange"
:
"Password change"
,
"pwd"
:
"Password"
,
"pwdResetAlreadyIssued"
:
"A password reset request was already issued on "
,
...
...
lemonldap-ng-portal/site/templates/bootstrap/error.tpl
View file @
df3c1efb
...
...
@@ -9,12 +9,24 @@
</div>
</TMPL_IF>
<TMPL_IF
ERROR404
>
<div
class=
"message message-negative alert"
>
<span
trspan=
"notFound"
>
File not found
</span>
</div>
</TMPL_IF>
<TMPL_IF
ERROR500
>
<div
class=
"message message-negative alert"
>
<span
trspan=
"serverError"
>
Error occurs on the server
</span>
</div>
</TMPL_IF>
<TMPL_IF
ERROR502
>
<div
class=
"message message-negative alert"
>
<span
trspan=
"proxyError"
>
Proxy error
</span>
</div>
</TMPL_IF>
<TMPL_IF
ERROR503
>
<div
class=
"message message-warning alert"
>
<span
trspan=
"maintenanceMode"
>
This application is in maintenance, please try to connect later
</span>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment