diff options
| author | Emil Renner Berthing <esmil@labitat.dk> | 2018-09-26 11:46:03 +0200 |
|---|---|---|
| committer | Emil Renner Berthing <esmil@labitat.dk> | 2018-09-26 11:46:03 +0200 |
| commit | ae254b596f6e12601e0f6b206d09b87e5a9b480d (patch) | |
| tree | 7e4448756a033125230d85836473a1b927ef9687 | |
| parent | 58844e9c83370bad5e18483476cf9f43cab7c6ea (diff) | |
| download | labitat-ansible-ae254b596f6e12601e0f6b206d09b87e5a9b480d.tar.gz labitat-ansible-ae254b596f6e12601e0f6b206d09b87e5a9b480d.tar.xz labitat-ansible-ae254b596f6e12601e0f6b206d09b87e5a9b480d.zip | |
users: merge root_env into this role
| -rw-r--r-- | roles/space_server/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/users/files/root/bash_profile.sh (renamed from roles/root_env/files/bash_profile.sh) | 0 | ||||
| -rw-r--r-- | roles/users/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/users/tasks/root.yml (renamed from roles/root_env/tasks/main.yml) | 4 | ||||
| -rw-r--r-- | roles/users/templates/root/bashrc.sh.j2 (renamed from roles/root_env/files/bashrc.sh.j2) | 0 |
5 files changed, 6 insertions, 3 deletions
diff --git a/roles/space_server/meta/main.yml b/roles/space_server/meta/main.yml index d2839f1..2739dff 100644 --- a/roles/space_server/meta/main.yml +++ b/roles/space_server/meta/main.yml @@ -1,7 +1,6 @@ --- dependencies: - role: fedora - - role: root_env - role: users # vim: set ts=2 sw=2 et: diff --git a/roles/root_env/files/bash_profile.sh b/roles/users/files/root/bash_profile.sh index 3ee6b29..3ee6b29 100644 --- a/roles/root_env/files/bash_profile.sh +++ b/roles/users/files/root/bash_profile.sh diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml index 2cc6cd1..8d4acfa 100644 --- a/roles/users/tasks/main.yml +++ b/roles/users/tasks/main.yml @@ -1,4 +1,8 @@ --- +- import_tasks: root.yml + tags: + - users + - root - import_tasks: esmil.yml tags: - users diff --git a/roles/root_env/tasks/main.yml b/roles/users/tasks/root.yml index 7b20fd1..e5b3b45 100644 --- a/roles/root_env/tasks/main.yml +++ b/roles/users/tasks/root.yml @@ -2,7 +2,7 @@ - name: root .bash_profile copy: dest: '/root/.bash_profile' - src: files/bash_profile.sh + src: root/bash_profile.sh owner: root group: root mode: 0644 @@ -10,7 +10,7 @@ - name: root .bashrc template: dest: '/root/.bashrc' - src: files/bashrc.sh.j2 + src: root/bashrc.sh.j2 owner: root group: root mode: 0644 diff --git a/roles/root_env/files/bashrc.sh.j2 b/roles/users/templates/root/bashrc.sh.j2 index bcc4ddb..bcc4ddb 100644 --- a/roles/root_env/files/bashrc.sh.j2 +++ b/roles/users/templates/root/bashrc.sh.j2 |