From 9d58713f9292bc114d29db461d4092584904bd08 Mon Sep 17 00:00:00 2001
From: Rebecca Star <rebstar6@gmail.com>
Date: Mon, 19 Nov 2018 09:35:47 -0500
Subject: [PATCH] fix portal configuration for local run (#358)

---
 build.sbt                            | 1 -
 modules/portal/conf/application.conf | 9 +++++++++
 modules/portal/conf/reference.conf   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 modules/portal/conf/application.conf

diff --git a/build.sbt b/build.sbt
index 3dae8b60d..1a93fd9a3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -332,7 +332,6 @@ lazy val portal = (project in file("modules/portal")).enablePlugins(PlayScala, A
     routesGenerator := InjectedRoutesGenerator,
     coverageExcludedPackages := "<empty>;views.html.*;router.*",
     javaOptions in Test += "-Dconfig.file=conf/application-test.conf",
-    javaOptions in run += "-Dhttp.port=9001 -Dconfig.file=modules/portal/conf/application.conf",
 
     // adds an extra classpath to the portal loading so we can externalize jars, make sure to create the lib_extra
     // directory and lay down any dependencies that are required when deploying
diff --git a/modules/portal/conf/application.conf b/modules/portal/conf/application.conf
new file mode 100644
index 000000000..377119ad4
--- /dev/null
+++ b/modules/portal/conf/application.conf
@@ -0,0 +1,9 @@
+http.port = 9001
+
+crypto {
+  type = "vinyldns.core.crypto.JavaCrypto"
+  secret = "8B06A7F3BC8A2497736F1916A123AA40E88217BE9264D8872597EF7A6E5DCE61"
+}
+
+// Local.conf has files specific to your environment, for example your own LDAP settings
+include "local.conf"
diff --git a/modules/portal/conf/reference.conf b/modules/portal/conf/reference.conf
index 57ff07a30..4b7e5ac37 100644
--- a/modules/portal/conf/reference.conf
+++ b/modules/portal/conf/reference.conf
@@ -139,7 +139,7 @@ crypto {
   secret = ${?CRYPTO_SECRET}
 }
 
-http.port = 9001
+http.port = 9000
 http.port = ${?PORTAL_PORT}
 
 links = [