From f8d35f57f112a2ed62f96df4115be205e1065ff9 Mon Sep 17 00:00:00 2001
From: Carl Waldbieser <cwaldbieser@gmail.com>
Date: Fri, 28 Sep 2018 23:05:29 -0400
Subject: [PATCH] Security groups should be under `app:$APP:etc`.

---
 .../container_files/seed-data/bootstrap.gsh   | 21 ++++++++++---------
 .../container_files/seed-data/bootstrap.gsh   |  8 +++----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ex401/ex401.2.8/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.8/container_files/seed-data/bootstrap.gsh
index bc439e5..a05060e 100644
--- a/ex401/ex401.2.8/container_files/seed-data/bootstrap.gsh
+++ b/ex401/ex401.2.8/container_files/seed-data/bootstrap.gsh
@@ -4,17 +4,18 @@ addGroup("app:mfa", "mfa_required", "mfa_required");
 addGroup("app:mfa:ref", "mfa_opt_in", "mfa_opt_in");
 addMember("app:mfa:mfa_enabled_allow", "app:mfa:ref:mfa_opt_in");
 
-addGroup("app:mfa:ref", "mfa_opt_in_access", "mfa_opt_in_access");
-addGroup("app:mfa:ref", "mfa_opt_in_access_allow", "mfa_opt_in_access_allow");
-addGroup("app:mfa:ref", "mfa_opt_in_access_deny", "mfa_opt_in_access_deny");
+addStem("app:mfa", "etc", "etc")
+addGroup("app:mfa:etc", "mfa_opt_in_access", "mfa_opt_in_access");
+addGroup("app:mfa:etc", "mfa_opt_in_access_allow", "mfa_opt_in_access_allow");
+addGroup("app:mfa:etc", "mfa_opt_in_access_deny", "mfa_opt_in_access_deny");
 
-addComposite("app:mfa:ref:mfa_opt_in_access", CompositeType.COMPLEMENT, "app:mfa:ref:mfa_opt_in_access_allow", "app:mfa:ref:mfa_opt_in_access_deny");
+addComposite("app:mfa:etc:mfa_opt_in_access", CompositeType.COMPLEMENT, "app:mfa:etc:mfa_opt_in_access_allow", "app:mfa:etc:mfa_opt_in_access_deny");
 
-addMember("app:mfa:ref:mfa_opt_in_access_allow", "ref:faculty");
-addMember("app:mfa:ref:mfa_opt_in_access_allow", "ref:staff");
-addMember("app:mfa:ref:mfa_opt_in_access_allow", "ref:student");
+addMember("app:mfa:etc:mfa_opt_in_access_allow", "ref:faculty");
+addMember("app:mfa:etc:mfa_opt_in_access_allow", "ref:staff");
+addMember("app:mfa:etc:mfa_opt_in_access_allow", "ref:student");
 
-addMember("app:mfa:ref:mfa_opt_in_access_deny", "app:mfa:mfa_required");
+addMember("app:mfa:etc:mfa_opt_in_access_deny", "app:mfa:mfa_required");
 
-grantPriv("app:mfa:ref:mfa_opt_in", "app:mfa:ref:mfa_opt_in_access", AccessPrivilege.OPTIN);
-grantPriv("app:mfa:ref:mfa_opt_in", "app:mfa:ref:mfa_opt_in_access", AccessPrivilege.OPTOUT);
+grantPriv("app:mfa:ref:mfa_opt_in", "app:mfa:etc:mfa_opt_in_access", AccessPrivilege.OPTIN);
+grantPriv("app:mfa:ref:mfa_opt_in", "app:mfa:etc:mfa_opt_in_access", AccessPrivilege.OPTOUT);
diff --git a/ex401/ex401.2.end/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.end/container_files/seed-data/bootstrap.gsh
index 1289355..26cefb5 100644
--- a/ex401/ex401.2.end/container_files/seed-data/bootstrap.gsh
+++ b/ex401/ex401.2.end/container_files/seed-data/bootstrap.gsh
@@ -5,11 +5,11 @@ addMember("app:mfa:mfa_enabled_allow", "ref:staff");
 addMember("app:mfa:mfa_enabled_allow", "ref:student");
 
 delGroup("app:mfa:ref:pilot");
-delGroup("app:mfa:ref:mfa_opt_in_access");
-delGroup("app:mfa:ref:mfa_opt_in_access_allow");
-delGroup("app:mfa:ref:mfa_opt_in_access_deny");
+delGroup("app:mfa:etc:mfa_opt_in_access");
+delGroup("app:mfa:etc:mfa_opt_in_access_allow");
+delGroup("app:mfa:etc:mfa_opt_in_access_deny");
 delGroup("app:mfa:ref:mfa_opt_in");
 delGroup("app:mfa:ref:bypass-not-opt-in");
 delGroup("app:mfa:ref:BannerUsersMinusFaculty");
 delGroup("app:mfa:ref:NonFacultyBannerINB");
-delGroup("app:mfa:ref:athletics_dept");
\ No newline at end of file
+delGroup("app:mfa:ref:athletics_dept");