Skip to content

Commit

Permalink
Try updating cert for 2023
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel Johnston committed Oct 30, 2023
1 parent 65a8765 commit 80756c8
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 25 deletions.
4 changes: 2 additions & 2 deletions cicd/Ansible-Playbook-Gateway-Deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

- name: copy TLS certificate
copy:
src: ../tmp/joeljca-2022.crt
src: ../tmp/joeljca-2023.crt
dest: /etc/ssl/certs/

- name: copy TLS key
copy:
src: ../tmp/joeljca-2022.rsa
src: ../tmp/joeljca-2023.rsa
dest: /etc/ssl/certs/

- name: copy http configuration
Expand Down
2 changes: 1 addition & 1 deletion cicd/PS-Activate-BLUE.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Write-Host -ForegroundColor blue 'In Activate-BLUE'
$CICDPath = Split-Path -Parent $MyInvocation.MyCommand.Path
$RepoRootPath = Split-Path -Parent $CICDPath

& ${CICDPath}/PS-Get-Certificate-2022.ps1 $RepoRootPath
& ${CICDPath}/PS-Get-Certificate-3.ps1 $RepoRootPath
$NginxConfigContent = & ${CICDPath}/PS-Generate-Nginx-Upstreams.ps1

Out-File -FilePath $RepoRootPath/tmp/joeljca.conf -InputObject $NginxConfigContent
Expand Down
2 changes: 1 addition & 1 deletion cicd/PS-Activate-GREEN.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Write-Host -ForegroundColor green 'In Activate-GREEN'
$CICDPath = Split-Path -Parent $MyInvocation.MyCommand.Path
$RepoRootPath = Split-Path -Parent $CICDPath

& ${CICDPath}/PS-Get-Certificate-2022.ps1 $RepoRootPath
& ${CICDPath}/PS-Get-Certificate-2023.ps1 $RepoRootPath
$NginxConfigContent = & ${CICDPath}/PS-Generate-Nginx-Upstreams.ps1

Out-File -FilePath $RepoRootPath/tmp/joeljca.conf -InputObject $NginxConfigContent
Expand Down
9 changes: 0 additions & 9 deletions cicd/PS-Get-Certificate-2022.ps1

This file was deleted.

12 changes: 6 additions & 6 deletions gateway/joeljca.site.blue
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ server {
# SSL configuration
#
listen 443 ssl default_server;
ssl_certificate /etc/ssl/certs/joeljca-2022.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2022.rsa;
ssl_certificate /etc/ssl/certs/joeljca-2023.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2023.rsa;

server_name www.joelj.ca joelj.ca;

Expand All @@ -25,8 +25,8 @@ server {
# SSL configuration
#
listen 443 ssl;
ssl_certificate /etc/ssl/certs/joeljca-2022.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2022.rsa;
ssl_certificate /etc/ssl/certs/joeljca-2023.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2023.rsa;

server_name wwwblue.joelj.ca;

Expand All @@ -39,8 +39,8 @@ server {
# SSL configuration
#
listen 443 ssl;
ssl_certificate /etc/ssl/certs/joeljca-2022.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2022.rsa;
ssl_certificate /etc/ssl/certs/joeljca-2023.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2023.rsa;

server_name wwwgreen.joelj.ca;

Expand Down
12 changes: 6 additions & 6 deletions gateway/joeljca.site.green
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ server {
# SSL configuration
#
listen 443 ssl default_server;
ssl_certificate /etc/ssl/certs/joeljca-2022.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2022.rsa;
ssl_certificate /etc/ssl/certs/joeljca-2023.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2023.rsa;

server_name www.joelj.ca joelj.ca;

Expand All @@ -25,8 +25,8 @@ server {
# SSL configuration
#
listen 443 ssl;
ssl_certificate /etc/ssl/certs/joeljca-2022.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2022.rsa;
ssl_certificate /etc/ssl/certs/joeljca-2023.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2023.rsa;

server_name wwwblue.joelj.ca;

Expand All @@ -39,8 +39,8 @@ server {
# SSL configuration
#
listen 443 ssl;
ssl_certificate /etc/ssl/certs/joeljca-2022.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2022.rsa;
ssl_certificate /etc/ssl/certs/joeljca-2023.crt;
ssl_certificate_key /etc/ssl/certs/joeljca-2023.rsa;

server_name wwwgreen.joelj.ca;

Expand Down

0 comments on commit 80756c8

Please sign in to comment.