Skip to content

Commit 132dc85

Browse files
committed
Update pages-gh.yml remove traefik rule for researchcomputing.ca, parametrize __RESEARCHER__ to secret.
1 parent fcf4cda commit 132dc85

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/workflows/pages-gh.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ jobs:
373373
# __USERNAME__="${{ secrets.GITLAB_CONTAINER_USERNAME }}" \
374374
# __PASSWORD__="${{ secrets.GITLAB_CONTAINER_TOKEN }}" \
375375
# __REGISTRY__="${{ secrets.NOMAD_SERVER_DATACENTERS }}" \
376+
__RESEARCHER__: "${{ vars.__RESEARCHER__ }}"
376377

377378
steps:
378379
- name: Prepare Environment

nomad/template.hcl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,8 @@ job "${__SERVICE__}-${__ENVIRONMENT__}" {
6565
"traefik.http.routers.rcg-${__SERVICE__}-${__ENVIRONMENT__}.tls=true",
6666
"traefik.http.routers.rcg-${__SERVICE__}-${__ENVIRONMENT__}.entrypoints=websecure",
6767

68-
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputing.ca`)",
69-
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}-nossl.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputing.ca`)",
70-
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.tls=true",
71-
72-
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputinggroup.ca`)",
73-
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}-nossl.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputinggroup.ca`)",
68+
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.${__RESEARCHER__}.researchcomputinggroup.ca`)",
69+
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}-nossl.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.${__RESEARCHER__}.researchcomputinggroup.ca`)",
7470
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.tls=true",
7571
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.entrypoints=websecure",
7672
]

0 commit comments

Comments
 (0)