diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8f949b5..fb1b116 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,3 @@ -<<<<<<< OURS # Server Settings spring.main.banner-mode=off server.port=8443 @@ -23,9 +22,9 @@ spring.mail.properties.mail.smtp.auth=true spring.mail.properties.mail.smtp.ssl.enable=true spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory # JPA Settings -spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/ng-tracker +spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker spring.datasource.username=postgres -spring.datasource.password=1 +spring.datasource.password=postgres spring.datasource.driverclassName=org.postgresql.Driver spring.jpa.hibernate.ddl-auto=validate # Liquibase Settings @@ -36,29 +35,4 @@ liquibase.change-log=classpath:db/changelog-master.xml ng-tracker.base-url=http://127.0.0.1:8080 ng-tracker.undead-user-login=admin ng-tracker.dev-mode=true -# Server Settings -spring.main.banner-mode=off -server.port=8443 -server.http.port=8080 -spring.http.multipart.maxFileSize=20MB -spring.http.multipart.maxRequestSize=20MB -# Thymeleaf Settings -spring.thymeleaf.cache=false -# SSL Settings -security.require-ssl=true -server.ssl.key-store=classpath:sample.jks -server.ssl.key-store-password=secret -server.ssl.key-password=password -# Log settings (TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF) -logging.level.ru.ulstu=DEBUG -# Mail Settings -spring.mail.host=smtp.yandex.ru -spring.mail.port=465 -spring.mail.username=nio17.ulstu@yandex.ru -spring.mail.password=nio17.ulstu.ru -spring.mail.properties.mail.smtp.auth=true -spring.mail.properties.mail.smtp.ssl.enable=true -spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory -# JPA Settings -ng-tracker.dev-mode=false -ng-tracker.use-https=false +ng-tracker.use-https=false \ No newline at end of file