Merge remote-tracking branch 'origin/banner_and_version' into dev
This commit is contained in:
commit
91ae96516c
3 changed files with 24 additions and 10 deletions
|
@ -91,3 +91,8 @@ tasks.register('integrationTest', Test) {
|
|||
|
||||
check.dependsOn integrationTest
|
||||
|
||||
processResources {
|
||||
filesMatching('**/application.yml') {
|
||||
expand(project.properties)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,19 +1,21 @@
|
|||
server:
|
||||
port: ${NEXTCLOUD_DLNA_SERVER_PORT:8080}
|
||||
interface: ${NEXTCLOUD_DLNA_INTERFACE:}
|
||||
friendlyName: ${NEXTCLOUD_DLNA_FRIENDLY_NAME:Nextcloud-DLNA}
|
||||
port: \${NEXTCLOUD_DLNA_SERVER_PORT:8080}
|
||||
interface: \${NEXTCLOUD_DLNA_INTERFACE:}
|
||||
friendlyName: \${NEXTCLOUD_DLNA_FRIENDLY_NAME:Nextcloud-DLNA}
|
||||
|
||||
nextcloud:
|
||||
filesDir: ${NEXTCLOUD_DATA_DIR}
|
||||
filesDir: \${NEXTCLOUD_DATA_DIR}
|
||||
db:
|
||||
type: ${NEXTCLOUD_DB_TYPE:mariadb}
|
||||
host: ${NEXTCLOUD_DB_HOST:localhost}
|
||||
port: ${NEXTCLOUD_DB_PORT:3306}
|
||||
name: ${NEXTCLOUD_DB_NAME:nextcloud}
|
||||
user: ${NEXTCLOUD_DB_USER:nextcloud}
|
||||
pass: ${NEXTCLOUD_DB_PASS:nextcloud}
|
||||
type: \${NEXTCLOUD_DB_TYPE:mariadb}
|
||||
host: \${NEXTCLOUD_DB_HOST:localhost}
|
||||
port: \${NEXTCLOUD_DB_PORT:3306}
|
||||
name: \${NEXTCLOUD_DB_NAME:nextcloud}
|
||||
user: \${NEXTCLOUD_DB_USER:nextcloud}
|
||||
pass: \${NEXTCLOUD_DB_PASS:nextcloud}
|
||||
|
||||
spring:
|
||||
application:
|
||||
version: ${version}
|
||||
jpa:
|
||||
hibernate:
|
||||
ddl-auto: none
|
||||
|
|
7
src/main/resources/banner.txt
Normal file
7
src/main/resources/banner.txt
Normal file
|
@ -0,0 +1,7 @@
|
|||
_ _ _ _ _
|
||||
_ __ _____ _| |_ ___| | ___ _ _ __| | __| | |_ __ __ _
|
||||
| '_ \ / _ \ \/ / __/ __| |/ _ \| | | |/ _` |_____ / _` | | '_ \ / _` |
|
||||
| | | | __/> <| || (__| | (_) | |_| | (_| |_____| (_| | | | | | (_| |
|
||||
|_| |_|\___/_/\_\\__\___|_|\___/ \__,_|\__,_| \__,_|_|_| |_|\__,_|
|
||||
|
||||
ver: ${spring.application.version} (powered by Spring Boot ${spring-boot.version})
|
Loading…
Reference in a new issue