Skip to content

Commit

Permalink
Merge 24.7 to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-teamcity committed Aug 27, 2024
2 parents e85eabc + abc2f8f commit a03311f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions server/configs/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ server.port=@@serverPort@@
#server.ssl.key-store-type=PKCS12
#server.ssl.ciphers=HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA:!EDH:!DHE:!DH:!CAMELLIA:!ARIA:!AESCCM:!SHA:!CHACHA20

server.error.include-stacktrace=always
server.error.include-message=always

## HTTP-only port for servers that need to handle both HTTPS (configure via server.port and server.ssl above) and HTTP
#context.httpPort=8080

Expand Down
3 changes: 3 additions & 0 deletions server/configs/webapps/embedded/config/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ server.port=80
#server.ssl.key-store-type=PKCS12
#server.ssl.ciphers=HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA:!EDH:!DHE:!DH:!CAMELLIA:!ARIA:!AESCCM:!SHA:!CHACHA20

server.error.include-stacktrace=always
server.error.include-message=always

## HTTP-only port for servers that need to handle both HTTPS (configure via server.port and server.ssl above) and HTTP
## This must not be the same as the server.port set above.
#context.httpPort=80
Expand Down

0 comments on commit a03311f

Please sign in to comment.