diff options
| -rw-r--r-- | molecule/archlinux/converge.yml | 2 | ||||
| -rw-r--r-- | molecule/debian/converge.yml | 2 | ||||
| -rw-r--r-- | molecule/raspberrypi/converge.yml | 2 | ||||
| -rw-r--r-- | molecule/ubuntu/converge.yml | 2 | ||||
| -rw-r--r-- | roles/firefox/meta/main.yml | 5 | ||||
| -rw-r--r-- | roles/firefox/tasks/install_passff.yml | 11 | ||||
| -rw-r--r-- | roles/password_store/tasks/main.yml | 3 |
7 files changed, 22 insertions, 5 deletions
diff --git a/molecule/archlinux/converge.yml b/molecule/archlinux/converge.yml index 9edae9c3..02f6c2f3 100644 --- a/molecule/archlinux/converge.yml +++ b/molecule/archlinux/converge.yml @@ -20,6 +20,7 @@ python_versions: - "3.13" vimrc_repo_url: "https://git.sr.ht/~a14m/.vim" + password_store_repo_url: "https://github.com/octocat/Spoon-Knife" firefox_install_browserpass: true firefox_install_passff: true roles: @@ -46,4 +47,5 @@ - role: "dotfiles" - role: "vim" - role: "neomutt" + - role: "password_store" - role: "firefox" diff --git a/molecule/debian/converge.yml b/molecule/debian/converge.yml index c6ef5574..1326fe2d 100644 --- a/molecule/debian/converge.yml +++ b/molecule/debian/converge.yml @@ -31,6 +31,7 @@ - key: "000000001" value: "prometheus" vimrc_repo_url: "https://git.sr.ht/~a14m/.vim" + password_store_repo_url: "https://github.com/octocat/Spoon-Knife" firefox_install_browserpass: true firefox_install_passff: true roles: @@ -57,4 +58,5 @@ - role: "dotfiles" - role: "vim" - role: "neomutt" + - role: "password_store" - role: "firefox" diff --git a/molecule/raspberrypi/converge.yml b/molecule/raspberrypi/converge.yml index 3957c5f9..842aaac4 100644 --- a/molecule/raspberrypi/converge.yml +++ b/molecule/raspberrypi/converge.yml @@ -24,6 +24,7 @@ - key: "000000001" value: "prometheus" vimrc_repo_url: "https://git.sr.ht/~a14m/.vim" + password_store_repo_url: "https://github.com/octocat/Spoon-Knife" firefox_install_browserpass: true firefox_install_passff: true roles: @@ -47,4 +48,5 @@ - role: "dotfiles" - role: "vim" - role: "neomutt" + - role: "password_store" - role: "firefox" diff --git a/molecule/ubuntu/converge.yml b/molecule/ubuntu/converge.yml index 9d889f7d..8b047aec 100644 --- a/molecule/ubuntu/converge.yml +++ b/molecule/ubuntu/converge.yml @@ -20,6 +20,7 @@ python_versions: - "3.13" vimrc_repo_url: "https://git.sr.ht/~a14m/.vim" + password_store_repo_url: "https://github.com/octocat/Spoon-Knife" firefox_install_browserpass: true firefox_install_passff: true roles: @@ -46,4 +47,5 @@ - role: "dotfiles" - role: "vim" - role: "neomutt" + - role: "password_store" - role: "firefox" diff --git a/roles/firefox/meta/main.yml b/roles/firefox/meta/main.yml index 3da12597..7a9b0102 100644 --- a/roles/firefox/meta/main.yml +++ b/roles/firefox/meta/main.yml @@ -1,8 +1,5 @@ --- -dependencies: - - role: "sed" - - role: "python" - - role: "bash" +dependencies: [] galaxy_info: author: "a14m" description: "Configure firefox settings and policies." diff --git a/roles/firefox/tasks/install_passff.yml b/roles/firefox/tasks/install_passff.yml index 70f3f397..fbce12ee 100644 --- a/roles/firefox/tasks/install_passff.yml +++ b/roles/firefox/tasks/install_passff.yml @@ -1,4 +1,15 @@ --- +# NOTE: This part of the role depends on +# - role: "curl" +# - role: "sed" +# - role: "python" +# - role: "bash" +# - role: "password_store" +# +# As it uses these tools to install and run passff. +# The curl, sed, bash are used for installation. +# Python is used to run the passff native messaging host. +# pass is required by passff to access the password store, and errors when not found. - name: "Add passff to default extensions" ansible.builtin.set_fact: firefox_default_extensions: "{{ firefox_default_extensions | combine(firefox_passff_extension) }}" diff --git a/roles/password_store/tasks/main.yml b/roles/password_store/tasks/main.yml index 0537b5fe..f25364a2 100644 --- a/roles/password_store/tasks/main.yml +++ b/roles/password_store/tasks/main.yml @@ -15,4 +15,5 @@ clone: true update: false single_branch: true - version: main + version: "refs/heads/main" + force: true |