Skip to content

Gitlab runner service override pr devel #587

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 48 commits into from
Feb 10, 2022
Merged
Changes from all commits
Commits
Show all changes
48 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
5f655ec
Fixing gitlab-runner overriders so upgrades do not break the runner.
gregharvey Feb 10, 2022
993acda
Merging 1.x.
gregharvey Feb 10, 2022
b8bd70c
Merge branch 'gitlab_runner_service_override' into gitlab_runner_serv…
gregharvey Feb 10, 2022
c4c0908
Fixing override file template.
gregharvey Feb 10, 2022
61c37be
Merge branch 'gitlab_runner_service_override' into gitlab_runner_serv…
gregharvey Feb 10, 2022
92acecc
Hopefully fixing CI.
gregharvey Feb 10, 2022
b9ab5d6
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 10, 2022
34cd525
Merge branch 'devel' into gitlab_runner_service_override-PR-devel
gregharvey Feb 10, 2022
0ee6499
Merge branch 'gitlab_runner_service_override' into gitlab_runner_serv…
gregharvey Feb 10, 2022
b68944d
Making sure the service directory exists.
gregharvey Feb 10, 2022
38b6702
Merge branch 'gitlab_runner_service_override' into gitlab_runner_serv…
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
3b46b44
Merge branch '1.x' into gitlab_runner_service_override
gregharvey Feb 10, 2022
b992f64
We cannot use the deploy meta role in CI because of LDAP.
gregharvey Feb 10, 2022
7a3c3d9
Merge branch 'devel' of github.com:codeenigma/ce-provision into devel
gregharvey Feb 10, 2022
aa8b282
Merge branch 'devel' into gitlab_runner_service_override-PR-devel
gregharvey Feb 10, 2022
f08ef4c
Merge branch 'gitlab_runner_service_override' into gitlab_runner_serv…
gregharvey Feb 10, 2022
3560998
Changing dir perms and adding a force.
gregharvey Feb 10, 2022
ea999b4
Merge branch 'gitlab_runner_service_override' into gitlab_runner_serv…
gregharvey Feb 10, 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
20 changes: 19 additions & 1 deletion ce-dev/ansible/plays/gitlab/gitlab.yml
Original file line number Diff line number Diff line change
@@ -16,6 +16,24 @@
- ansible.builtin.import_role:
name: _init
- ansible.builtin.import_role:
name: _meta/deploy
name: user_provision
- ansible.builtin.import_role:
name: _meta/common_base
- ansible.builtin.import_role:
name: ce_deploy
- ansible.builtin.import_role:
name: aws/aws_credentials
- ansible.builtin.import_role:
name: gitlab
- ansible.builtin.import_role:
name: gitlab_runner
- ansible.builtin.import_role:
name: ssh_server
- ansible.builtin.import_role:
name: sops
- ansible.builtin.import_role:
name: gpg_key
- ansible.builtin.import_role:
name: firewall_config
- ansible.builtin.import_role:
name: _exit
8 changes: 8 additions & 0 deletions ce-dev/ansible/vars/gitlab/gpg_key.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
gpg_key:
- username: ce-dev # Must exist already on the server.
publish: false # Whether to publish to HKS public servers.
key_type: "RSA"
key_length: 4096
email: sysadm@codeenigma.com
expire: 0
10 changes: 10 additions & 0 deletions roles/gitlab_runner/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -77,6 +77,16 @@
group: "{{ gitlab_runner.username }}"
become: true

- name: Ensure the Gitlab runner service override directory exists.
ansible.builtin.file:
path: /etc/systemd/system/gitlab-runner.service.d
state: directory
mode: '0755'
owner: root
group: root
force: true
become: true

- name: Place the gitlab-runner unit override file. # see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/2422#note_838191146
ansible.builtin.template:
src: override.conf.j2