Remove playbook vars in favor of role defaults.

operations-project · Apr 24, 2024 · 3a104b6 · 3a104b6
1 parent a3509ce
commit 3a104b6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/playbook.vars.yml b/playbook.vars.yml
diff --git a/playbook.yml b/playbook.yml
@@ -2,21 +2,22 @@
 ---
 - name: Configure Server
   hosts: all
-  vars_files: playbook.vars.yml
   become: true
 
   roles:
     - role: geerlingguy.security
       tags: system
       vars:
-        security_sudoers_passwordless: "{{ ['control'] + operations_admin_users }}"
+        security_sudoers_passwordless: "{{ [operations_control_user] + operations_admin_users }}"
+        security_ssh_allowed_users: "{{ operations_admin_users }}"
 
     - role: geerlingguy.github-users
       tags: system
+      vars:
+        github_users: "{{ operations_admin_users }}"
 
 - name: "Configure Hosting: DDEV"
   hosts: operations_host_ddev
-  vars_files: playbook.vars.yml
 
   roles:
     - role: geerlingguy.php

diff --git a/roles/operations.users/defaults/main.yml b/roles/operations.users/defaults/main.yml
@@ -0,0 +1,7 @@
+operations_admin_users: []
+
+operations_control_user: control
+operations_control_home: /var/control
+
+operations_platform_user: platform
+operations_platform_home: /var/platform