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
2 changes: 1 addition & 1 deletion .cloudgov/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ applications:
NODE_MODULES_CACHE: false
NPM_CONFIG_PRODUCTION: true
OPS_EMAIL: [email protected]
PAGES_EDITOR_HOST: https://pages-editor((env_postfix)).app.cloud.gov
PAGES_PUBLISHER_HOST: ((publisher_host))
PRODUCT: pages
PROXY_DOMAIN: ((proxy_domain))
QUEUES_BUILD_TASKS_CONCURRENCY: ((queues_build_tasks_concurrency))
Expand Down
1 change: 1 addition & 0 deletions .cloudgov/vars/pages-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ name: pages-dev
new_relic_app_name: web-pages-dev
node_env: development
proxy_domain: sites.pages-dev.cloud.gov
publisher_host: https://pages-editor-dev.app.cloud.gov
queues_build_tasks_concurrency: 2
queues_site_builds_concurrency: 3
route-service-instances: 2
Expand Down
1 change: 1 addition & 0 deletions .cloudgov/vars/pages-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ name: pages-production
new_relic_app_name: web-pages-production
node_env: production
proxy_domain: sites.pages.cloud.gov
publisher_host: https://publisher.cloud.gov
queues_build_tasks_concurrency: 10
queues_site_builds_concurrency: 10
route-service-instances: 6
Expand Down
1 change: 1 addition & 0 deletions .cloudgov/vars/pages-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ name: pages-staging
new_relic_app_name: web-pages-staging
node_env: production
proxy_domain: sites.pages-staging.cloud.gov
publisher_host: https://publisher-staging.cloud.gov
queues_build_tasks_concurrency: 4
queues_site_builds_concurrency: 4
route-service-instances: 2
Expand Down
6 changes: 3 additions & 3 deletions api/workers/jobProcessors/createEditorSite.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const { UserEnvironmentVariable } = require('../../models');
const { createJobLogger } = require('./utils');
const { userEnvVar, encryption } = require('../../../config');

const { PAGES_EDITOR_HOST } = process.env;
const { PAGES_PUBLISHER_HOST } = process.env;

/**
* The Site Queue job processor
Expand All @@ -27,7 +27,7 @@ async function createEditorSite(job) {
// Webhook client to send success or error request to
// Pages Editor site endpoint
const webhookClient = axios.create({
baseURL: `${PAGES_EDITOR_HOST}/api/webhook/site`,
baseURL: `${PAGES_PUBLISHER_HOST}/api/webhook/site`,
headers: {
'Content-Type': 'application/json',
},
Expand Down Expand Up @@ -69,7 +69,7 @@ async function createEditorSite(job) {
hint: apiKeyEnc.hint,
});

const editorHostEnc = encrypt(PAGES_EDITOR_HOST, userEnvVar.key);
const editorHostEnc = encrypt(PAGES_PUBLISHER_HOST, userEnvVar.key);
await UserEnvironmentVariable.create({
siteId: site.id,
name: 'EDITOR_APP_URL',
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
PROXY_DOMAIN: localhost:1337
CI: true
FEATURE_FILE_STORAGE_SERVICE: true
PAGES_EDITOR_HOST: https://editor.example.gov
PAGES_PUBLISHER_HOST: https://editor.example.gov
OPS_EMAIL: [email protected]
db:
image: postgres:ci
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ services:
CLOUD_FOUNDRY_OAUTH_TOKEN_URL: ${CLOUD_FOUNDRY_API_HOST}/oauth/token
CF_API_USERNAME: deploy_user
CF_API_PASSWORD: deploy_pass
PAGES_EDITOR_HOST: https://editor.example.gov
PAGES_PUBLISHER_HOST: https://editor.example.gov
PROXY_DOMAIN: localhost:1337
QUEUES_BUILD_TASKS_CONCURRENCY: 1
OPS_EMAIL: [email protected]
Expand Down
Loading