Skip to content

Commit

Permalink
Merge pull request #39 from TAMULib/sprint3-staging-yaml
Browse files Browse the repository at this point in the history
switch to yaml
  • Loading branch information
wwelling committed Aug 15, 2018
2 parents d929cdd + 3930521 commit 9d55ed5
Show file tree
Hide file tree
Showing 8 changed files with 284 additions and 239 deletions.
120 changes: 0 additions & 120 deletions src/main/resources/application.properties

This file was deleted.

126 changes: 126 additions & 0 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
server:
port: 9001
contextPath:

---
logging:
level:
edu.tamu: INFO
org.springframework: INFO
file: logs/project-management-service.log

---
security.basic.enabled: false

---
spring:
profiles.active: production

datasource:
platform: h2
driverClassName: org.h2.Driver
url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
# platform: postgres
# driverClassName: org.postgresql.Driver
# url: jdbc:postgresql://localhost:5432/project_management_service

username: spring
password: spring

max-active: 100
max-idle: 8
min-idle: 8
initial-size: 10
test-on-borrow: true
test-on-return: false
test-while-idle: true
defaultAutoCommit: false
validation-query: select version();

jpa:
database-platform: org.hibernate.dialect.H2Dialect
# database-platform: org.hibernate.dialect.PostgreSQLDialect

show-sql: false
hibernate.ddl-auto: create-drop

---
app:
cache:
default:
# default delay before first cache update, 5 seconds in milliseconds
delay: 5000
# default interval between cache updates, 1 minute in milliseconds
interval: 60000
active-sprints:
# 2 seconds in milliseconds
delay: 2000
# 15 minutes in milliseconds
interval: 900000
remote-projects:
# 2 seconds in milliseconds
delay: 2000
# 1 hour in milliseconds
interval: 3600000
projects-stats:
# 2 minutes in milliseconds
# the projects stats cache is create from the remote projects cache
# this delay should be greater than the remote projects delay
# and an estimate on how long the remote projects cache takes to populate
delay: 120000
# 1 hour in milliseconds
interval: 3600000

sugar.email: helpdesk@library.tamu.edu

whitelist: 127.0.0.1

############################
# Framework app properties #
############################
# edu.tamu.weaver.auth.service.UserCredentialsService
authority.admins: 402001311,613001223,102001721,222004429,709005486,523008230,724001395,123456789
security:
# edu.tamu.weaver.auth.service.CryptoService
secret: verysecretsecret
# edu.tamu.weaver.filter.CorsFilter
allow-access: http://localhost,http://localhost:8080,http://machuff.tamu.edu,http://janus.evans.tamu.edu,http://savell.evans.tamu.edu,http://jmicah.tamu.edu
# edu.tamu.weaver.email.config.WeaverEmailConfig
email:
host: relay.tamu.edu
from: noreply@library.tamu.edu
replyTo: helpdesk@library.tamu.edu
# edu.tamu.weaver.reporting.controller.ReportingController
reporting.address: helpdesk@library.tamu.edu
# edu.tamu.weaver.validation.controller.ValidationsController
model.packages: edu.tamu.app.model
# edu.tamu.weaver.utility.HttpUtility
http.timeout: 10000

---
#############################
# Framework auth properties #
#############################
# edu.tamu.weaver.token.service.TokenService
auth:
security:
jwt:
secret: verysecretsecret
issuer: localhost
duration: 1
# edu.tamu.weaver.token.provider.controller.TokenController
path: /auth

---
#############################
# Framework shib properties #
#############################
# edu.tamu.weaver.token.provider.controller.TokenController
shib:
keys: netid,uin,lastName,firstName,email
subject: email
netid: edupersonprincipalnameunscoped
uin: tamuuin
lastName: tdl-sn
firstName: tdl-givenname
email: tdl-mail
3 changes: 1 addition & 2 deletions src/main/resources/banner.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

_____ _ _ __ __ _
| __ \ (_) | | | \/ | | |
| |__) | __ ___ _ ___ ___| |_ | \ / | __ _ _ __ __ _ __ _ ___ _ __ ___ ___ _ __ | |_
| ___/ '__/ _ \| |/ _ \/ __| __| | |\/| |/ _` | '_ \ / _` |/ _` |/ _ \ '_ ` _ \ / _ \ '_ \| __|
| | | | | (_) | | __/ (__| |_ | | | | (_| | | | | (_| | (_| | __/ | | | | | __/ | | | |_
|_| |_| \___/| |\___|\___|\__| |_| |_|\__,_|_| |_|\__,_|\__, |\___|_| |_| |_|\___|_| |_|\__|
_/ | __/ |
|__/ |___/
|__/ |___/
17 changes: 17 additions & 0 deletions src/main/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Root logger option
log4j.rootLogger=DEBUG, stdout, file

# Redirect log messages to console
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=logger.info
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

# Redirect log messages to a log file
log4j.appender.file=org.apache.log4j.RollingFileAppender
#outputs to Tomcat home
log4j.appender.file.File=${catalina.home}/logs/myapp.log
log4j.appender.file.MaxFileSize=5MB
log4j.appender.file.MaxBackupIndex=10
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
115 changes: 0 additions & 115 deletions src/test/resources/application.properties

This file was deleted.

0 comments on commit 9d55ed5

Please sign in to comment.