This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via b0b61056a72dad063e56a4093e0bfbc087eb7985 (commit) from 32218ed0bab94adc0be85d37ed475869fd5ebccc (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit b0b61056a72dad063e56a4093e0bfbc087eb7985 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 4 14:38:38 2015 +0200

haproxy: Provide a better example configuration that works

-----------------------------------------------------------------------

Summary of changes: config/haproxy/haproxy.cfg | 4 ++-- lfs/haproxy | 2 +- src/paks/{nagiosql => haproxy}/install.sh | 7 ++++--- src/paks/{git => haproxy}/uninstall.sh | 2 +- src/paks/{xinetd => haproxy}/update.sh | 0 5 files changed, 8 insertions(+), 7 deletions(-) copy src/paks/{nagiosql => haproxy}/install.sh (90%) copy src/paks/{git => haproxy}/uninstall.sh (98%) copy src/paks/{xinetd => haproxy}/update.sh (100%)

Difference in files: diff --git a/config/haproxy/haproxy.cfg b/config/haproxy/haproxy.cfg index 324ad5e..9d372f6 100644 --- a/config/haproxy/haproxy.cfg +++ b/config/haproxy/haproxy.cfg @@ -28,8 +28,8 @@ global chroot /var/lib/haproxy pidfile /var/run/haproxy.pid maxconn 4000 - user haproxy - group haproxy + user nobody + group nobody daemon

# turn on stats unix socket diff --git a/lfs/haproxy b/lfs/haproxy index febb65a..4af2273 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = haproxy -PAK_VER = 1 +PAK_VER = 2

DEPS = ""

diff --git a/src/paks/haproxy/install.sh b/src/paks/haproxy/install.sh new file mode 100644 index 0000000..45b2161 --- /dev/null +++ b/src/paks/haproxy/install.sh @@ -0,0 +1,30 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files + +# Enable autostart +ln -sf ../init.d/haproxy /etc/rc.d/rc0.d/K25haproxy +ln -sf ../init.d/haproxy /etc/rc.d/rc3.d/S35haproxy +ln -sf ../init.d/haproxy /etc/rc.d/rc6.d/K25haproxy diff --git a/src/paks/haproxy/uninstall.sh b/src/paks/haproxy/uninstall.sh new file mode 100644 index 0000000..b01ee11 --- /dev/null +++ b/src/paks/haproxy/uninstall.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +remove_files +rm -rfv /etc/rc.d/rc*.d/*haproxy diff --git a/src/paks/haproxy/update.sh b/src/paks/haproxy/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/haproxy/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh

hooks/post-receive -- IPFire 2.x development tree