Skip to content

Support ebs encryption pr devel #622

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

Merged
merged 119 commits into from
Feb 25, 2022
Merged
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
b2db7eb
GitHub Actions - Rebuilt documentation.
ce-jenkins Nov 10, 2021
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
ed5399f
GitHub Actions - Rebuilt documentation. (#536)
github-actions[bot] Feb 25, 2022
bd3bd89
Merge branch '1.x' into support_ebs_encryption
gregharvey Feb 25, 2022
8f3f379
Setting encryption to match AMI settings.
gregharvey Feb 25, 2022
e59071b
Merge branch 'devel' of https://github.com/codeenigma/ce-provision in…
gregharvey Feb 25, 2022
6e6b114
Merging devel.
gregharvey Feb 25, 2022
1532ff1
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
d7dcf1a
Merge branch 'support_ebs_encryption-PR-devel' of https://github.com/…
gregharvey Feb 25, 2022
c48beec
Setting encryption to match AMI settings.
gregharvey Feb 25, 2022
8563835
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
f83d15c
We also need to dynamically set the ASGs own encrypt_boot var.
gregharvey Feb 25, 2022
77c7774
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 25, 2022
4089182
Merge branch 'devel' into support_ebs_encryption-PR-devel
gregharvey Feb 25, 2022
d9e95c5
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
fdf42d9
Consistent default region pr 1.x (#611)
gregharvey Feb 25, 2022
75dbc20
Merging 1.x.
gregharvey Feb 25, 2022
242e249
We need to merge the new branch changes before we can rebuild the docs.
gregharvey Feb 25, 2022
de29223
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
7ef4684
Merge branch 'documentation' into 1.x
gregharvey Feb 25, 2022
7d97880
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 25, 2022
63c7193
No need for region, IAM SAML setup is global, (#617)
gregharvey Feb 25, 2022
a2bf200
Merge branch '1.x' into support_ebs_encryption
gregharvey Feb 25, 2022
a79695a
Fixing merge command in CI.
gregharvey Feb 25, 2022
a39b4f1
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 25, 2022
d738e21
Merge branch 'devel' into support_ebs_encryption-PR-devel
gregharvey Feb 25, 2022
6d5e4f9
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
e8f040f
Not sure toc.sh is actually executing.
gregharvey Feb 25, 2022
97a8b6c
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
8357835
Refactoring encrypt EBS flags to avoid detected loop condition in vars.
gregharvey Feb 25, 2022
d6f5cca
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
72d976b
Safer CI, only adds .md files.
gregharvey Feb 25, 2022
3eef821
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 25, 2022
e20b721
Merge branch 'devel' into support_ebs_encryption-PR-devel
gregharvey Feb 25, 2022
5bdf240
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
a9b0c1f
Trying to figure out CI logic for building docs.
gregharvey Feb 25, 2022
33051fd
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 25, 2022
0400774
Merge branch 'devel' into support_ebs_encryption-PR-devel
gregharvey Feb 25, 2022
9fd2771
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
0ae38e2
Trying to figure out CI logic for building docs.
gregharvey Feb 25, 2022
726331b
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
451021a
Trying to figure out CI logic for building docs.
gregharvey Feb 25, 2022
c0b36b9
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
94878f5
Trying adding a git pull.
gregharvey Feb 25, 2022
bd4d449
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
44b7440
Setting git pull config options.
gregharvey Feb 25, 2022
6f0e211
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
42273fe
Reordering things.
gregharvey Feb 25, 2022
d811b51
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
2356bc9
Adding --allow-unrelated-histories to the git pull.
gregharvey Feb 25, 2022
6456557
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
914bb86
Trying a feature branch approach.
gregharvey Feb 25, 2022
59c6266
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
7cfdd01
Forcing the GitHub action to fetch all git history.
gregharvey Feb 25, 2022
bbb223b
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
9ba69aa
Bad whitespace, naughty whitespace.
gregharvey Feb 25, 2022
10f754d
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
acb27b9
Trying a different PR action.
gregharvey Feb 25, 2022
1f7adfe
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
f8b597e
Do not merge the branch in, we only want the markdown changes.
gregharvey Feb 25, 2022
14fdde8
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
2248c8a
Keeping the documentation branch clean.
gregharvey Feb 25, 2022
672b68f
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
3e951ea
We need to push a detached HEAD.
gregharvey Feb 25, 2022
17d991a
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
c37f05f
Do we need the checkout at all?
gregharvey Feb 25, 2022
f5ac547
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
gregharvey Feb 25, 2022
fd5c657
Adding a docs pull.
gregharvey Feb 25, 2022
10395c3
Merge branch 'support_ebs_encryption' into support_ebs_encryption-PR-…
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
19 changes: 11 additions & 8 deletions .github/workflows/ce-provision-build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,36 @@ jobs:
- name: Checkout code
if: ${{ github.event.pull_request.head.ref != 'documentation' }}
uses: actions/checkout@v2
with:
fetch-depth: 0

# Configures global Git variables for committing
- name: Configure Git
run: |
git config --global user.email "sysadm@codeenigma.com"
git config --global user.name "Code Enigma CI"
git config --global pull.rebase false

# Builds the docs
- name: Build documentation
if: ${{ github.event.pull_request.head.ref != 'documentation' }}
if: ${{ github.event.pull_request.head.ref != 'documentation' && github.event.pull_request.base.ref == '1.x' }}
run: |
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
git fetch
git checkout documentation
git merge origin/${{ github.event.pull_request.head.ref }}
/bin/sh ./contribute/toc.sh
find . -name "*.md" | xargs git add
git diff --quiet && git diff --staged --quiet || git commit -am 'GitHub Actions - Rebuilt documentation.' && git push origin documentation
git diff --quiet && git diff --staged --quiet || git commit -am 'GitHub Actions - Rebuilt documentation.'
git pull origin documentation
git push origin HEAD:documentation
shell: bash

# Create docs pull request
- name: Create a documentation pull request
if: ${{ github.event.pull_request.head.ref != 'documentation' && github.event.pull_request.base.ref == '1.x' }}
uses: devops-infra/action-pull-request@v0.4.2
uses: repo-sync/pull-request@v2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: documentation
target_branch: ${{ github.event.pull_request.base.ref }}
title: Documentation update.
body: "**Automated pull request** created by GitHub Actions because of a documentation update."
destination_branch: ${{ github.event.pull_request.base.ref }}
pr_title: Documentation update.
pr_body: "**Automated pull request** created by GitHub Actions because of a documentation update."