Merge pull request #98 from Cognifide/feature/CLAN6-155-Move-admin-se…

…ttings-file-into-mnt-directory CLAN6-155 | `coboardInit` task updated
wttech · Nov 13, 2019 · 81ecfc2 · 81ecfc2
2 parents 7268d3f + 6c731e8
commit 81ecfc2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@ Thumbs.db
 
 *.jar
 /knotx/conf/jwt.conf
-/knotx/conf/admins.conf
+/mnt/admins.conf
 /mnt/*.json
 /mnt/*.backup
 

diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.kts
@@ -1,7 +1,7 @@
 val configsToCopy = mapOf(
         "config.json" to "/mnt",
         "endpoints.json" to "/mnt",
-        "admins.conf" to "/knotx/conf",
+        "admins.conf" to "/mnt",
         "jwt.conf" to "/knotx/conf"
 )
 

diff --git a/knotx/conf/routes/operations.conf b/knotx/conf/routes/operations.conf
@@ -25,7 +25,7 @@ routingOperations = ${routingOperations} [
         name = login-handler
         config {
           include required(classpath("jwt.conf"))
-          include required(classpath("admins.conf"))
+          include required(classpath("data/admins.conf"))
           wrongUserMsg = "Please, enter correct Username"
           wrongPassMsg = "Please, enter valid Password"
         }