rpms/freeradius/devel freeradius-dialupadmin-httpd-conf, NONE, 1.1 freeradius-radiusd-init, NONE, 1.1 freeradius-radrelay-init, NONE, 1.1 freeradius.spec, 1.58, 1.59 freeradius-radiusd.init, 1.1, NONE freeradius-radrelay.init, 1.1, NONE

Fri Feb 29 18:19:12 UTC 2008

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11111

Modified Files:
	freeradius.spec 
Added Files:
	freeradius-dialupadmin-httpd-conf freeradius-radiusd-init 
	freeradius-radrelay-init 
Removed Files:
	freeradius-radiusd.init freeradius-radrelay.init 
Log Message:
clean up dialupadmin requires
rename init scripts
add dialupadmin httpd conf

--- NEW FILE freeradius-dialupadmin-httpd-conf ---
Alias /radius/ /usr/share/dialup_admin/htdocs/
<Directory /usr/share/dialup_admin/htdocs/>
   Options None
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>

# RECOMMENDED
# For SSL-servers and user authentication
#<Directory /usr/share/dialup_admin/htdocs/>
#   Options None
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "Radius"
#   require group radius
#   Satisfy Any
#</Directory>



--- NEW FILE freeradius-radiusd-init ---
#!/bin/sh
#
# chkconfig: - 88 10
# description: Start/Stop the RADIUS server daemon
#
#    This program 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.
#
#    This program 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 this program; if not, write to the Free Software
#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
#
#    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
#

# Source function library.
. /etc/rc.d/init.d/functions

RADIUSD=/usr/sbin/radiusd
LOCKF=/var/lock/subsys/radiusd
CONFIG=/etc/raddb/radiusd.conf

[ -f $RADIUSD ] || exit 0
[ -f $CONFIG ] || exit 0

RETVAL=0

case "$1" in
  start)
	echo -n $"Starting RADIUS server: "
	daemon $RADIUSD
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch $LOCKF &&
	    ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
	;;
  stop)
	echo -n $"Stopping RADIUS server: "
	killproc $RADIUSD
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f $LOCKF
	;;
  status)
	status radiusd
	RETVAL=$?
        ;;
  reload)
	echo -n $"Reloading RADIUS server: "
	killproc $RADIUSD -HUP
	RETVAL=$?
	echo
	;;
  restart)
	$0 stop
	sleep 3
	$0 start
	RETVAL=$?
	;;
  condrestart)
	if [ -f $LOCKF ]; then
		$0 stop
		sleep 3
		$0 start
		RETVAL=$?
	fi
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
	exit 1
esac

exit $RETVAL


--- NEW FILE freeradius-radrelay-init ---
#!/bin/sh
#
# chkconfig: - 88 10
# description: Start/Stop the RADIUS server daemon
#
#    This program 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.
#
#    This program 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 this program; if not, write to the Free Software
#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
#
#    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
#

# Source function library.
. /etc/rc.d/init.d/functions

RADIUSD=/usr/sbin/radiusd
LOCKF=/var/lock/subsys/radiusd
CONFIG=/etc/raddb/radiusd.conf

[ -f $RADIUSD ] || exit 0
[ -f $CONFIG ] || exit 0

RETVAL=0

case "$1" in
  start)
	echo -n $"Starting RADIUS server: "
	daemon $RADIUSD
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch $LOCKF &&
	    ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
	;;
  stop)
	echo -n $"Stopping RADIUS server: "
	killproc $RADIUSD
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f $LOCKF
	;;
  status)
	status radiusd
	RETVAL=$?
        ;;
  reload)
	echo -n $"Reloading RADIUS server: "
	killproc $RADIUSD -HUP
	RETVAL=$?
	echo
	;;
  restart)
	$0 stop
	sleep 3
	$0 start
	RETVAL=$?
	;;
  condrestart)
	if [ -f $LOCKF ]; then
		$0 stop
		sleep 3
		$0 start
		RETVAL=$?
	fi
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
	exit 1
esac

exit $RETVAL


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- freeradius.spec	29 Feb 2008 04:16:24 -0000	1.58
+++ freeradius.spec	29 Feb 2008 18:18:34 -0000	1.59
@@ -12,10 +12,11 @@
 URL: http://www.freeradius.org/
 
 Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-server-%{version}.tar.bz2
-Source100: freeradius-radiusd.init
-Source101: freeradius-radrelay.init
+Source100: freeradius-radiusd-init
+Source101: freeradius-radrelay-init
 Source102: freeradius-logrotate
 Source103: freeradius-pam-conf
+Source104: freeradius-dialupadmin-httpd-conf
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,23 +76,11 @@
 %package dialupadmin
 Group:		Productivity/Networking/Radius/Servers
 Summary:	Web management for FreeRADIUS
-Requires:	http_daemon
-Requires:	perl-DateManip
-%if 0%{?suse_version} > 1000
-Requires:	apache2-mod_php5
-Requires:	php5
-Requires:	php5-ldap
-Requires:	php5-mysql
-Requires:	php5-pgsql
-%else
-Requires:	apache2-mod_php4
-Requires:	php4
-Requires:	php4-ldap
-Requires:	php4-mysql
-Requires:	php4-pgsql
-Requires:	php4-session
-%endif
-Autoreqprov:	off
+Requires:	httpd
+Requires:	php
+Requires:	php-ldap
+Requires:	php-mysql
+Requires:	php-pgsql
 
 %description dialupadmin
 Dialup Admin supports users either in SQL (MySQL or PostgreSQL are
@@ -102,7 +91,6 @@
 %package devel
 Group:        Development/Libraries/C and C++
 Summary:      FreeRADIUS Development Files (static libs)
-Autoreqprov:  off
 Requires:     %{name}-libs = %{version}
 
 %description devel
@@ -255,7 +243,7 @@
 perl -i -pe 's/^#general_snmpget_command\:.*$/general_snmpget_command\: \/usr\/bin\/snmpget/'   $DIALUPADMIN/conf/admin.conf
 # httpd config
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-install -m 644 suse/admin-httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/radius.conf
+install -m 644 %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/radius.conf
 # remove unneeded stuff
 rm -rf doc/00-OLD
 rm -f $RPM_BUILD_ROOT/usr/sbin/rc.radiusd


--- freeradius-radiusd.init DELETED ---


--- freeradius-radrelay.init DELETED ---


