Merge remote-tracking branch 'origin/pr/596'

* origin/pr/596:
  tinyproxy: drop no longer needed wrapper
  tinyproxy: drop unused configs

Pull request description:

- Drop unused config.
- Drop no longer needed wrapper.

Additional question:
I think 60s tinyproxy timeout is too long for system updates, because there are many mirror servers to use. Should I add commit which reduces timeout to 5s or 10s?

Author: marmarek

debian/qubes-core-agent.install

@@ -192,7 +192,6 @@ usr/lib/qubes/upgrades-status-notify
 usr/lib/qubes/vm-file-editor
 usr/lib/qubes/xdg-icon
 usr/lib/qubes/set-default-text-editor
-usr/lib/qubes/tinyproxy-wrapper
 usr/share/glib-2.0/schemas/*
 usr/share/kde4/services/*.desktop
 usr/share/keyrings/qubes-archive-keyring.gpg

network/Makefile

@@ -11,7 +11,6 @@ install:
 	install -d $(DESTDIR)$(QUBESLIBDIR)
 	install -t $(DESTDIR)$(QUBESLIBDIR) \
 		setup-ip \
-		tinyproxy-wrapper \
 		update-proxy-configs
 	install -d $(DESTDIR)$(BINDIR)
 	install -t $(DESTDIR)$(BINDIR) \

network/tinyproxy-updates.conf

@@ -11,10 +11,6 @@ LogLevel Notice
 PidFile "/var/run/tinyproxy-updates/tinyproxy.pid"
 
 MaxClients 50
-MinSpareServers 2
-MaxSpareServers 10
-StartServers 2
-MaxRequestsPerChild 0
 DisableViaHeader Yes
 
 Allow 127.0.0.1

network/tinyproxy-wrapper

@@ -1042,7 +1042,6 @@ rm -f %{name}-%{version}
 /usr/lib/qubes/qubes-sync-clock
 /usr/lib/qubes/resize-rootfs
 /usr/lib/qubes/set-default-text-editor
-/usr/lib/qubes/tinyproxy-wrapper
 /usr/lib/dracut/dracut.conf.d/30-qubes.conf
 /usr/lib/environment.d/60-gnome-software-fix.conf
 %dir /usr/lib/qubes/init

rpm_spec/core-agent.spec.in

@@ -4,7 +4,7 @@ ConditionPathExists=|/var/run/qubes-service/qubes-updates-proxy
 After=qubes-iptables.service
 
 [Service]
-ExecStart=/usr/lib/qubes/tinyproxy-wrapper -d -c /etc/tinyproxy/tinyproxy-updates.conf
+ExecStart=/usr/bin/tinyproxy -d -c /etc/tinyproxy/tinyproxy-updates.conf
 Restart=on-failure
 RestartSec=5s