Skip to content

Add aaron to the admin role #310

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.

Sign up for GitHub

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

Open
hellais wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add aaron to the admin role #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00316ea
Add aaron to the admin role
hellais Jan 19, 2026
46d1cca
Merge remote-tracking branch 'origin/main' into add-aaron
hellais Jan 19, 2026
59c328e
Add ssh_users tag
hellais Jan 19, 2026
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
9 changes: 7 additions & 2 deletions ansible/group_vars/all/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ ssh_users:
[
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJsibU0nsQFFIdolD1POzXOws4VetV0ZNByINRzY8Hx0 arturo@ooni.org",
]
aagbsn:
login: aagbsn
comment: Aaron Gibson
keys:
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMiHINJ8m80H7PPgtnlx7nGL/rJzf1daW/YOnF78Wb0v aaron@ooni.org"
majakomel:
login: majakomel
comment: Maja Komel
Expand All @@ -34,8 +39,8 @@ ssh_users:
keys:
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHc04zv+G8vGOS/znLy6xd3lB0/B07uaFjgyh4UgqUMA luis@openobservatory.org"

admin_usernames: [art, mehul, luis]
root_usernames: [art, mehul, luis]
admin_usernames: [art, aagbsn, mehul, luis]
root_usernames: [art, aagbsn, mehul, luis]
non_admin_usernames: []

prometheus_metrics_password: "{{ lookup('amazon.aws.aws_ssm', '/oonidevops/ooni_services/prometheus_metrics_password', profile='oonidevops_user_prod') }}"
6 changes: 6 additions & 0 deletions ansible/roles/ssh_users/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
- name: ensure admin group exists
tags: ssh_users
group:
name: "{{ admin_group_name }}"
state: present
Expand Down Expand Up @@ -52,6 +53,7 @@
with_items: "{{ admin_usernames | union(non_admin_usernames) }}"

- name: configure sshd
tags: ssh_users
include_role:
name: willshersystems.sshd
vars:
Expand All @@ -60,13 +62,15 @@
AllowUsers: "{{ admin_usernames | union(non_admin_usernames) | sort | join(' ') }}"

- name: Enesure sudoers dir exists
tags: ssh_users
ansible.builtin.file:
path: /etc/sudoers.d
state: directory
owner: root
group: root

- name: sudoers.d/80-admins
tags: ssh_users
template:
src: sudoers
dest: /etc/sudoers.d/80-admins
Expand All @@ -76,11 +80,13 @@
validate: 'visudo -cf %s'

- name: sudoers.d/adm
tags: ssh_users
ansible.builtin.file:
path: /etc/sudoers.d/adm
state: absent

- name: reload sshd
tags: ssh_users
ansible.builtin.systemd_service:
name: sshd
state: reloaded