Merge branch 'updating-properties' of UV-APPS/UV_SAIC_CORE into master

src/main/java/es/uv/saic/config/ScheduledTasks.java

@@ -52,8 +52,6 @@ public class ScheduledTasks {
 	private String calendarEnabled;
 	@Value("${saic.mailer.maxMailsPerRound}")
 	private Integer maxMailsPerRound;
-	@Value("${saic.parser.surveys.enabled}")
-	private String parserEnabled;
 	@Value("${saic.scheduler.expired.enabled}")
 	private String expiredEnabled;
 	@Value("${saic.backups.database.enabled}")

src/main/resources/application-dev.properties

@@ -2,32 +2,27 @@
 saic.url.domain = https://saicd.uv.es:4443
 saic.url.public = ${saic.url.domain}/public
 
+saic.actuator.validIp=147.156.0.0/16
+
 # Email config
 saic.mailer.queue.enabled = true
 saic.mailer.reminder.enabled = false
 saic.mailer.calendar.enabled = false
 saic.mailer.maxMailsPerRound = 20
 
-# Data parser config
-saic.parser.surveys.path = /DATA/saic-data/databases/
-saic.parser.surveys.enabled = false
-
 # Database config
 spring.datasource.url=jdbc:postgresql://127.0.0.1/saic_v2
+spring.datasource.username=postgres
 spring.datasource.password=docent1ia2.l6
 
 # Files and log config
 logging.file.path=/DATA/saic-data/logs
 logging.file.name=/DATA/saic-data/logs/saicd.log
+
 saic.data.filePath=/DATA/saic-data/files/
-saic.data.tmpPath=/DATA/saic-data/tmp/
-saic.data.docsPath=/DATA/saic-data/documents/
 saic.data.templates.filePath=/DATA/saic-data/templates/
 saic.data.templates.logoPath=/DATA/saic-data/templates/logos/
 saic.data.templates.fileNotFound=/DATA/saic-data/utils/filenotfound.pdf
-saic.data.master = /DATA/saic-data/databases/MasterOficial/
-saic.data.doctorado = /DATA/saic-data/databases/doctorat/
-saic.data.evdocente = /DATA/saic-data/databases/ev_docente/latest/
 
 # Scheduler
 saic.scheduler.expired.enabled=false

src/main/resources/application-graal.properties

@@ -2,18 +2,17 @@
 saic.url.domain = https://saicd.uv.es:4443
 saic.url.public = ${saic.url.domain}/public
 
+saic.actuator.validIp=147.156.0.0/16
+
 # Email config
 saic.mailer.queue.enabled = true
 saic.mailer.reminder.enabled = false
 saic.mailer.calendar.enabled = false
 saic.mailer.maxMailsPerRound = 20
 
-# Data parser config
-saic.parser.surveys.path = /DATA/saic-data/databases/
-saic.parser.surveys.enabled = false
-
 # Database config
 spring.datasource.url=jdbc:postgresql://saicd.uv.es:5432/saic_v2
+spring.datasource.username=postgres
 spring.datasource.password=docent1ia2.l6
 
 # Files and log config
@@ -22,14 +21,9 @@ logging.file.name = saic-data/logs/saic.log
 
 # Dummy
 saic.data.filePath = saic-data/files/
-saic.data.tmpPath = saic-data/tmp/
-saic.data.docsPath = saic-data/documents/
 saic.data.templates.filePath = saic-data/templates/
 saic.data.templates.logoPath = saic-data/templates/logos/
 saic.data.templates.fileNotFound = saic-data/utils/filenotfound.pdf
-saic.data.master = saic-data/databases/MasterOficial/
-saic.data.doctorado = saic-data/databases/doctorat/
-saic.data.evdocente = saic-data/databases/ev_docente/latest/
 
 # Scheduler
 saic.scheduler.expired.enabled=false

src/main/resources/application-local.properties

@@ -2,6 +2,8 @@
 saic.url.domain = http://127.0.0.1
 saic.url.public = ${saic.url.domain}/public
 
+saic.actuator.validIp=147.156.0.0/16
+
 # JPA Debug
 #spring.jpa.show-sql=true 
 #spring.jackson.serialization.FAIL_ON_SELF_REFERENCES=false
@@ -12,26 +14,19 @@ saic.mailer.reminder.enabled = false
 saic.mailer.calendar.enabled = false
 saic.mailer.maxMailsPerRound = 20
 
-# Data parser config
-saic.parser.surveys.path = /home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/databases/
-saic.parser.surveys.enabled = false
-
 # Database config
 spring.datasource.url=jdbc:postgresql://saicd.uv.es:5432/saic_v2
+spring.datasource.username=postgres
 spring.datasource.password=docent1ia2.l6
 
 # Files and log config
+logging.file.path=/home/mariomh/Documentos/SAIC/docs/logs
+logging.file.name=/home/mariomh/Documentos/SAIC/docs/logs/saic.log
+
 saic.data.filePath=/home/mariomh/Documentos/SAIC/docs/files/
-saic.data.tmpPath=/home/mariomh/Documentos/SAIC/docs/tmp/
-saic.data.docsPath=/home/mariomh/Documentos/SAIC/docs/documents/
 saic.data.templates.filePath = /home/mariomh/Documentos/SAIC/docs/templates/
 saic.data.templates.logoPath = /home/mariomh/Documentos/SAIC/docs/templates/logos/
 saic.data.templates.fileNotFound = /home/mariomh/Documentos/SAIC/docs/filenotfound.pdf
-saic.data.master = /home/mariomh/Documentos/SAIC/docs/databases/MasterOficial/
-saic.data.doctorado = /home/mariomh/Documentos/SAIC/docs/databases/doctorat/
-saic.data.evdocente = /home/mariomh/Documentos/SAIC/docs/databases/ev_docente/latest/
-logging.file.path=/home/mariomh/Documentos/SAIC/docs/logs
-logging.file.name=/home/mariomh/Documentos/SAIC/docs/logs/saic.log
 
 # Scheduler
 saic.scheduler.expired.enabled=false

src/main/resources/application-prod.properties

@@ -2,32 +2,27 @@
 saic.url.domain = https://saic.uv.es:4443
 saic.url.public = ${saic.url.domain}/public
 
+saic.actuator.validIp=147.156.0.0/16
+
 # Email config
 saic.mailer.queue.enabled = true
 saic.mailer.reminder.enabled = false
 saic.mailer.calendar.enabled = true
-saic.mailer.maxMailsPerRound = 20
-
-# Data parser config
-saic.parser.surveys.path = /DATA/saic-data/databases/
-saic.parser.surveys.enabled = false
+saic.mailer.maxMailsPerRound = 20= false
 
 # Database config
 spring.datasource.url=jdbc:postgresql://127.0.0.1/saic_v2
+spring.datasource.username=postgres
 spring.datasource.password=docent1ia2.l6
 
 # Files and log config
 logging.file.path=/DATA/saic-data/logs
 logging.file.name=/DATA/saic-data/logs/saic.log
+
 saic.data.filePath=/DATA/saic-data/files/
-saic.data.tmpPath=/DATA/saic-data/tmp/
-saic.data.docsPath=/DATA/saic-data/documents/
 saic.data.templates.filePath=/DATA/saic-data/templates/
 saic.data.templates.logoPath=/DATA/saic-data/templates/logos/
 saic.data.templates.fileNotFound=/DATA/saic-data/utils/filenotfound.pdf
-saic.data.master = /DATA/saic-data/databases/MasterOficial/
-saic.data.doctorado = /DATA/saic-data/databases/doctorat/
-saic.data.evdocente = /DATA/saic-data/databases/ev_docente/latest/
 
 # Scheduler
 saic.scheduler.expired.enabled=false

src/main/resources/application-uib-dev.properties

@@ -0,0 +1,33 @@
+# Urls
+saic.url.domain = https://saiqpre.uib.cat:4443
+saic.url.public = ${saic.url.domain}/public
+
+saic.actuator.validIp=10.81.80.0/20
+
+# Email config
+saic.mailer.queue.enabled = false
+saic.mailer.reminder.enabled = false
+saic.mailer.calendar.enabled = false
+saic.mailer.maxMailsPerRound = 20
+
+# Database config
+spring.datasource.url=jdbc:postgresql://127.0.0.1/saic_v3
+spring.datasource.username=sys_saic
+spring.datasource.password=jw4s0F2026
+
+# Files and log config
+logging.file.path=/DATA/saic-data/logs
+logging.file.name=/DATA/saic-data/logs/saicd.log
+
+saic.data.filePath=/DATA/saic-data/files/
+saic.data.templates.filePath=/DATA/saic-data/templates/
+saic.data.templates.logoPath=/DATA/saic-data/templates/logos/
+saic.data.templates.fileNotFound=/DATA/saic-data/utils/filenotfound.pdf
+
+# Scheduler
+saic.scheduler.expired.enabled=false
+
+# Desactivar RefreshScope en Eureka Client
+eureka.client.refresh.enable=false
+# Desactivar RefreshScope en SpringCloud
+spring.cloud.refresh.enabled=false

src/main/resources/application-uib-graal.properties

@@ -0,0 +1,33 @@
+# Urls
+saic.url.domain = https://saiqpre.uib.cat:4443
+saic.url.public = ${saic.url.domain}/public
+saic.actuator.validIp=10.81.80.0/20
+
+# Email config
+saic.mailer.queue.enabled = false
+saic.mailer.reminder.enabled = false
+saic.mailer.calendar.enabled = false
+saic.mailer.maxMailsPerRound = 20
+
+# Database config
+spring.datasource.url=jdbc:postgresql://saiqpre.uib.cat:5432/saic_v3
+spring.datasource.username=sys_saic
+spring.datasource.password=jw4s0F2026
+
+# Files and log config
+logging.file.path = saic-data/logs
+logging.file.name = saic-data/logs/saic.log
+
+# Dummy
+saic.data.filePath = saic-data/files/
+saic.data.templates.filePath = saic-data/templates/
+saic.data.templates.logoPath = saic-data/templates/logos/
+saic.data.templates.fileNotFound = saic-data/utils/filenotfound.pdf
+
+# Scheduler
+saic.scheduler.expired.enabled=false
+
+# Desactivar RefreshScope en Eureka Client
+eureka.client.refresh.enable=false
+# Desactivar RefreshScope en SpringCloud
+spring.cloud.refresh.enabled=false

src/main/resources/application-uib-local.properties

@@ -0,0 +1,33 @@
+# Urls
+saic.url.domain = http://127.0.0.1
+saic.url.public = ${saic.url.domain}/public
+saic.actuator.validIp=10.81.80.0/20
+
+# JPA Debug
+#spring.jpa.show-sql=true 
+#spring.jackson.serialization.FAIL_ON_SELF_REFERENCES=false
+
+# Email config
+saic.mailer.queue.enabled = false
+saic.mailer.reminder.enabled = false
+saic.mailer.calendar.enabled = false
+saic.mailer.maxMailsPerRound = 20
+
+# Database config
+spring.datasource.url=jdbc:postgresql://saiqpre.uib.cat:5432/saic_v3
+spring.datasource.username=sys_saic
+spring.datasource.password=jw4s0F2026
+
+# Files and log config
+logging.file.path=/home/mariomh/Documentos/SAIC/docs/logs
+logging.file.name=/home/mariomh/Documentos/SAIC/docs/logs/saic.log
+
+saic.data.filePath=/home/mariomh/Documentos/SAIC/docs/files/
+saic.data.templates.filePath = /home/mariomh/Documentos/SAIC/docs/templates/
+saic.data.templates.logoPath = /home/mariomh/Documentos/SAIC/docs/templates/logos/
+saic.data.templates.fileNotFound = /home/mariomh/Documentos/SAIC/docs/filenotfound.pdf
+
+# Scheduler
+saic.scheduler.expired.enabled=false
+
+

src/main/resources/application-uib-prod.properties

@@ -0,0 +1,31 @@
+# Urls
+saic.url.domain = https://saic.uv.es:4443
+saic.url.public = ${saic.url.domain}/public
+saic.actuator.validIp=10.81.80.0/20
+
+# Email config
+saic.mailer.queue.enabled = true
+saic.mailer.reminder.enabled = false
+saic.mailer.calendar.enabled = true
+saic.mailer.maxMailsPerRound = 20
+
+# Database config
+spring.datasource.url=jdbc:postgresql://127.0.0.1/saic_v3
+spring.datasource.username=sys_saic
+spring.datasource.password=jw4s0F2026
+
+# Files and log config
+logging.file.path=/DATA/saic-data/logs
+logging.file.name=/DATA/saic-data/logs/saic.log
+saic.data.filePath=/DATA/saic-data/files/
+saic.data.templates.filePath=/DATA/saic-data/templates/
+saic.data.templates.logoPath=/DATA/saic-data/templates/logos/
+saic.data.templates.fileNotFound=/DATA/saic-data/utils/filenotfound.pdf
+
+# Scheduler
+saic.scheduler.expired.enabled=false
+
+# Desactivar RefreshScope en Eureka Client
+eureka.client.refresh.enable=false
+# Desactivar RefreshScope en SpringCloud
+spring.cloud.refresh.enabled=false

src/main/resources/application.properties

@@ -8,7 +8,6 @@ eureka.instance.status-page-url-path=/
 # Actuator
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always
-saic.actuator.validIp=147.156.0.0/16
 
 # Activate spring profiles
 spring.profiles.active=@activatedProperties@
@@ -33,7 +32,6 @@ spring.servlet.multipart.max-request-size=128MB
 
 # Datasource config
 spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.username=postgres
 spring.sql.init.platform=postgres
 
 #spring.jpa.show-sql=true