[Devil-linux-commit] build/config/etc/init.d jail,1.33,1.34 syslog,1.9,1.10

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12865/config/etc/init.d

Modified Files:
	jail syslog 
Log Message:

- max-connections instead of max_connections
- a misplaced bracket in /etc/init.d/jail


Index: syslog
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/syslog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- syslog	24 Jan 2005 00:35:19 -0000	1.9
+++ syslog	6 Nov 2005 10:47:02 -0000	1.10
@@ -32,7 +32,7 @@
 			for I in $(ls /etc/sysconfig/jail)
 			do
 				A=${I##/*/}
-				sed -e "s| unix-stream(\"$JAIL_DIR/$A/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+				sed -e "s| unix-stream(\"$JAIL_DIR/$A/dev/log\" max_connections(1000));||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 				mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 			done
 			if [ "$SYSLOG_USER" = "root" ]; then 

Index: jail
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/jail,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- jail	20 Oct 2005 12:49:08 -0000	1.33
+++ jail	6 Nov 2005 10:47:02 -0000	1.34
@@ -268,7 +268,7 @@
 		case $SYSLOG_DAEMON in
 		    syslog-ng )
 			if [ -z "$(grep "unix-stream(\"$JAILDIR/dev/log\");" /etc/syslog-ng/syslog-ng.conf)" ]; then
-				sed -e "s|^source src {|source src { unix-stream(\"$JAILDIR/dev/log\" max_connections(1000));|" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+				sed -e "s|^source src {|source src { unix-stream(\"$JAILDIR/dev/log\" max-connections(1000));|" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 				mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 				/etc/init.d/syslog reload
 			fi
@@ -297,7 +297,7 @@
 	stop )
 		case $SYSLOG_DAEMON in
 		    syslog-ng )
-			sed -e "s| unix-stream(\"$JAILDIR/dev/log\") max_connections(1000);||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+			sed -e "s| unix-stream(\"$JAILDIR/dev/log\" max_connections(1000));||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 			mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 			/etc/init.d/syslog reload
 			;;