diff --git a/proton/clone.sls b/proton/clone.sls index 435cd11..48cc793 100644 --- a/proton/clone.sls +++ b/proton/clone.sls @@ -11,5 +11,5 @@ proton_menu: qvm.features: - name: template-proton - set: - - menu-items: "protonvpn.desktop firefox-esr.desktop debian-xterm.desktop" - - default-menu-items: "protonvpn.desktop firefox-esr.desktop debian-xterm.desktop" + - menu-items: "protonvpn-app.desktop firefox-esr.desktop debian-xterm.desktop" + - default-menu-items: "protonvpn-app.desktop firefox-esr.desktop debian-xterm.desktop" diff --git a/proton/create.sls b/proton/create.sls index 88d87a1..5b7f67a 100644 --- a/proton/create.sls +++ b/proton/create.sls @@ -25,4 +25,4 @@ qvm-features-id: - enable: - service.network-manager - set: - - menu-items: "protonvpn.desktop firefox-esr.desktop debian-xterm.desktop" + - menu-items: "protonvpn-app.desktop firefox-esr.desktop debian-xterm.desktop" diff --git a/proton/install.sls b/proton/install.sls index 8626bc3..b73936a 100644 --- a/proton/install.sls +++ b/proton/install.sls @@ -1,13 +1,5 @@ include: - - proton.clone - -/tmp/protonvpn-stable-release_1.0.3-2_all.deb: - file.managed: - - source: - - salt://proton/protonvpn-stable-release_1.0.3-2_all.deb - -'dpkg -i /tmp/protonvpn-stable-release_1.0.3-2_all.deb': - cmd.run + - proton.install_repo {% if salt['pillar.get']('update_proxy:caching') %} {% set proxy = 'cacher' %} @@ -41,13 +33,24 @@ include: {% endif %} {% endif %} +set_locale: + cmd.run: + - name: | + sed -i s/# en_US.UTF-8/en_US.UTF-8/ /etc/locale.gen + locale-gen + proton_install: pkg.installed: + - refresh: True - skip_suggestions: True - - install_recommends: False - pkgs: - qubes-core-agent-network-manager - qubes-core-agent-networking + - qubes-core-agent-passwordless-root - firefox-esr - network-manager - - protonvpn-gui + - netcat-openbsd + - protonvpn + - openssh-client + - thunderbird-qubes + - wget diff --git a/proton/install_repo.sls b/proton/install_repo.sls new file mode 100644 index 0000000..d509bf0 --- /dev/null +++ b/proton/install_repo.sls @@ -0,0 +1,14 @@ +{% if salt['pillar.get']('update_proxy:caching') %} +/etc/apt/sources.list.d/protonvpn-stable.list: + file.managed: + - source: + - salt://proton/protonvpn-stable.list +{% endif %} + +/tmp/protonvpn-stable-release_1.0.3-2_all.deb: + file.managed: + - source: + - salt://proton/protonvpn-stable-release_1.0.3-2_all.deb + +'dpkg -i --force-confold /tmp/protonvpn-stable-release_1.0.3-2_all.deb ': + cmd.run diff --git a/proton/protonvpn-stable.list b/proton/protonvpn-stable.list new file mode 100644 index 0000000..77b9626 --- /dev/null +++ b/proton/protonvpn-stable.list @@ -0,0 +1,4 @@ +# +# ProtonVPN stable release +# +deb [arch="all", signed-by=/usr/share/keyrings/protonvpn-stable-archive-keyring.gpg] http://HTTPS///repo.protonvpn.com/debian stable main \ No newline at end of file