Merge pull request #1152 from gene1wood/march_swarm

Fix instance provisioning and examples
mozilla · Mar 21, 2019 · 628cc3a · 628cc3a
2 parents b467d3b + 3ba1aed
commit 628cc3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/cloudy_mozdef/aws_parameters.example.json b/cloudy_mozdef/aws_parameters.example.json
@@ -20,8 +20,8 @@
     "UsePreviousValue": false
   },
   {
-    "ParameterKey": "AMIImageId",
-    "ParameterValue": "ami-0c3705bb3b43ad51f",
+    "ParameterKey": "SSHIngressCIDR",
+    "ParameterValue": "0.0.0.0/0",
     "UsePreviousValue": false
   },
   {
@@ -43,10 +43,5 @@
     "ParameterKey": "OIDCClientSecret",
     "ParameterValue": "secret-value-goes-here",
     "UsePreviousValue": false
-  },
-  {
-    "ParameterKey": "S3TemplateLocation",
-    "ParameterValue": "https://s3-us-west-2.amazonaws.com/example-bucket-name/cloudformation/path/",
-    "UsePreviousValue": false
   }
 ]
diff --git a/cloudy_mozdef/cloudformation/mozdef-instance.yml b/cloudy_mozdef/cloudformation/mozdef-instance.yml
@@ -251,11 +251,11 @@ Resources:
                 OPTIONS_TASKEXCHANGE=${MozDefSQSQueueName}
               path: /opt/mozdef/docker/compose/cloudy_mozdef_mq_sns_sqs.env
           runcmd:
-            - echo RABBITMQ_PASSWORD=`python3 -c 'import secrets; s = secrets.token_hex(); print(s)'` > rabbitmq.env
+            - echo RABBITMQ_PASSWORD=`python3 -c 'import secrets; s = secrets.token_hex(); print(s)'` > /opt/mozdef/docker/compose/rabbitmq.env
             - chmod --verbose 600 /opt/mozdef/docker/compose/rabbitmq.env
             - chmod --verbose 600 /opt/mozdef/docker/compose/cloudy_mozdef.env
             - chmod --verbose 600 /opt/mozdef/docker/compose/cloudy_mozdef_kibana.env
-            - chmod --verbose 600 /opt/mozdef/docker/compose/cloudy_mozdef_mq_sqs.env
+            - chmod --verbose 600 /opt/mozdef/docker/compose/cloudy_mozdef_mq_sns_sqs.env
             - mkdir --verbose --parents ${EFSMountPoint}
             - echo '*.* @@127.0.0.1:514' >> /etc/rsyslog.conf
             - systemctl enable rsyslog