From 5be3a3cbb9ffba9d661ca54d1afbf6e67589cf92 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Fri, 31 Oct 2014 18:25:43 +0000 Subject: [PATCH] Turn the hardcoded mirrormanger user/group ids into variables --- roles/mirrorlist/tasks/main.yml | 4 ++-- roles/mirrorlist/vars/main.yml | 4 ++++ roles/mirrormanager/package/tasks/main.yml | 16 ++++++++-------- roles/mirrormanager/package/vars/main.yml | 4 ++++ 4 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 roles/mirrorlist/vars/main.yml create mode 100644 roles/mirrormanager/package/vars/main.yml diff --git a/roles/mirrorlist/tasks/main.yml b/roles/mirrorlist/tasks/main.yml index b687bc98ef..23208e3177 100644 --- a/roles/mirrorlist/tasks/main.yml +++ b/roles/mirrorlist/tasks/main.yml @@ -1,8 +1,8 @@ --- # tasklist for setting up the mirrorlist app components # create mirrormanager user -- name: add mirrormanager user - uid 441 - user: name=mirrormanager uid=441 state=present home=/home/mirrormanager createhome=yes +- name: add mirrormanager user - uid {{ mirrormanager_uid }} + user: name=mirrormanager uid={{ mirrormanager_uid }} state=present home=/home/mirrormanager createhome=yes - name: install supervisor and mirrormanager yum: pkg={{ item }} state=installed diff --git a/roles/mirrorlist/vars/main.yml b/roles/mirrorlist/vars/main.yml new file mode 100644 index 0000000000..089784c9b0 --- /dev/null +++ b/roles/mirrorlist/vars/main.yml @@ -0,0 +1,4 @@ +mirrormanager_uid: 441 +mirrormanager_gid: 441 +mirrors_gid: 263 +mirrors2_gid: 529 diff --git a/roles/mirrormanager/package/tasks/main.yml b/roles/mirrormanager/package/tasks/main.yml index 7e775cd6af..2db535af16 100644 --- a/roles/mirrormanager/package/tasks/main.yml +++ b/roles/mirrormanager/package/tasks/main.yml @@ -6,19 +6,19 @@ state=true persistent=true -- name: add mirrormanager group - gid 441 - group: name=mirrormanager gid=441 +- name: add mirrormanager group - gid {{ mirrormanager_gid }} + group: name=mirrormanager gid={{ mirrormanager_gid }} -- name: add mirrors group - gid 263 - group: name=mirrors gid=263 +- name: add mirrors group - gid {{ mirrors_gid }} + group: name=mirrors gid={{ mirrors_gid }} -- name: add mirrors2 group - gid 529 - group: name=mirrors2 gid=529 +- name: add mirrors2 group - gid {{ mirrors2_gid }} + group: name=mirrors2 gid={{ mirrors2_gid }} -- name: add mirrormanager user - uid 441 +- name: add mirrormanager user - uid {{ mirrormanager_uid }} user: > name=mirrormanager - uid=441 + uid={{ mirrormanager_uid }} group=mirrormanager groups=mirrors,mirrors2,apache state=present diff --git a/roles/mirrormanager/package/vars/main.yml b/roles/mirrormanager/package/vars/main.yml new file mode 100644 index 0000000000..089784c9b0 --- /dev/null +++ b/roles/mirrormanager/package/vars/main.yml @@ -0,0 +1,4 @@ +mirrormanager_uid: 441 +mirrormanager_gid: 441 +mirrors_gid: 263 +mirrors2_gid: 529