Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support ebs encryption pr devel #608

Merged
merged 51 commits into from
Feb 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
195ff54
Need to check if is_local is defined in webserver meta dependencies. …
EmlynK Jan 5, 2022
a21e8d1
Ce dev refactor pr 1.x (#518)
gregharvey Jan 5, 2022
cb681f8
Adding backup handling to ldap_server. (#525)
gregharvey Jan 10, 2022
f134be0
Allowing 'gitLab' to disable Prometheus. (#530)
gregharvey Jan 17, 2022
450d409
GitHub Actions - Rebuilt documentation. (#526)
github-actions[bot] Jan 17, 2022
965d7b2
Prometheus pr 1.x (#533)
gregharvey Jan 17, 2022
cbb386d
Add private files support for Drupal in Nginx. (#535)
EmlynK Jan 18, 2022
8904ba8
Prometheus pr 1.x (#539)
gregharvey Jan 18, 2022
df86ca3
Removing our unused ClamAV roles and adding a Galaxy role to common b…
gregharvey Jan 25, 2022
c0e8b06
Revert "Moving OSSEC pkill to use process_manager role instead. (#258…
gregharvey Jan 27, 2022
b8a1f60
Backing out of Packer logging.
gregharvey Jan 28, 2022
217424f
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 3, 2022
9b41cf7
Moving key servers to a variable so we can set them. (#555)
gregharvey Feb 3, 2022
0e14631
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 3, 2022
7804c19
Adding a reboot option to the patching role. (#557)
gregharvey Feb 7, 2022
71d1ea7
Add minimal support for Aurora RDS instances (#567)
EmlynK Feb 7, 2022
0aec274
Merge branch 'devel' of https://github.com/codeenigma/ce-provision in…
gregharvey Feb 8, 2022
e4b7bb3
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 8, 2022
81ee940
Gpg servers fix pr 1.x (#571)
gregharvey Feb 8, 2022
c268b54
Support termination protection in EC2. (#573)
gregharvey Feb 8, 2022
43eaefa
Fix managed SSL key perms and the variable used for the private key. …
EmlynK Feb 8, 2022
25c5768
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 9, 2022
6c38213
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 9, 2022
f3b48b7
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 9, 2022
e7a1b40
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 9, 2022
6900e0f
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 9, 2022
d3fb588
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 9, 2022
d1311ed
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 9, 2022
b9ab5d6
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 10, 2022
f61e540
Ec2 subnet lookup pr 1.x (#583)
gregharvey Feb 10, 2022
c75366e
Ec2 subnet lookup pr 1.x (#589)
gregharvey Feb 10, 2022
7a3c3d9
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 10, 2022
4ea0d3c
Fixing gitlab-runner overriders so upgrades do not break the runner. …
gregharvey Feb 10, 2022
c9ea3cf
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 10, 2022
9b10e44
Gitlab runner service override pr 1.x (#591)
gregharvey Feb 10, 2022
9baccfd
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 15, 2022
a093283
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 21, 2022
295f358
Merge branch 'devel' of https://github.com/codeenigma/ce-provision in…
gregharvey Feb 21, 2022
ac8b60b
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 21, 2022
f7d252d
Merge branch 'devel' of https://github.com/codeenigma/ce-provision in…
gregharvey Feb 22, 2022
565f1f7
Pass db_cluster_identifier for RDS instance during ASG build (#600)
EmlynK Feb 22, 2022
1c12e38
Also pass in the aurora_reader var from the ASG role when including t…
EmlynK Feb 22, 2022
8ed9406
Merge branch 'devel' of https://github.com/codeenigma/ce-provision in…
gregharvey Feb 24, 2022
3c26300
Removing obsolete MySQL config option log_syslog from template. (#607)
gregharvey Feb 24, 2022
f3cdd8d
Adding volume encryption and type options plus a bit more flexibility…
gregharvey Feb 25, 2022
92be722
Setting more sane default instance sizes.
gregharvey Feb 25, 2022
af410f5
Adding more EBS options for ASGs.
gregharvey Feb 25, 2022
af9d0d0
Merge branch 'devel' of https://github.com/codeenigma/ce-provision in…
gregharvey Feb 25, 2022
a0ae6b7
Merge branch 'devel' into support_ebs_encryption-PR-devel
gregharvey Feb 25, 2022
6874911
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
cfdc1ec
Merge branch 'devel' into support_ebs_encryption-PR-devel
gregharvey Feb 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/aws/aws_ami/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
aws_ami:
aws_profile: "{{ _aws_profile }}"
region: "{{ _aws_region }}"
instance_type: t2.micro
instance_type: t3.micro
virtualization_type: hvm
root_device_type: ebs
name_filter: "debian-10-amd64-*"
Expand Down
9 changes: 6 additions & 3 deletions roles/aws/aws_ec2_autoscale_cluster/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ aws_ec2_autoscale_cluster:
- az: c
cidr_block: "10.0.3.128/26"
public_subnet: public-c
instance_type: t2.micro
instance_type: t3.micro
key_name: "{{ ce_provision.username }}@{{ ansible_hostname }}" # This needs to match your "provision" user SSH key.
ami_owner: self # Default to self-created image.
root_volume_size: 40
root_volume_size: 30
root_volume_type: gp2 # available options - https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-volume-types.html
root_volume_encrypted: false
root_volume_delete_on_termination: true
ebs_optimized: true
encrypt_boot: false # Whether to encrypt the EBS volumes or not.
ami_playbook_file: "{{ playbook_dir }}/ami.yml"
Expand Down Expand Up @@ -91,7 +94,7 @@ aws_ec2_autoscale_cluster:
# Associated RDS instance.
rds:
rds: false # wether to create an instance.
db_instance_class: db.m5.large
db_instance_class: db.t3.medium
#db_cluster_identifier: example-aurora-cluster
engine: mariadb
aurora_reader: false
Expand Down
3 changes: 3 additions & 0 deletions roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@
volumes:
- device_name: /dev/xvda
volume_size: "{{ aws_ec2_autoscale_cluster.root_volume_size }}"
volume_type: "{{ aws_ec2_autoscale_cluster.root_volume_type }}"
encrypted: "{{ aws_ec2_autoscale_cluster.root_volume_encrypted }}"
delete_on_termination: "{{ aws_ec2_autoscale_cluster.root_volume_delete_on_termination }}"
register: _aws_ec2_lc_created
when:
- aws_ec2_autoscale_cluster.asg_refresh
Expand Down
7 changes: 5 additions & 2 deletions roles/aws/aws_ec2_with_eip/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
aws_ec2_with_eip:
aws_profile: "{{ _aws_profile }}"
region: "{{ _aws_region }}"
instance_type: t2.micro
instance_type: t3.micro
key_name: "{{ ce_provision.username }}@{{ ansible_hostname }}" # This needs to match your "provision" user SSH key.
ami_name: "{{ _domain_name }}" # The name of an AMI image to use. Image must exists in the same region.
ami_owner: self # Default to self-created image.
Expand All @@ -11,10 +11,13 @@ aws_ec2_with_eip:
vpc_subnet_profile: core # if you are looking up subnets we need a Profile tag to search against
# An IAM Role name to associate with the instance.
iam_role_name: "example"
state: started
state: running
termination_protection: false # set to true to disable termination and avoid accidents
instance_name: "{{ _domain_name }}"
root_volume_size: 80
root_volume_type: gp2 # available options - https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-volume-types.html
root_volume_encrypted: false
root_volume_delete_on_termination: true
ebs_optimized: true
security_groups: []
tags:
Expand Down
4 changes: 3 additions & 1 deletion roles/aws/aws_ec2_with_eip/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@
- device_name: /dev/xvda
ebs:
volume_size: "{{ aws_ec2_with_eip.root_volume_size }}"
delete_on_termination: true
delete_on_termination: "{{ aws_ec2_with_eip.root_volume_delete_on_termination }}"
volume_type: "{{ aws_ec2_with_eip.root_volume_type }}"
encrypted: "{{ aws_ec2_with_eip.root_volume_encrypted }}"
register: aws_ec2_with_eip_instances

- name: Check if we have an existing EIP.
Expand Down
2 changes: 1 addition & 1 deletion roles/aws/aws_rds/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ aws_rds:
- subnet-bbbbbbbb
name: example
tags: {}
db_instance_class: db.m5.large
db_instance_class: db.t3.medium
state: present
description: example
engine: mariadb
Expand Down