Browse Source

Unified GIDs/UIDs

Zach Isbach 4 years ago
parent
commit
cbdee09c99

+ 1 - 1
plays/docker_reg-start.yaml

@@ -34,7 +34,7 @@
     - key_store
     - gluster
     # Add the base user to any new groups
-    - { role: add_group, add_group_groups: 'docker_registry:2202' }
+    - { role: add_group, add_group_groups: 'docker_registry' }
 
 - name: Install docker
   hosts: docker_reg

+ 0 - 1
plays/gclnt-start.yaml

@@ -38,6 +38,5 @@
     - gluster
     - { role: gluster_mnt,
         gluster_mnt_vol: docker_registry,
-        gluster_mnt_gid: 2202,
         gluster_mnt_mode: '0770'
       }

+ 0 - 1
plays/gluster-run.yaml

@@ -31,7 +31,6 @@
       }
     - { role: gluster_vol,
           gluster_vol_name: docker_registry,
-          gluster_vol_gid: 2202,
           gluster_vol_dev: "/dev/mapper/{{ vg }}-docker_registry"
       }
     # Add the base user to any new groups

+ 5 - 2
plays/roles/add_group/tasks/main.yml

@@ -1,7 +1,10 @@
+- name: Define GIDs
+  include_role:
+    name: gids
 - name: Ensure groups exist {{ add_group_groups }}
   group:
-    name: "{{ item.split(':')[0] }}"
-    gid: "{{ item.split(':')[1] | default(omit) }}"
+    name: "{{ item }}"
+    gid: "{{ posix_gids[ item ] | default(omit) }}"
     state: present
   with_items: "{{ add_group_groups.split(',') }}"
 - name: Add {{ add_group_user }} to groups {{ add_group_groups }}

+ 7 - 6
plays/roles/base_user/tasks/main.yml

@@ -1,10 +1,11 @@
 - name: Add {{ base_user }} group
-  group:
-    name: "{{ base_user }}"
-    gid: "{{ base_user_uid }}"
+  include_role:
+    name: add_group
+  vars:
+    add_group_groups: "{{ base_user }}"
 - name: Add {{ base_user }} user
   user:
-    uid: "{{ base_user_uid }}"
+    uid: "{{ posix_uids[ base_user ] }}"
     name: "{{ base_user }}"
     comment: "{{ base_user_name }}"
     shell: "{{ base_user_shell }}"
@@ -17,7 +18,7 @@
     path: /etc/sudoers.d/10-base_users
     line: "{{ base_user }} ALL=(ALL) NOPASSWD:ALL"
     create: yes
-    mode: 0440
+    mode: '0440'
     owner: root
     group: root
 
@@ -41,4 +42,4 @@
     dest: "/home/{{ base_user }}/.bashrc"
     owner: "{{ base_user }}"
     group: "{{ base_user }}"
-    mode: 0644
+    mode: '0644'

+ 0 - 1
plays/roles/docker/defaults/main.yml

@@ -1,5 +1,4 @@
 docker_owner: root
 docker_group: docker
-docker_gid: 2103
 
 docker_keydir: /data/keys/docker

+ 5 - 5
plays/roles/docker/tasks/main.yml

@@ -3,7 +3,7 @@
   include_role:
     name: add_group
   vars:
-    add_group_groups: "{{ docker_group }}:{{ docker_gid }}"
+    add_group_groups: "{{ docker_group }}"
 
 # Install TLS files
 - name: Install the TLS CA
@@ -12,7 +12,7 @@
     dest: "{{ docker_keydir }}/ca.pem"
     owner: "{{ docker_owner }}"
     group: "{{ docker_group }}"
-    mode: 0400
+    mode: '0400'
   register: docker_copy
   changed_when: docker_copy.src is defined
   when: docker_ca is defined
@@ -22,7 +22,7 @@
     dest: "{{ docker_keydir }}/node.pem"
     owner: "{{ docker_owner }}"
     group: "{{ docker_group }}"
-    mode: 0400
+    mode: '0400'
   register: docker_copy
   changed_when: docker_copy.src is defined
   when: docker_cert is defined
@@ -32,7 +32,7 @@
     dest: "{{ docker_keydir }}/node.key"
     owner: "{{ docker_owner }}"
     group: "{{ docker_group }}"
-    mode: 0400
+    mode: '0400'
   register: docker_copy
   changed_when: docker_copy.src is defined
   when: docker_cert is defined
@@ -76,5 +76,5 @@
 - name: Start a swarm from first node
   community.docker.docker_swarm:
     state: present
-  delegate_to: "{{ groups.gluster_clients[0] }}"
+  delegate_to: "{{ ansible_play_hosts | first }}"
   run_once: true

+ 2 - 1
plays/roles/docker_glusterfs/tasks/main.yml

@@ -40,7 +40,8 @@
   ansible.posix.mount:
     path: "{{ docker_glusterfs_hostssl }}"
     src: "{{ docker_glusterfs_pluginssl }}"
-    opts: bind,noauto
+    opts: bind
+    boot: no
     fstype: none
     state: mounted
 

+ 19 - 0
plays/roles/gids/defaults/main.yml

@@ -0,0 +1,19 @@
+gids_groups:
+  {
+    # Users
+    profplump: 2000,
+    # Host data
+    keys: 2100,
+    # Daemons
+    gluster: 2500,
+    docker: 2501,
+    # Volumes
+    letsencrypt: 3000,
+    nginx: 3001,
+    docker_registry: 3002,
+  }
+
+gids_users:
+  {
+    profplump: 2000,
+  }

+ 4 - 0
plays/roles/gids/tasks/main.yml

@@ -0,0 +1,4 @@
+- name: Define POSIX UIDs/GIDs
+  set_fact:
+    posix_gids: "{{ gids_groups }}"
+    posix_uids: "{{ gids_users }}"

+ 0 - 1
plays/roles/gluster/defaults/main.yml

@@ -11,7 +11,6 @@ gluster_cert_depth: 1
 # Local FS params
 gluster_owner: root
 gluster_group: gluster
-gluster_gid:   2200
 
 # Where gluster normally keeps things
 gluster_ssldir: /usr/lib/ssl

+ 1 - 1
plays/roles/gluster/tasks/main.yml

@@ -2,7 +2,7 @@
   include_role:
     name: add_group
   vars:
-    add_group_groups: "{{ gluster_group }}:{{ gluster_gid }}"
+    add_group_groups: "{{ gluster_group }}"
 - name: Init gluster paths
   file:
     path: "{{ item }}"

+ 2 - 3
plays/roles/gluster_mnt/tasks/main.yml

@@ -2,8 +2,7 @@
   include_role:
     name: add_group
   vars:
-    add_group_groups: "{{ gluster_mnt_vol }}:{{ gluster_mnt_gid }}"
-  when: gluster_mnt_gid
+    add_group_groups: "{{ gluster_mnt_vol }}"
 
 - name: Mount {{ gluster_mnt_vol }}
   include_role:
@@ -15,4 +14,4 @@
     mount_group: "{{ gluster_mnt_grp }}" 
     mount_dev: "{{ gluster_mnt_srv }}:/{{ gluster_mnt_vol }}"
     mount_fs: glusterfs
-    mount_opts: "defaults,_netdev,noauto,noatime,backupvolfile-server={{ gluster_mnt_bkp }}"
+    mount_opts: "_netdev,noatime,backupvolfile-server={{ gluster_mnt_bkp }}"

+ 4 - 4
plays/roles/gluster_vol/tasks/main.yml

@@ -1,8 +1,8 @@
 - name: Ensure group {{ gluster_vol_group }} exists
-  group:
-    name: "{{ gluster_vol_group }}"
-    gid: "{{ gluster_vol_gid }}"
-    state: present
+  include_role:
+    name: add_group
+  vars:
+    add_group_groups: "{{ gluster_vol_group }}"
 - name: Mount the data dev
   include_role:
     name: mount

+ 0 - 1
plays/roles/key_store/defaults/main.yml

@@ -14,4 +14,3 @@ key_store_crypt: keys
 key_store_datadir: /data/keys
 key_store_owner: root
 key_store_group: keys
-key_store_gid: 2101

+ 5 - 7
plays/roles/key_store/tasks/main.yml

@@ -1,3 +1,8 @@
+- name: Add base_user to the group "{{ key_store_group }}"
+  include_role:
+    name: add_group
+  vars:
+    add_group_groups: "{{ key_store_group }}"
 - name: Determine if keys is mapped
   stat:
     path: "/dev/mapper/{{ key_store_crypt }}"
@@ -26,13 +31,6 @@
     state: closed
     name: keys
   when: key_store_build
-
-- name: Add base_user to the group "{{ key_store_group }}"
-  include_role:
-    name: add_group
-  vars:
-    add_group_groups: "{{ key_store_group }}:{{ key_store_gid }}"
-  when: key_store_build
 - name: Load the loop module
   community.general.modprobe:
     name: loop

+ 0 - 1
plays/roles/luks/defaults/main.yml

@@ -4,7 +4,6 @@ luks_dir: "/home/{{ luks_user }}/bin"
 luks_datadir: /data
 luks_owner: root
 luks_group: data
-luks_gid: 2100
 
 #luks_dev: "{{ aws_ebs_dev }}"
 #luks_crypt_name: dmcrypt

+ 1 - 1
plays/roles/luks/tasks/main.yml

@@ -2,7 +2,7 @@
   include_role:
     name: add_group
   vars:
-    add_group_groups: "{{ luks_group }}:{{ luks_gid }}"
+    add_group_groups: "{{ luks_group }}"
 - name: Init the data dir
   file:
     path: "{{ luks_datadir }}"

+ 2 - 1
plays/roles/mount/defaults/main.yml

@@ -1,4 +1,5 @@
 mount_owner: root
 mount_group: root
 mount_mode: '0755'
-mount_opts: "defaults,noauto,noatime"
+mount_opts: "noatime"
+mount_boot: no

+ 1 - 0
plays/roles/mount/tasks/main.yml

@@ -11,6 +11,7 @@
     src: "{{ mount_dev }}"
     fstype: "{{ mount_fs | default(omit) }}"
     opts: "{{ mount_opts | default(omit) }}"
+    boot: "{{ mount_boot }}"
     state: mounted
 - name: Secure mounted path {{ mount_path }}
   file: