Accepting request 578251 from home:adamm:branches:server:proxy

- Spec file cleanup:
  + Drop unused fillup template - it's not used by systemd script
  + Drop %pretrans section which is only used to upgrade from
    version 3.4 of squid - no supported codestream has that version.
  + Drop explicit BR: on systemd-rpm-macros
- Update squid.service systemd file
  + Don't need to use squid to manage squid anymore
  + Drop references to default config file, since it's default
- Drop reference to nonexistent EnvironmentFile in the service file

OBS-URL: https://build.opensuse.org/request/show/578251
OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=150
This commit is contained in:
Martin Pluskal
2018-02-20 07:30:53 +00:00
committed by Git OBS Bridge
parent 1fb71188d2
commit 901a4dfe17
5 changed files with 17 additions and 52 deletions

View File

@@ -1,14 +1,13 @@
[Unit]
Description=Squid caching proxy
Documentation=man:squid(8)
After=network.target named.service nss-lookup.service
[Service]
Type=forking
EnvironmentFile=-/etc/sysconfig/squid
ExecStartPre=%{_libdir}/squid/initialize_cache_if_needed.sh
ExecStart=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf
ExecReload=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf -k reconfigure
ExecStop=/usr/sbin/squid -F -f /etc/squid/squid.conf -k shutdown
ExecStart=/usr/sbin/squid -FC
ExecReload=/usr/bin/kill -HUP $MAINPID
LimitNOFILE=4096
PIDFile=/run/squid.pid