User: Put user tasks into its own role.

- Plus rearranging of roles.
rufuslee · Dec 2, 2018 · d2b47df · d2b47df
1 parent 4ab35ce
commit d2b47df
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/cloudbox.yml b/cloudbox.yml
@@ -11,12 +11,13 @@
     - { role: pre_tasks }
     - { role: backup, tags: ['backup'] }
     - { role: restore, tags: ['restore'] }
+    - { role: user, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'user'] }
     - { role: kernel, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'kernel'], when: ['run_kernel'] }
     - { role: pre_install, tags: ['core', 'cloudbox', 'mediabox', 'feederbox'] }
-    - { role: shell, tags: ['core', 'cloudbox', 'mediabox', 'feederbox'] }
     - { role: system, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'system'] }
-    - { role: motd, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'motd'] }
     - { role: common, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'common'] }
+    - { role: shell, tags: ['core', 'cloudbox', 'mediabox', 'feederbox'] }
+    - { role: motd, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'motd'] }
     - { role: docker, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'docker'] }
     - { role: plexdrive, tags: ['core', 'cloudbox', 'mediabox', 'feederbox'] }
     - { role: unionfs, tags: ['core', 'cloudbox', 'mediabox', 'feederbox'] }

diff --git a/roles/pre_tasks/tasks/main.yml b/roles/pre_tasks/tasks/main.yml
@@ -8,10 +8,6 @@
 #                   GNU General Public License v3.0                     #
 #########################################################################
 ---
-- name: Set User Variables
-  import_tasks: "user.yml"
-  tags: always
-
 - name: Clean Paths
   import_tasks: "clean_paths.yml"
   tags: always

diff --git a/roles/restore/tasks/main.yml b/roles/restore/tasks/main.yml
@@ -8,6 +8,10 @@
 #                   GNU General Public License v3.0                     #
 #########################################################################
 ---
+- name: User Role
+  include_role:
+    name: user
+
 - name: Variables
   import_tasks: "variables.yml"
 

diff --git a/roles/pre_tasks/tasks/user.yml → roles/user/tasks/main.yml b/roles/pre_tasks/tasks/user.yml → roles/user/tasks/main.yml
@@ -1,5 +1,5 @@
 #########################################################################
-# Title:         Pre-Tasks: User Tasks                                  #
+# Title:         Cloudbox: User Role                                    #
 # Author(s):     desimaniac                                             #
 # URL:           https://github.com/cloudbox/cloudbox                   #
 # --                                                                    #
@@ -55,5 +55,3 @@
     fail:
       msg: "The user '{{user}}' does not exist!"
     when: user_check.rc == 1
-
-  when: not continuous_integration