diff --git a/haproxy.changes b/haproxy.changes index 6275f92..4c5a973 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 28 14:32:00 UTC 2013 - p.drouand@gmail.com + +- Add systemd support + Target distributions all support systemd; keep alive sysvinit support + is useless + ------------------------------------------------------------------- Thu Oct 10 15:16:32 UTC 2013 - cdenicolo@suse.com diff --git a/haproxy.init b/haproxy.init deleted file mode 100644 index 57fd237..0000000 --- a/haproxy.init +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: haproxy -# Required-Start: $syslog $remote_fs -# Should-Start: $time ypbind sendmail -# Required-Stop: $syslog $remote_fs -# Should-Stop: $time ypbind sendmail -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: haproxy -# Description: Start haproxy a reliable, high performance TCP/HTTP load balancer -### END INIT INFO -# -# Any extensions to the keywords given above should be preceeded by -# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. -# -# Notes on Required-Start/Should-Start: -# * There are two different issues that are solved by Required-Start -# and Should-Start -# (a) Hard dependencies: This is used by the runlevel editor to determine -# which services absolutely need to be started to make the start of -# this service make sense. Example: nfsserver should have -# Required-Start: $portmap -# Also, required services are started before the dependent ones. -# The runlevel editor will warn about such missing hard dependencies -# and suggest enabling. During system startup, you may expect an error, -# if the dependency is not fulfilled. -# (b) Specifying the init script ordering, not real (hard) dependencies. -# This is needed by insserv to determine which service should be -# started first (and at a later stage what services can be started -# in parallel). The tag Should-Start: is used for this. -# It tells, that if a service is available, it should be started -# before. If not, never mind. -# * When specifying hard dependencies or ordering requirements, you can -# use names of services (contents of their Provides: section) -# or pseudo names starting with a $. The following ones are available -# according to LSB (1.1): -# $local_fs all local file systems are mounted -# (most services should need this!) -# $remote_fs all remote file systems are mounted -# (note that /usr may be remote, so -# many services should Require this!) -# $syslog system logging facility up -# $network low level networking (eth card, ...) -# $named hostname resolution available -# $netdaemons all network daemons are running -# The $netdaemons pseudo service has been removed in LSB 1.2. -# For now, we still offer it for backward compatibility. -# These are new (LSB 1.2): -# $time the system time has been set correctly -# $portmap SunRPC portmapping service available -# UnitedLinux extensions: -# $ALL indicates that a script should be inserted -# at the end -# * The services specified in the stop tags -# (Required-Stop/Should-Stop) -# specify which services need to be still running when this service -# is shut down. Often the entries there are just copies or a subset -# from the respective start tag. -# * Should-Start/Stop are now part of LSB as of 2.0, -# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. -# insserv does support both variants. -# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time -# (%fillup_and_insserv macro in %post of many RPMs) to specify whether -# a startup script should default to be enabled after installation. -# It's not used by insserv. -# -# Note on runlevels: -# 0 - halt/poweroff 6 - reboot -# 1 - single user 2 - multiuser without network exported -# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) -# -# Note on script names: -# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html -# A registry has been set up to manage the init script namespace. -# http://www.lanana.org/ -# Please use the names already registered or register one or use a -# vendor prefix. - - -# Check for missing binaries (stale symlinks should not happen) -# Note: Special treatment of stop for LSB conformance -HAPROXY_BIN=/usr/sbin/haproxy -test -x $HAPROXY_BIN || { echo "$HAPROXY_BIN not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } -HAPROXY_PID="/var/run/haproxy.pid" -HAPROXY_CONF="/etc/haproxy/haproxy.cfg" -## Check for existence of needed config file and read it -#HAPROXY_CONFIG=/etc/sysconfig/haproxy -#test -r $HAPROXY_CONFIG || { echo "$HAPROXY_CONFIG not existing"; -# if [ "$1" = "stop" ]; then exit 0; -# else exit 6; fi; } -# -## Read config -#. $HAPROXY_CONFIG - -# Source LSB init functions -# providing start_daemon, killproc, pidofproc, -# log_success_msg, log_failure_msg and log_warning_msg. -# This is currently not used by UnitedLinux based distributions and -# not needed for init scripts for UnitedLinux only. If it is used, -# the functions from rc.status should not be sourced or used. -#. /lib/lsb/init-functions - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed set local and overall rc status to -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks -. /etc/rc.status - -# Reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - -function haproxy_check() { - HAPROXY_CONFIG_CHECK="$($HAPROXY_BIN -c -q -f $HAPROXY_CONF 2>&1)" - if [ $? -ne 0 ] ; then - echo "" >&2 - echo "$HAPROXY_CONFIG_CHECK" >&2 - rc_failed - rc_status -v - exit 1 - else - return 0 - fi -} - -case "$1" in - start) - echo -n "Starting haproxy " - ## Start daemon with startproc(8). If this fails - ## the return value is set appropriately by startproc. - haproxy_check - /sbin/startproc $HAPROXY_BIN -D -f $HAPROXY_CONF -p $HAPROXY_PID - # Remember status and be verbose - rc_status -v - ;; - stop) - echo -n "Shutting down haproxy " - ## Stop daemon with killproc(8) and if this fails - ## killproc sets the return value according to LSB. - - /sbin/killproc -TERM $HAPROXY_BIN - - # Remember status and be verbose - rc_status -v - ;; - try-restart|condrestart) - ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - # we us reload here for a graceful restart during update - $0 reload - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; - restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - haproxy_check - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; - check) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - echo -n "Checking config of haproxy " - haproxy_check - rc_status -v - ;; - reload|force-reload) - ## Like force-reload, but if daemon does not support - ## signaling, do nothing (!) - - haproxy_check - # If it supports signaling: - echo -n "Reload service haproxy " - $HAPROXY_BIN -p $HAPROXY_PID -D -f $HAPROXY_CONF -sf $(cat $HAPROXY_PID) - rc_status -v - ;; - status) - echo -n "Checking for service haproxy " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - - # NOTE: checkproc returns LSB compliant status values. - /sbin/checkproc $HAPROXY_BIN - # NOTE: rc_status knows that we called this init script with - # "status" option and adapts its messages accordingly. - rc_status -v - ;; - probe) - ## Optional: Probe for the necessity of a reload, print out the - ## argument to this init script which is required for a reload. - ## Note: probe is not (yet) part of LSB (as of 1.9) - - test $HAPROXY_CONF -nt $HAPROXY_PID && echo reload - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" - exit 1 - ;; -esac -rc_exit diff --git a/haproxy.service b/haproxy.service new file mode 100644 index 0000000..3b7773f --- /dev/null +++ b/haproxy.service @@ -0,0 +1,13 @@ +[Unit] +Description=HAProxy For TCP And HTTP Based Applications +After=network.target + +[Service] +Type=forking +PIDFile=/run/haproxy.pid +ExecStartPre=/usr/sbin/haproxy -c -q -f /etc/haproxy/haproxy.cfg +ExecStart=/usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid +ExecReload=/bin/bash -c "exec /usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid -sf $MAINPID" + +[Install] +WantedBy=multi-user.target diff --git a/haproxy.spec b/haproxy.spec index c065235..4b8726c 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -1,7 +1,7 @@ # # spec file for package haproxy # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +21,16 @@ Release: 0 License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Networking/Web/Proxy # -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: libgcrypt-devel BuildRequires: pcre-devel libgcrypt-devel BuildRequires: udev +BuildRequires: pkgconfig(systemd) %define pkg_name haproxy %define pkg_home /var/lib/%{pkg_name} # Url: http://haproxy.1wt.eu/ Source: http://haproxy.1wt.eu/download/1.4/src/haproxy-%{version}.tar.gz -Source1: %{pkg_name}.init +Source1: %{pkg_name}.service Source2: http://haproxy.1wt.eu/download/contrib/haproxy.vim Patch1: haproxy-1.2.16_config_haproxy_user.patch Patch2: haproxy-makefile_lib.patch @@ -38,6 +39,7 @@ Source99: haproxy-rpmlintrc Summary: The Reliable, High Performance TCP/HTTP Load Balancer Provides: %{name}-doc = %{version} Obsoletes: %{name}-doc < %{version} +%{?systemd_requires} %description HAProxy implements an event-driven, mono-process model which enables support @@ -67,29 +69,25 @@ the most work done from every CPU cycle. %install %{__install} -D -m 0755 %{pkg_name} %{buildroot}%{_sbindir}/%{pkg_name} %{__install} -D -m 0644 examples/%{pkg_name}.cfg %{buildroot}%{_sysconfdir}/%{pkg_name}/%{pkg_name}.cfg -%{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name} -%{__ln_s} -f %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name} +%{__install} -D -m 0755 %{S:1} %{buildroot}%{_unitdir}/%{pkg_name}.service +ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{pkg_name} %{__install} -d -m 0755 %{buildroot}%{pkg_home} %{__install} -D -m 0644 %{S:2} %{buildroot}%{_datadir}/%{pkg_name}/%{pkg_name}.vim %{__install} -D -m 0644 doc/%{pkg_name}.1 %{buildroot}%{_mandir}/man1/%{pkg_name}.1 gzip %{buildroot}%{_mandir}/man1/%{pkg_name}.1 -%clean -%{?buildroot:%{__rm} -rf %{buildroot}} - %pre /usr/sbin/groupadd -r %{pkg_name} &>/dev/null ||: /usr/sbin/useradd -g %{pkg_name} -s /bin/false -r -c "user for %{pkg_name}" -d %{pkg_home} %{pkg_name} &>/dev/null ||: %post -%fillup_and_insserv %{pkg_name} +%service_add_post %{pkg_name}.service %preun -%stop_on_removal %{pkg_name} +%service_del_preun %{pkg_name}.service %postun -%restart_on_update %{pkg_name} -%{insserv_cleanup} +%service_del_postun %{pkg_name}.service %files %defattr(-,root,root,-) @@ -97,7 +95,7 @@ gzip %{buildroot}%{_mandir}/man1/%{pkg_name}.1 %doc ROADMAP TODO doc/* examples %dir %{_sysconfdir}/%{pkg_name} %config(noreplace) %{_sysconfdir}/%{pkg_name}/%{pkg_name}.cfg -%config(noreplace) %{_sysconfdir}/init.d/%{pkg_name} +%{_unitdir}/%{pkg_name}.service %{_sbindir}/haproxy %{_sbindir}/rchaproxy %{pkg_home}