From 96b84032cb00dcb52ec3a545696981f713dcb0e2 2016-06-17 22:22:48
From: Branko Majic <branko@majic.rs>
Date: 2016-06-17 22:22:48
Subject: [PATCH] Noticket: No need to add the website admin to user group, this is the admin's main group anyway. Do not define admin variable for testsite wsgihello role."

---

diff --git a/roles/php_website/tasks/main.yml b/roles/php_website/tasks/main.yml
index 056ab2772f4d58e5cf76637ea388385d3613bb81..0bf6fcb88a8d320d8499f3d7b633aef4ac8cf979 100644
--- a/roles/php_website/tasks/main.yml
+++ b/roles/php_website/tasks/main.yml
@@ -26,9 +26,6 @@
   notify:
     - Restart nginx
 
-- name: Add admin to website group
-  user: name="{{ admin }}" groups="{{ user }}" append="yes"
-
 - name: Install extra packages for website
   apt: name="{{ item }}" state=installed
   with_items: "{{ packages }}"
diff --git a/roles/wsgi_website/tasks/main.yml b/roles/wsgi_website/tasks/main.yml
index 317f56550c4b8d07364e04819c5c6a355b78d2d9..32f8a71c4c88d74ea22e2d6186a9ba9c1d0e7918 100644
--- a/roles/wsgi_website/tasks/main.yml
+++ b/roles/wsgi_website/tasks/main.yml
@@ -25,9 +25,6 @@
   notify:
     - Restart nginx
 
-- name: Add admin to website group
-  user: name="{{ admin }}" groups="{{ user }}" append="yes"
-
 - name: Install extra packages for website
   apt: name="{{ item }}" state=present
   with_items: "{{ packages }}"
diff --git a/testsite/playbooks/roles/wsgihello/meta/main.yml b/testsite/playbooks/roles/wsgihello/meta/main.yml
index 9d227cce900869db714d454fab06841c564b13ee..9e894e1c3a5e7625222113ea148e46687313d24f 100644
--- a/testsite/playbooks/roles/wsgihello/meta/main.yml
+++ b/testsite/playbooks/roles/wsgihello/meta/main.yml
@@ -2,7 +2,6 @@
 
 dependencies:
   - role: wsgi_website
-    admin: admin
     fqdn: wsgi.{{ testsite_domain }}
     admin_uid: 3001
     uid: 2001