diff --git a/manifests/manifest-base.yml b/manifests/manifest-base.yml index f9516c47..906f997c 100644 --- a/manifests/manifest-base.yml +++ b/manifests/manifest-base.yml @@ -1,10 +1,16 @@ --- buildpack: go_buildpack memory: 256M +domain: app.cloud.gov services: - dashboard-ups - dashboard-redis env: + CONSOLE_LOGIN_URL: https://login.fr.cloud.gov/ + CONSOLE_UAA_URL: https://uaa.fr.cloud.gov/ + CONSOLE_API_URL: https://api.fr.cloud.gov/ + CONSOLE_LOG_URL: https://loggregator.fr.cloud.gov/ + SECURE_COOKIES: true GA_TRACKING_ID: UA-48605964-34 GOVERSION: go1.8 GOPACKAGENAME: github.com/18F/cg-dashboard diff --git a/manifests/manifest-demo.yml b/manifests/manifest-demo.yml index 9e68b147..0b9f4481 100644 --- a/manifests/manifest-demo.yml +++ b/manifests/manifest-demo.yml @@ -1,5 +1,5 @@ --- -inherit: manifest-region-base.yml +inherit: manifest-base.yml applications: - name: cg-dashboard-demo host: dashboard-demo diff --git a/manifests/manifest-prod.yml b/manifests/manifest-prod.yml index 574d97f2..1cfd4267 100644 --- a/manifests/manifest-prod.yml +++ b/manifests/manifest-prod.yml @@ -1,5 +1,5 @@ --- -inherit: manifest-region-base.yml +inherit: manifest-base.yml domain: fr.cloud.gov applications: - name: cg-dashboard diff --git a/manifests/manifest-region-base.yml b/manifests/manifest-region-base.yml deleted file mode 100644 index 8a4aa17a..00000000 --- a/manifests/manifest-region-base.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -inherit: ../manifest-base.yml -domain: app.cloud.gov -env: - CONSOLE_LOGIN_URL: https://login.fr.cloud.gov/ - CONSOLE_UAA_URL: https://uaa.fr.cloud.gov/ - CONSOLE_API_URL: https://api.fr.cloud.gov/ - CONSOLE_LOG_URL: https://loggregator.fr.cloud.gov/ - SECURE_COOKIES: true diff --git a/manifests/manifest-staging.yml b/manifests/manifest-staging.yml index d0e5d11c..7e963e9c 100644 --- a/manifests/manifest-staging.yml +++ b/manifests/manifest-staging.yml @@ -1,5 +1,5 @@ --- -inherit: manifest-region-base.yml +inherit: manifest-base.yml applications: - name: cg-dashboard-staging host: dashboard-staging