Try updating cert for 2023

joelj1995 · Oct 30, 2023 · 90dff47 · 90dff47
1 parent 65a8765
commit 90dff47
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 18 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "ansible.python.interpreterPath": "c:\\Users\\colte\\AppData\\Local\\Microsoft\\WindowsApps\\python3.11.exe"
+}
diff --git a/cicd/Ansible-Playbook-Gateway-Deploy.yml b/cicd/Ansible-Playbook-Gateway-Deploy.yml
@@ -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

diff --git a/cicd/PS-Activate-BLUE.ps1 b/cicd/PS-Activate-BLUE.ps1
@@ -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

diff --git a/cicd/PS-Activate-GREEN.ps1 b/cicd/PS-Activate-GREEN.ps1
@@ -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

diff --git a/cicd/PS-Get-Certificate-2022.ps1 → cicd/PS-Get-Certificate-2023.ps1 b/cicd/PS-Get-Certificate-2022.ps1 → cicd/PS-Get-Certificate-2023.ps1
@@ -5,5 +5,5 @@ param(
 
 $ErrorActionPreference = "Stop"
 
-Get-AzKeyVaultSecret -VaultName "joeljcakeys" -Name "joeljca-2022-chained-crt" -AsPlainText | Out-File -Path $RepoRootPath/tmp/joeljca-2022.crt
-Get-AzKeyVaultSecret -VaultName "joeljcakeys" -Name "joeljca-2022-rsa" -AsPlainText | Out-File -Path $RepoRootPath/tmp/joeljca-2022.rsa
+Get-AzKeyVaultSecret -VaultName "joeljcakeys" -Name "joeljca-2023-crt" -AsPlainText | Out-File -Path $RepoRootPath/tmp/joeljca-2023.crt
+Get-AzKeyVaultSecret -VaultName "joeljcakeys" -Name "joeljca-2023-rsa" -AsPlainText | Out-File -Path $RepoRootPath/tmp/joeljca-2023.rsa
diff --git a/gateway/joeljca.site.blue b/gateway/joeljca.site.blue
@@ -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;
 
@@ -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;
 
@@ -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;
 

diff --git a/gateway/joeljca.site.green b/gateway/joeljca.site.green
@@ -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;
 
@@ -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;
 
@@ -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;