From 4ab6f559dd27717a9a05b1f412888b98e904c8fd Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 21 Oct 2020 21:04:57 +0200
Subject: [PATCH] app-config: merged dev config back into main config

---
 app-config.development.yaml                         | 13 -------------
 app-config.yaml                                     |  8 ++++++--
 .../default-app/app-config.development.yaml         | 13 -------------
 .../templates/default-app/app-config.yaml.hbs       |  8 ++++++--
 4 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 app-config.development.yaml
 delete mode 100644 packages/create-app/templates/default-app/app-config.development.yaml

diff --git a/app-config.development.yaml b/app-config.development.yaml
deleted file mode 100644
index 817847c6d6..0000000000
--- a/app-config.development.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-app:
-  baseUrl: http://localhost:3000
-
-backend:
-  baseUrl: http://localhost:7000
-  listen:
-    port: 7000
-  cors:
-    origin: http://localhost:3000
-    methods: [GET, POST, PUT, DELETE]
-    credentials: true
-  csp:
-    connect-src: ["'self'", 'http:', 'https:']
diff --git a/app-config.yaml b/app-config.yaml
index 6e49e765cd..05bf39b5b3 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -1,6 +1,6 @@
 app:
   title: Backstage Example App
-  baseUrl: http://localhost:7000
+  baseUrl: http://localhost:3000
   googleAnalyticsTrackingId: # UA-000000-0
 
 backend:
@@ -10,8 +10,12 @@ backend:
   database:
     client: sqlite3
     connection: ':memory:'
+  cors:
+    origin: http://localhost:3000
+    methods: [GET, POST, PUT, DELETE]
+    credentials: true
   csp:
-    connect-src: ["'self'", 'https:']
+    connect-src: ["'self'", 'http:', 'https:']
 
 # See README.md in the proxy-backend plugin for information on the configuration format
 proxy:
diff --git a/packages/create-app/templates/default-app/app-config.development.yaml b/packages/create-app/templates/default-app/app-config.development.yaml
deleted file mode 100644
index 817847c6d6..0000000000
--- a/packages/create-app/templates/default-app/app-config.development.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-app:
-  baseUrl: http://localhost:3000
-
-backend:
-  baseUrl: http://localhost:7000
-  listen:
-    port: 7000
-  cors:
-    origin: http://localhost:3000
-    methods: [GET, POST, PUT, DELETE]
-    credentials: true
-  csp:
-    connect-src: ["'self'", 'http:', 'https:']
diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs
index b92cdf22bd..a0b9f156ed 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -1,6 +1,6 @@
 app:
   title: Scaffolded Backstage App
-  baseUrl: http://localhost:7000
+  baseUrl: http://localhost:3000
 
 organization:
   name: My Company
@@ -10,7 +10,11 @@ backend:
   listen:
     port: 7000
   csp:
-    connect-src: ["'self'", 'https:']
+    connect-src: ["'self'", 'http:', 'https:']
+  cors:
+    origin: http://localhost:3000
+    methods: [GET, POST, PUT, DELETE]
+    credentials: true
   {{#if dbTypeSqlite}}
   database:
     client: sqlite3