From a88f577b534f59aee04bfb515143ff1f3a97879d Mon Sep 17 00:00:00 2001
From: Gauthier Roebroeck <gauthier.roebroeck@gmail.com>
Date: Thu, 5 Mar 2020 20:34:18 +0800
Subject: [PATCH] refactor: remove prod profile

merged into default
---
 komga/Dockerfile                                      |  2 +-
 .../infrastructure/swagger/SwaggerConfiguration.kt    |  4 +---
 .../interfaces/scheduler/InitialUserController.kt     |  4 ++--
 .../interfaces/scheduler/PeriodicScannerController.kt |  2 +-
 komga/src/main/resources/application-dev.yml          |  6 ++----
 komga/src/main/resources/application-docker.yml       |  2 --
 komga/src/main/resources/application-prod.yml         |  6 ------
 komga/src/main/resources/application.yml              | 11 +++++++++++
 8 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 komga/src/main/resources/application-prod.yml

diff --git a/komga/Dockerfile b/komga/Dockerfile
index 3d79be0e1..8540a4567 100644
--- a/komga/Dockerfile
+++ b/komga/Dockerfile
@@ -4,5 +4,5 @@ ARG DEPENDENCY=target/dependency
 COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
 COPY ${DEPENDENCY}/META-INF /app/META-INF
 COPY ${DEPENDENCY}/BOOT-INF/classes /app
-ENV SPRING_PROFILES_ACTIVE=prod,docker
+ENV SPRING_PROFILES_ACTIVE=docker
 ENTRYPOINT ["java","-cp","app:app/lib/*","org.gotson.komga.ApplicationKt"]
diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/SwaggerConfiguration.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/SwaggerConfiguration.kt
index b68f0a68c..414ac8585 100644
--- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/SwaggerConfiguration.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/SwaggerConfiguration.kt
@@ -2,13 +2,11 @@ package org.gotson.komga.infrastructure.swagger
 
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Profile
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import springfox.documentation.spi.DocumentationType
 import springfox.documentation.spring.web.plugins.Docket
 import springfox.documentation.swagger2.annotations.EnableSwagger2
 
-@Profile("dev", "prod")
 @Configuration
 @EnableSwagger2
 class SwaggerConfiguration {
@@ -18,4 +16,4 @@ class SwaggerConfiguration {
     return Docket(DocumentationType.SWAGGER_2)
         .ignoredParameterTypes(AuthenticationPrincipal::class.java)
   }
-}
\ No newline at end of file
+}
diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/InitialUserController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/InitialUserController.kt
index e4cbd54b2..35bc4ff18 100644
--- a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/InitialUserController.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/InitialUserController.kt
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Controller
 
 private val logger = KotlinLogging.logger {}
 
-@Profile("(dev | prod) & !claim")
+@Profile("!(test | claim)")
 @Controller
 class InitialUserController(
     private val userDetailsLifecycle: KomgaUserDetailsLifecycle,
@@ -52,7 +52,7 @@ class InitialUsersDevConfiguration {
 }
 
 @Configuration
-@Profile("prod")
+@Profile("!dev")
 class InitialUsersProdConfiguration {
   @Bean
   fun initialUsers() = listOf(
diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt
index 9f764c479..32ac0cb01 100644
--- a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt
@@ -11,7 +11,7 @@ import java.util.concurrent.RejectedExecutionException
 
 private val logger = KotlinLogging.logger {}
 
-@Profile("dev", "prod")
+@Profile("!test")
 @Controller
 class PeriodicScannerController(
     private val asyncOrchestrator: AsyncOrchestrator
diff --git a/komga/src/main/resources/application-dev.yml b/komga/src/main/resources/application-dev.yml
index 47bf48bbd..0dbe1cc5f 100644
--- a/komga/src/main/resources/application-dev.yml
+++ b/komga/src/main/resources/application-dev.yml
@@ -5,10 +5,8 @@ komga:
   remember-me:
     key: changeMe!
     validity: 2592000 # 1 month
-#  libraries-scan-directory-exclusions:
-#    - "#recycle"
-#    - "@eaDir"
-#  libraries-scan-cron: "*/5 * * * * ?"
+  #  libraries-scan-cron: "*/5 * * * * ?" #every 5 seconds
+  libraries-scan-cron: "-" #disable
 spring:
   jpa:
     properties:
diff --git a/komga/src/main/resources/application-docker.yml b/komga/src/main/resources/application-docker.yml
index 04b4e5621..b015aec23 100644
--- a/komga/src/main/resources/application-docker.yml
+++ b/komga/src/main/resources/application-docker.yml
@@ -2,5 +2,3 @@ spring:
   datasource:
     url: jdbc:h2:/config/database.h2
 logging.file.name: /config/logs/komga.log
-komga:
-  libraries-scan-cron: "0 */15 * * * ?"
diff --git a/komga/src/main/resources/application-prod.yml b/komga/src/main/resources/application-prod.yml
deleted file mode 100644
index c38de6b83..000000000
--- a/komga/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-logging:
-  file:
-    max-history: 10
-    name: komga.log
-komga:
-  libraries-scan-cron: "0 */15 * * * ?"
diff --git a/komga/src/main/resources/application.yml b/komga/src/main/resources/application.yml
index a66dc1a0f..d637da0b0 100644
--- a/komga/src/main/resources/application.yml
+++ b/komga/src/main/resources/application.yml
@@ -1,5 +1,16 @@
 application.version: ${version}
 
+logging:
+  file:
+    max-history: 10
+    name: komga.log
+
+komga:
+  libraries-scan-cron: "0 */15 * * * ?"
+  libraries-scan-directory-exclusions:
+    - "#recycle"
+    - "@eaDir"
+
 spring:
   #  cache:
   #    caffeine-spec: maximumSize=500,expireAfterWrite=300s