Merge pull request #7426 from freedomofpress/stg-7425-sdssh-dependency

fix: set up the `sdssh` group before using it in ACLs
freedomofpress · Jan 24, 2025 · 2b0454c · 2b0454c
2 parents 7674452 + 65de0ef
commit 2b0454c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/install_files/ansible-base/roles/common/tasks/main.yml b/install_files/ansible-base/roles/common/tasks/main.yml
@@ -7,8 +7,6 @@
 
 - include_tasks: post_ubuntu_install_checks.yml
 
-- include_tasks: create_users.yml
-
 - include_tasks: setup_etc_hosts.yml
 
 - include_tasks: harden_dns.yml

diff --git a/...s/ansible-base/roles/common/files/sudoers → ...oles/restrict-direct-access/files/sudoers b/...s/ansible-base/roles/common/files/sudoers → ...oles/restrict-direct-access/files/sudoers
diff --git a/...-base/roles/common/tasks/create_users.yml → ...rict-direct-access/tasks/create_users.yml b/...-base/roles/common/tasks/create_users.yml → ...rict-direct-access/tasks/create_users.yml
diff --git a/install_files/ansible-base/roles/restrict-direct-access/tasks/main.yml b/install_files/ansible-base/roles/restrict-direct-access/tasks/main.yml
@@ -4,6 +4,8 @@
 
 - include_tasks: dh_moduli.yml
 
+- include_tasks: create_users.yml
+
 - include_tasks: ssh.yml
 
 - include_tasks: iptables.yml