Git-Mirrors/shaker
1
0
Fork 0
mirror of https://github.com/unman/shaker.git synced 2024-12-24 23:09:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Salt - caching proxy - rebase for Qubes 4.2

Browse Source
This commit is contained in:
unman 2024-02-01 00:56:30 +00:00
parent 9fbae02751
commit 1fc7bca89f
No known key found for this signature in database
GPG Key ID: FDD1B8244731B36C
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cacher.spec
View File

@ -1,5 +1,5 @@
Name: 3isec-qubes-cacher Name: 3isec-qubes-cacher
Version: 1.10 Version: 1.12
Release: 1%{?dist} Release: 1%{?dist}
Summary: A caching proxy in Qubes Summary: A caching proxy in Qubes
@ -7,7 +7,7 @@ License: GPLv3+
SOURCE0: cacher SOURCE0: cacher
%description %description
This package provides a caching proxy, named cacher. This package provides a caching proxy qube, named cacher.
A caching proxy stores downloaded packages, so that you need only download A caching proxy stores downloaded packages, so that you need only download
a package once for it to be used when updating many templates. a package once for it to be used when updating many templates.
The proxy is preconfigured to work out of the box for Debian, Ubuntu, The proxy is preconfigured to work out of the box for Debian, Ubuntu,
@ -15,9 +15,10 @@ Arch, and Fedora templates.
When you install this package your Qubes system will be altered to use When you install this package your Qubes system will be altered to use
the proxy by default. the proxy by default.
This is done with an entry in /etc/qubes/policy.d/30-user.policy This is done with an entry in /etc/qubes/policy.d/50-config-updates.policy
in Qubes 4.2
If you want to change the proxy setting for some/all templates, edit If you want to change the proxy setting for some/all templates, edit
that file. that file, or use the GUI global settings tool.
So that you can use https:// in your repository definitions, the entries So that you can use https:// in your repository definitions, the entries
will be changed in the templates. will be changed in the templates.
@ -88,10 +89,19 @@ fi
%postun %postun
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
sed -i /qubes.UpdatesProxy.*target=cacher/d /etc/qubes/policy.d/30-user.policy sed -i /qubes.UpdatesProxy.*target=cacher/d /etc/qubes/policy.d/50-config-updates.policy
rm /srv/pillar/_tops/base/update_proxy.top
rm /srv/pillar/update_proxy/init.top
rm /srv/pillar/update_proxy/init.sls
fi fi
%changelog %changelog
* Tue Jan 30 2024 unman <unman@thirdeyesecurity.org> - 1.12
- Update file locations for use in Qubes 4.2
* Thu Nov 30 2023 unman <unman@thirdeyesecurity.org> - 1.11
- Change base template to Debian-12-minimal for new install.
- Update fedora mirror list
- Change packaging logic on handling pillar when deleting package
* Mon Feb 20 2023 unman <unman@thirdeyesecurity.org> - 1.10 * Mon Feb 20 2023 unman <unman@thirdeyesecurity.org> - 1.10
- Create pillar for cacher - Create pillar for cacher
* Sun Jan 29 2023 unman <unman@thirdeyesecurity.org> - 1.9 * Sun Jan 29 2023 unman <unman@thirdeyesecurity.org> - 1.9

2
cacher/use.sls
View File

@ -4,7 +4,7 @@ qvm-present-id:
- template: template-cacher - template: template-cacher
- label: gray - label: gray
/etc/qubes/policy.d/30-user.policy: /etc/qubes/policy.d/50-config-updates.policy
file.prepend: file.prepend:
- text: - text:
- "qubes.UpdatesProxy * @tag:whonix-updatevm @default allow target=sys-whonix" - "qubes.UpdatesProxy * @tag:whonix-updatevm @default allow target=sys-whonix"