Skip to content

Commit

Permalink
Merge branch 'master' into release-5.3-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@otavard
otavard committed Sep 23, 2022
2 parents 77248cc + b96e068 commit 493be17
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions linux/bin/deployUtils/docker/tomcat.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
ServerAdmin [email protected]
Header set X-Frame-Options SAMEORIGIN

RedirectMatch ^/$ /Datafari
RedirectMatch ^/$ /datafariui
RedirectMatch ^/monit$ /monit/
ProxyRequests Off
ProxyTimeout 300
Expand Down Expand Up @@ -74,7 +74,7 @@ ErrorLog /var/apache/logs/errorApache.log
ServerAdmin [email protected]
Header set X-Frame-Options SAMEORIGIN

RedirectMatch ^/$ /Datafari
RedirectMatch ^/$ /datafariui
RedirectMatch ^/monit$ /monit/
ProxyRequests Off

Expand Down
2 changes: 1 addition & 1 deletion ssl-keystore/apache/config/tomcat.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
ServerAdmin [email protected]
Header set X-Frame-Options SAMEORIGIN

RedirectMatch ^/$ /Datafari
RedirectMatch ^/$ /datafariui
RedirectMatch ^/monit$ /monit/
ProxyRequests Off
ProxyTimeout 300
Expand Down

0 comments on commit 493be17

Please sign in to comment.