Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/.circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ workflows:
config: staging
requires:
- build_staging
bucket: "<% index .Params `stagingFrontendHost` %>"
bucket: "<% index .Params `stagingFrontendSubdomain` %><% index .Params `stagingHostRoot` %>"
region: "<% index .Params `region` %>"
# Depending on your development flow you may want to also only deploy to staging on master.
# filters:
Expand All @@ -226,7 +226,7 @@ workflows:
requires:
- unit_test
- build_production
bucket: "<% index .Params `productionFrontendHost` %>"
bucket: "<% index .Params `productionFrontendSubdomain` %><% index .Params `productionHostRoot` %>"
region: "<% index .Params `region` %>"
filters:
branches:
Expand Down
2 changes: 1 addition & 1 deletion templates/src/config/production.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"appName": "<% .Name %>",
"environment": "production",
"backendURL": "https://<% index .Params `productionBackendHost` %>"
"backendURL": "https://<% index .Params `productionBackendSubdomain` %><% index .Params `productionHostRoot` %>"
}
2 changes: 1 addition & 1 deletion templates/src/config/staging.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"appName": "<% .Name %>",
"environment": "staging",
"backendURL": "https://<% index .Params `stagingBackendHost` %>"
"backendURL": "https://<% index .Params `stagingBackendSubdomain` %><% index .Params `stagingHostRoot` %>"
}
24 changes: 16 additions & 8 deletions zero-module.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,19 @@ parameters:
- "us-west-2"
- "us-east-1"
- "us-east-2"
- field: productionFrontendHost
label: Production Frontend Host Name (e.g. app.mydomain.com)
- field: productionBackendHost
label: Production Backend Host Name (e.g. api.mydomain.com)
- field: stagingFrontendHost
label: Staging Frontend Host Name (e.g. app.mydomain-staging.com)
- field: stagingBackendHost
label: Staging Backend Host Name (e.g. api.mydomain-staging.com)
- field: productionHostRoot
label: Production Root Host Name (e.g. mydomain.com) - this must be the root of the chosen domain, not a subdomain.
- field: productionFrontendSubdomain
label: Production Frontend Host Name (e.g. app.)
default: app.
- field: productionBackendSubdomain
label: Production Backend Host Name (e.g. api.)
default: api.
- field: stagingHostRoot
label: Staging Root Host Name (e.g. mydomain-staging.com) - this must be the root of the chosen domain, not a subdomain.
- field: stagingFrontendSubdomain
label: Staging Frontend Host Name (e.g. app.)
default: app.
- field: stagingBackendSubdomain
label: Staging Backend Host Name (e.g. api.)
default: api.