creating a keys directory without the append 0001 in order for servic…

…e to start on deploy
UKHomeOffice · May 28, 2020 · 8a7a699 · 8a7a699
1 parent 8121506
commit 8a7a699
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/analysis.tf b/analysis.tf
@@ -35,12 +35,16 @@ export analysis_proxy_hostname=`aws --region eu-west-2 ssm get-parameter --name
 
 mkdir -p "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/"
 mkdir -p "/etc/letsencrypt/live/""$analysis_proxy_hostname""-0001/"
+mkdir -p "/etc/letsencrypt/live/""$analysis_proxy_hostname/"
 aws --region eu-west-2 ssm get-parameter --name analysis_proxy_certificate --query 'Parameter.Value' --output text --with-decryption > "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/cert1.pem"
 aws --region eu-west-2 ssm get-parameter --name analysis_proxy_certificate_key --query 'Parameter.Value' --output text --with-decryption > "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/privkey1.pem"
 aws --region eu-west-2 ssm get-parameter --name analysis_proxy_certificate_fullchain --query 'Parameter.Value' --output text --with-decryption > "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/fullchain1.pem"
 ln -s "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/cert1.pem" /etc/letsencrypt/live/""$analysis_proxy_hostname""-0001/cert.pem
 ln -s "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/privkey1.pem" /etc/letsencrypt/live/""$analysis_proxy_hostname""-0001/privkey.pem
 ln -s "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/fullchain1.pem" /etc/letsencrypt/live/""$analysis_proxy_hostname""-0001/fullchain.pem
+ln -s "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/cert1.pem" /etc/letsencrypt/live/""$analysis_proxy_hostname/cert.pem
+ln -s "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/privkey1.pem" /etc/letsencrypt/live/""$analysis_proxy_hostname/privkey.pem
+ln -s "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/fullchain1.pem" /etc/letsencrypt/live/""$analysis_proxy_hostname/fullchain.pem
 chmod 0644 "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/cert1.pem"
 chmod 0644 "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/privkey1.pem"
 chmod 0644 "/etc/letsencrypt/archive/""$analysis_proxy_hostname""-0001/fullchain1.pem"

diff --git a/tests/ops_test.py b/tests/ops_test.py
@@ -54,12 +54,12 @@ def setUpClass(self):
               dq_pipeline_ops_readonly_bucket_list         = ["s3-bucket-name"]
 
               route_table_cidr_blocks   = {
-                peering_cidr = "1234"
-                apps_cidr = "1234"
-                acp_vpn = "1234"
-                acp_prod = "1234"
-                acp_ops = "1234"
-                acp_cicd = "1234"
+                peering_cidr = "1.2.0.0/32"
+                apps_cidr = "1.2.0.0/32"
+                acp_vpn = "1.2.0.0/32"
+                acp_prod = "1.2.0.0/32"
+                acp_ops = "1.2.0.0/32"
+                acp_cicd = "1.2.0.0/32"
               }
               vpc_peering_connection_ids = {
                 ops_and_apps = "1234"