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

Gpg servers fix pr devel #570

Merged
merged 34 commits into from
Feb 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 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
ba50c6c
Moving key servers to a variable so we can set them.
gregharvey Feb 3, 2022
217424f
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 3, 2022
0df3f0f
Merge branch 'devel' into gpg_servers_fix-PR-devel
gregharvey Feb 3, 2022
5835b88
Merge branch 'gpg_servers_fix' into gpg_servers_fix-PR-devel
gregharvey Feb 3, 2022
d68985e
Allowing us to disable sending keys completely.
gregharvey Feb 3, 2022
76a6444
Merge branch 'gpg_servers_fix' into gpg_servers_fix-PR-devel
gregharvey Feb 3, 2022
6ea3432
Oops, doubled up on existing functionality.
gregharvey Feb 3, 2022
5c80710
Merge branch 'gpg_servers_fix' into gpg_servers_fix-PR-devel
gregharvey Feb 3, 2022
c304966
Fixing var name.
gregharvey Feb 3, 2022
dca85cb
Merge branch 'gpg_servers_fix' into gpg_servers_fix-PR-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
dcd354e
Merge branch '1.x' into gpg_servers_fix
gregharvey Feb 8, 2022
569ff43
Using a pipe to grep with 'command' cannot work, refactoring.
gregharvey Feb 8, 2022
0aec274
Merge branch 'devel' of https://github.com/codeenigma/ce-provision in…
gregharvey Feb 8, 2022
175ab37
Merge branch 'devel' into gpg_servers_fix-PR-devel
gregharvey Feb 8, 2022
c8d581f
Merge branch 'gpg_servers_fix' into gpg_servers_fix-PR-devel
gregharvey Feb 8, 2022
879b83e
Making CI use the meta deploy role to test gitlab.
gregharvey Feb 8, 2022
c252ada
Merge branch 'gpg_servers_fix' into gpg_servers_fix-PR-devel
gregharvey Feb 8, 2022
c2cfa43
We mustn't assume AWS servers for deploy and controller.
gregharvey Feb 8, 2022
eaf1bc6
Merge branch 'gpg_servers_fix' into gpg_servers_fix-PR-devel
gregharvey Feb 8, 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
4 changes: 1 addition & 3 deletions ce-dev/ansible/plays/gitlab/gitlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
- ansible.builtin.import_role:
name: _init
- ansible.builtin.import_role:
name: gitlab
- ansible.builtin.import_role:
name: haproxy
name: _meta/deploy
- ansible.builtin.import_role:
name: _exit
1 change: 0 additions & 1 deletion roles/_meta/controller/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
dependencies:
- role: user_provision
- role: _meta/common_base
- role: _meta/aws_client_instance
- role: aws/aws_credentials
- role: ssh_server
- role: ce_provision
Expand Down
1 change: 0 additions & 1 deletion roles/_meta/deploy/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
dependencies:
- role: user_provision
- role: _meta/common_base
- role: _meta/aws_client_instance
- role: ce_deploy
- role: aws/aws_credentials
- role: gitlab
Expand Down
6 changes: 3 additions & 3 deletions roles/gpg_key/tasks/gpg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@

- name: Gather key ID.
ansible.builtin.command:
cmd: "gpg --list-secret-keys {{ gpg_user.email }} | grep '^ '"
cmd: "gpg --list-secret-keys {{ gpg_user.email }}"
become: true
become_user: "{{ gpg_user.username }}"
register: user_ansible_gpg_key_id
register: user_ansible_gpg_key
when:
- gpg_user.publish
- not user_ansible_gpg_key_exists.stdout

- name: Publish GPG key to openpgp.org.
ansible.builtin.command:
cmd: "gpg --keyserver {{ server }} --send-keys {{ user_ansible_gpg_key_id.stdout }}"
cmd: "gpg --keyserver {{ server }} --send-keys {{ user_ansible_gpg_key.stdout_lines[1] }}"
become: true
become_user: "{{ gpg_user.username }}"
when:
Expand Down