diff options
author | Ismaël Bouya <ismael.bouya@fretlink.com> | 2018-11-10 08:09:49 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@fretlink.com> | 2018-11-10 08:09:49 +0100 |
commit | e7c9bf715db5255074b6f7554a60de263cc3aa96 (patch) | |
tree | 869ab88391dbfe16738399af5bae0b016b33c462 | |
parent | cf86d448f96ede049c04d8165931f92a82f35956 (diff) | |
download | Ansible-e7c9bf715db5255074b6f7554a60de263cc3aa96.tar.gz Ansible-e7c9bf715db5255074b6f7554a60de263cc3aa96.tar.zst Ansible-e7c9bf715db5255074b6f7554a60de263cc3aa96.zip |
Move password store to its place
-rw-r--r-- | .gitmodules | 3 | ||||
m--------- | password_store | 0 | ||||
-rw-r--r-- | roles/gnupg/tasks/main.yml | 4 | ||||
-rw-r--r-- | roles/tools/tasks/main.yml | 9 |
4 files changed, 4 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8a151f4..0000000 --- a/.gitmodules +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | [submodule "password_store"] | ||
2 | path = password_store | ||
3 | url = gitolite@git.immae.eu:perso/Immae/Prive/Password_store | ||
diff --git a/password_store b/password_store deleted file mode 160000 | |||
Subproject 7a3d737bfef73cbbfe43ab5541233fca68b7443 | |||
diff --git a/roles/gnupg/tasks/main.yml b/roles/gnupg/tasks/main.yml index a2b9aa6..2bd1c79 100644 --- a/roles/gnupg/tasks/main.yml +++ b/roles/gnupg/tasks/main.yml | |||
@@ -93,7 +93,3 @@ | |||
93 | state: restarted | 93 | state: restarted |
94 | name: "{{ item }}.socket" | 94 | name: "{{ item }}.socket" |
95 | loop: "{{ results.results|selectattr('changed')|map(attribute='item')|list }}" | 95 | loop: "{{ results.results|selectattr('changed')|map(attribute='item')|list }}" |
96 | - name: clone password store | ||
97 | register: clone_password_store | ||
98 | shell: "cd $(dirname $ANSIBLE_CONFIG ); git submodule update --init password_store" | ||
99 | changed_when: clone_password_store is defined and "stdout" in clone_password_store and clone_password_store.stdout != "" | ||
diff --git a/roles/tools/tasks/main.yml b/roles/tools/tasks/main.yml index 56298cb..745a08f 100644 --- a/roles/tools/tasks/main.yml +++ b/roles/tools/tasks/main.yml | |||
@@ -46,11 +46,10 @@ | |||
46 | dest: $XDG_CONFIG_HOME/systemd/user/ | 46 | dest: $XDG_CONFIG_HOME/systemd/user/ |
47 | notify: | 47 | notify: |
48 | - reload systemd | 48 | - reload systemd |
49 | - name: Link password store | 49 | - name: Clone password store |
50 | file: | 50 | git: |
51 | path: "$XDG_DATA_HOME/pass" | 51 | dest: "$XDG_DATA_HOME/pass" |
52 | src: "$XDG_CONFIG_HOME/ansible/password_store" | 52 | repo: gitolite@git.immae.eu:perso/Immae/Prive/Password_store |
53 | state: link | ||
54 | - name: dconf configuration | 53 | - name: dconf configuration |
55 | # check: `dconf dump /` or `dconf-editor` | 54 | # check: `dconf dump /` or `dconf-editor` |
56 | dconf: | 55 | dconf: |