[Cluster-devel] conga ./conga.spec.in.in luci/Makefile luci/in ...

[Cluster-devel] conga ./conga.spec.in.in luci/Makefile luci/in ...

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-06-16 23:14:34

Modified files:
	.              : conga.spec.in.in 
	luci           : Makefile 
	luci/init.d    : luci 
	luci/site/luci/etc: stunnel.conf 
Added files:
	luci/sysconfig : Makefile luci 

Log message:
	luci: clients facing https port can be changed in /etc/sysconfig/luci

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/luci.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/etc/stunnel.conf.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/sysconfig/Makefile.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/sysconfig/luci.diff?cvsroot=cluster&r1=NONE&r2=1.1

--- conga/conga.spec.in.in	2006/06/16 21:34:25	1.6
+++ conga/conga.spec.in.in	2006/06/16 23:14:33	1.7
@@ -87,14 +87,14 @@
 
 %files -n luci
 %defattr(-,root,root)
-%config			%{_sysconfdir}/rc.d/init.d/luci
-			%{_sbindir}/luci_admin
-%attr(-,luci,root)	%{_localstatedir}/lib/luci
-%attr(600,luci,root)	%{_localstatedir}/lib/luci/var/Data.fs
-%config			%{_localstatedir}/lib/luci/var/Data.fs
-%config			%{_localstatedir}/lib/luci/etc/zope.conf
-%config(noreplace)	%{_localstatedir}/lib/luci/etc/logrotate.conf
-%config(noreplace)	%{_localstatedir}/lib/luci/etc/stunnel.conf
+%config				%{_sysconfdir}/rc.d/init.d/luci
+%config(noreplace)		%{_sysconfdir}/sysconfig/luci
+				%{_sbindir}/luci_admin
+%attr(-,luci,root)		%{_localstatedir}/lib/luci
+%attr(600,luci,root)%config	%{_localstatedir}/lib/luci/var/Data.fs
+%config				%{_localstatedir}/lib/luci/etc/zope.conf
+%config(noreplace)		%{_localstatedir}/lib/luci/etc/logrotate.conf
+%config				%{_localstatedir}/lib/luci/etc/stunnel.conf
 
 %pre -n luci
 /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
--- conga/luci/Makefile	2006/06/14 21:44:34	1.4
+++ conga/luci/Makefile	2006/06/16 23:14:34	1.5
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2006/06/14 21:44:34 kupcevic Exp $
+# $Id: Makefile,v 1.5 2006/06/16 23:14:34 kupcevic Exp $
 
 
 all: luci
@@ -8,6 +8,7 @@
 	make -C site
 	make -C utils
 	make -C init.d
+	make -C sysconfig
 	make -C docs
 
 
@@ -18,6 +19,7 @@
 	make -C site install
 	make -C utils install
 	make -C init.d install
+	make -C sysconfig install
 	make -C docs install
 
 
@@ -25,6 +27,7 @@
 	make -C site clean
 	make -C utils clean
 	make -C init.d clean
+	make -C sysconfig clean
 	make -C docs clean
 
 
@@ -32,6 +35,7 @@
 	make -C site distclean
 	make -C utils distclean
 	make -C init.d distclean
+	make -C sysconfig distclean
 	make -C docs distclean
 
 
--- conga/luci/init.d/luci	2006/06/14 20:59:37	1.3
+++ conga/luci/init.d/luci	2006/06/16 23:14:34	1.4
@@ -33,6 +33,9 @@
 STUNNEL_PID="/var/lib/luci/var/stunnel/pid"
 STUNNEL_CONF="/var/lib/luci/etc/stunnel.conf"
 
+# grab luci defaults
+. /etc/sysconfig/luci
+
 #
 # Only root wants to run this...
 #
@@ -72,11 +75,12 @@
     rm -f /var/lib/luci/var/Data.fs.index
     $LUCID >/dev/null 2>/dev/null &
     
-    res=https_certs_ok
-    if [ "1$res" != "10" ] ; then
+    https_certs_ok
+    if [ "1$?" != "10" ] ; then
 	generate_https_certs
     fi
-    $STUNNEL_D $STUNNEL_CONF >/dev/null 2>/dev/null &
+    sed -e s,\\\(^accept.*=\ \\\)\\\(.*\\\),\\\1$LUCI_HTTPS_PORT, $STUNNEL_CONF \
+	| $STUNNEL_D -fd 0
     
     sleep 4
 }
@@ -107,7 +111,7 @@
     LUCI_UP=1
     if [ -e $PIDFILE ] ; then
 	pid_num=`cat $PIDFILE`
-	res=`ps -Af | grep python | grep luci | grep $pid_num`
+	res=`ps -Af | grep python | grep $LUCI_USER | grep $pid_num`
 	if [ "1$res" != "1" ] ; then
 	    LUCI_UP=0
 	fi
@@ -117,7 +121,7 @@
     ST_UP=2
     if [ -e $STUNNEL_PID ] ; then
 	pid_num=`cat $STUNNEL_PID`
-	res=`ps -Af | grep stunnel | grep luci | grep $pid_num`
+	res=`ps -Af | grep stunnel | grep $LUCI_USER | grep $pid_num`
 	if [ "1$res" != "1" ] ; then
 	    ST_UP=0
 	fi
--- conga/luci/site/luci/etc/stunnel.conf	2006/06/14 20:59:37	1.2
+++ conga/luci/site/luci/etc/stunnel.conf	2006/06/16 23:14:34	1.3
@@ -5,7 +5,9 @@
 pid          = /pid
 
 [https]
-accept       = 8181
+# accept directive is replaced on each luci start
+# modify /etc/sysconfig/luci:LUCI_HTTPS_PORT to change https port
+accept       = 8084
 connect      = localhost:25639
 TIMEOUTclose = 0
 
/cvs/cluster/conga/luci/sysconfig/Makefile,v  -->  standard output
revision 1.1
--- conga/luci/sysconfig/Makefile
+++ -	2006-06-16 23:14:34.997915000 +0000
@@ -0,0 +1,17 @@
+
+
+
+all:
+
+
+install:
+	install -d ${DESTDIR}/etc/sysconfig
+	install luci ${DESTDIR}/etc/sysconfig
+
+
+clean:
+
+
+distclean:
+
+
/cvs/cluster/conga/luci/sysconfig/luci,v  -->  standard output
revision 1.1
--- conga/luci/sysconfig/luci
+++ -	2006-06-16 23:14:35.078746000 +0000
@@ -0,0 +1,4 @@
+# defaults for luci, 
+# web UI fronted for remote management
+
+LUCI_HTTPS_PORT=8084