diff --git a/salt/pillars/firefox.sls b/salt/pillars/firefox.sls index 65e5d03..41c499f 100644 --- a/salt/pillars/firefox.sls +++ b/salt/pillars/firefox.sls @@ -1,11 +1,5 @@ firefox: addons: - FoxyProxy Standard: - url: https://addons.mozilla.org/firefox/downloads/latest/foxyproxy-standard/ - name: foxyproxy@eric.h.jung.xpi - KeePassXC-Browser: - url: https://addons.mozilla.org/firefox/downloads/latest/keepassxc-browser/ - name: keepassxc-browser@keepassxc.org.xpi - GNOME Shell integration: - url: https://addons.mozilla.org/firefox/downloads/latest/gnome-shell-integration/ - name: chrome-gnome-shell@gnome.org.xpi + FoxyProxy Standard: https://addons.mozilla.org/firefox/downloads/latest/foxyproxy-standard/ + KeePassXC-Browser: https://addons.mozilla.org/firefox/downloads/latest/keepassxc-browser/ + GNOME Shell integration: https://addons.mozilla.org/firefox/downloads/latest/gnome-shell-integration/ diff --git a/salt/pillars/hosts/exsilio.sls b/salt/pillars/hosts/exsilio.sls index a611f9f..c7d18e7 100644 --- a/salt/pillars/hosts/exsilio.sls +++ b/salt/pillars/hosts/exsilio.sls @@ -18,6 +18,4 @@ repositories: firefox: addons: - Okta Browser Plugin: - url: https://addons.mozilla.org/firefox/downloads/latest/okta-browser-plugin/ - name: plugin@okta.com.xpi + Okta Browser Plugin: https://addons.mozilla.org/firefox/downloads/latest/okta-browser-plugin/ diff --git a/salt/states/files/install_firefox_addon b/salt/states/files/install_firefox_addon index dc15145..8627b25 100755 --- a/salt/states/files/install_firefox_addon +++ b/salt/states/files/install_firefox_addon @@ -1,13 +1,11 @@ #!/bin/bash set -aeo pipefail -{% for name, args in pillar['firefox']['addons'].items() %} +{% for name, url in pillar['firefox']['addons'].items() %} if [[ $(grep -oP '(?<=\},\"name\":\"){{ name }}' {{ salt['user.info']( pillar['username'] ).home }}/.mozilla/firefox/*.default*/addons.json) ]]; then printf "{{ name }} is already installed\n" else printf "installing {{ name }}\n" - curl -sLo /tmp/{{ args['name'] }} {{ args['url'] }} - firefox /tmp/{{ args['name'] }} - rm /tmp/{{ args['name'] }} + firefox {{ url }} fi {% endfor %}