------------------------------------------------------------
revno: 13691
revision-id: squid3@treenet.co.nz-20141218125455-q0sus7gm3654vtjq
parent: squid3@treenet.co.nz-20141218125251-i8p72hzkyblze0tw
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3826
author: Hussam Al-Tayeb <hussam@visp.net.lb>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Thu 2014-12-18 04:54:55 -0800
message:
  Bug 3826: pt 2: Provide a systemd .service file for Squid
  
  Created with help from davidstrauss in #systemd channel and provided
  as a working example for package distributors to use. It is not
  installed by a 'make install' build of Squid.
  
  For now SMP support is not available to Squid controlled by systemd.
  That part of the bug 3826 issue has yet to be resolved.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141218125455-q0sus7gm3654vtjq
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: b94e798d13536a835d55b52cd38e84f3030d9f28
# timestamp: 2014-12-18 13:50:56 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20141218125251-\
#   i8p72hzkyblze0tw
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2014-12-18 12:52:51 +0000
+++ configure.ac	2014-12-18 12:54:55 +0000
@@ -3841,6 +3841,7 @@
 	tools/Makefile
 	tools/purge/Makefile
 	tools/squidclient/Makefile
+	tools/systemd/Makefile
 	tools/sysvinit/Makefile
 ])
 

=== modified file 'tools/Makefile.am'
--- tools/Makefile.am	2014-12-18 12:52:51 +0000
+++ tools/Makefile.am	2014-12-18 12:54:55 +0000
@@ -13,6 +13,7 @@
 AM_CPPFLAGS += -I$(srcdir)
 
 SUBDIRS = purge squidclient sysvinit
+SUBDIRS = purge squidclient systemd sysvinit
 EXTRA_DIST = 
 man_MANS = 
 DISTCLEANFILES = 

=== added directory 'tools/systemd'
=== added file 'tools/systemd/Makefile.am'
--- tools/systemd/Makefile.am	1970-01-01 00:00:00 +0000
+++ tools/systemd/Makefile.am	2014-12-18 12:54:55 +0000
@@ -0,0 +1,10 @@
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+EXTRA_DIST = squid.service

=== added file 'tools/systemd/squid.service'
--- tools/systemd/squid.service	1970-01-01 00:00:00 +0000
+++ tools/systemd/squid.service	2014-12-18 12:54:55 +0000
@@ -0,0 +1,19 @@
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
+[Unit]
+Description=Squid Web Proxy Server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/squid -sYC -N
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target