[Devil-linux-commit] build/scripts haproxy,1.1,1.2 sarg,1.11,1.12

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13926/scripts

Modified Files:
	haproxy sarg 
Log Message:
fixed sarg config file installation
added haproxy init script and sample configuration (Udo Lembke)


Index: haproxy
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/haproxy,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- haproxy	3 Jul 2016 20:43:51 -0000	1.1
+++ haproxy	21 Aug 2016 14:30:19 -0000	1.2
@@ -29,13 +29,21 @@
 		mkdir -p $TMPDIR || exit 1
 		make install DESTDIR=$TMPDIR PREFIX=/usr || exit 1
 		copy_docs $TMPDIR
-		cp -dpR $TMPDIR/* $CDDIR || exit 1
+		cp -dpvR $TMPDIR/* $CDDIR || exit 1
 		rm -rf $TMPDIR || exit 1
-
-		#cp $MYDIR/scripts/haproxy $ETCDIR/etc/init.d/ || exit 1
-		#echo "# Start $MYNAME?" >> $CONFIGFILE
-		#echo "START_$MYNAME=no" >> $CONFIGFILE
-		#echo >> $CONFIGFILE || exit 1
+		mkdir -p $ETCDIR/etc/haproxy/errors || exit 1
+		cp -dpvR examples/errorfiles/* $ETCDIR/etc/haproxy/errors || exit 1
+		cp -v $MYDIR/scripts/haproxy $ETCDIR/etc/init.d/ || exit 1
+		cp -v $MYDIR/scripts/haproxy.cfg-example $ETCDIR/etc/haproxy || exit 1
+		
+		groupadd -g 117 haproxy || exit 1
+		useradd -u 117 -g haproxy -c "haproxy daemon" -s /bin/false haproxy || exit 1
+		
+		echo "# Start $MYNAME?" >> $CONFIGFILE
+		echo "START_$MYNAME=no" >> $CONFIGFILE
+		echo >> $CONFIGFILE || exit 1
+		echo "# Additional haproxy parameter" >> $CONFIGFILE
+		echo "HAPROXY_MAXCONN=1024" >> $CONFIGFILE
 	fi
 	;;
 

Index: sarg
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sarg,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sarg	7 Nov 2015 14:38:57 -0000	1.11
+++ sarg	21 Aug 2016 14:30:19 -0000	1.12
@@ -35,8 +35,8 @@
 
 		copy_docs $TMPDIR
 		
-		mkdir -p $ETCDIR/sarg || exit 1
-		copy_files $TMPDIR/etc/* $ETCDIR/sarg/ || exit 1
+		mkdir -p $ETCDIR/etc/sarg || exit 1
+		copy_files $TMPDIR/etc/* $ETCDIR/etc/sarg/ || exit 1
 		copy_files $TMPDIR/usr/* $CDDIR/usr/ || exit 1
 		copy_files sarg-php $CDDIR/usr/share/sarg/ || exit 1