WebSVN – ALCASAR – Path Comparison – / – /conf/ Rev 142 and /conf/ Rev 141

Ignore whitespace Rev 142 → Rev 141

 /conf/chilli-init
 ,0 → 1,129
+#!/bin/sh
+#
+# chilli      CoovaChilli init
+#
+# chkconfig: 2345 65 35
+# description: CoovaChilli
+# Source function library.
+daemon=
+killproc=killall
+[ -e /etc/rc.d/init.d/functions ] && {
+    . /etc/rc.d/init.d/functions
+    daemon=daemon
+    killproc=killproc
+}
+[ -e /etc/sysconfig/network ] && {
+    . /etc/sysconfig/network
+    [ ${NETWORKING} = "no" ] && exit 0
+}
+[ -f /usr/sbin/chilli ] || exit 0
+. /etc/chilli/functions
+MULTI=$(ls /etc/chilli/*/chilli.conf 2>/dev/null)
+[ -z "$DHCPIF" ] && [ -n "$MULTI" ] && {
+    for c in $MULTI;
+    do
+        gprintf "Found configuration %s\n" "$c"
+        DHCPIF=$(basename $(echo $c|sed 's#/chilli.conf##'))
+        export DHCPIF
+        gprintf "Running DHCPIF=%s %s $*\n" "$DHCPIF" "$0"
+        sh $0 $*
+    done
+    exit
+}
+if [ -n "$DHCPIF" ]; then
+    CONFIG=/etc/chilli/$DHCPIF/chilli.conf
+else
+    CONFIG=/etc/chilli.conf
+fi
+[ -f $CONFIG ] || {
+    gprintf "%s Not found\n" "$CONFIG"
+    exit 0
+}
+check_required
+RETVAL=0
+prog="chilli"
+case $1 in
+    start)
+        gprintf "Starting %s: " "$prog"
+        /sbin/modprobe tun >/dev/null 2>&1
+        echo 1 > /proc/sys/net/ipv4/ip_forward
+        [ -e /dev/net/tun ] || {
+            (cd /dev;
+                mkdir net;
+                cd net;
+                mknod tun c 10 200)
+        }
+        writeconfig
+        radiusconfig
+        test ${HS_ADMINTERVAL:-0} -gt 0 && {
+            (crontab -l 2>&- | grep -v $0
+                gprintf "*/%s * * * * %s radconfig\n" "$HS_ADMINTERVAL" "$0"
+                ) | crontab - 2>&-
+        }
+        ifconfig $HS_LANIF 0.0.0.0
+        $daemon /usr/sbin/chilli -c $CONFIG &
+        RETVAL=$?
+        echo
+        ;;
+    radconfig)
+        [ -e $MAIN_CONF ] || writeconfig
+        radiusconfig
+        ;;
+    reload)
+        killall -HUP chilli
+        ;;
+    restart)
+        $0 stop
+        $0 start
+        RETVAL=$?
+        ;;
+    status)
+        status chilli
+        RETVAL=$?
+        ;;
+    stop)
+        gprintf "Shutting down %s: " "$prog"
+        crontab -l 2>&- | grep -v $0 | crontab -
+        [ -f /var/run/chilli.$HS_LANIF.pid ] && {
+            kill $(cat /var/run/chilli.$HS_LANIF.pid)
+            RETVAL=$?
+            [ $RETVAL = 0 ] && {
+                rm -f /var/run/chilli.$HS_LANIF.pid 2>/dev/null
+            }
+        }
+        #$killproc chilli
+        echo
+        ;;
+    *)
+        gprintf "Usage: %s {start|stop|restart|reload|radconfig}\n" "$0"
+        exit 1
+esac
+exit $?

/conf/rpms/i586/lib64chilli0-1.2.2-1mdv2010.0.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/conf/rpms/i586/coova-chilli-1.2.2-1mdv2010.0.i586.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/conf/rpms/i586/python-coova-chilli-1.2.2-1mdv2010.0.i586.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/conf/rpms/i586/python-coova-chilli-1.2.1-5mdv2010.0.i586.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/conf/rpms/i586/coova-chilli-1.2.1-5mdv2010.0.i586.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/conf/rpms/i586/libchilli0-1.2.1-5mdv2010.0.i586.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/conf/rpms/x86_64/libchilli0-1.2.2-1mdv2010.0.i586.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/conf/rpms/x86_64/python-coova-chilli-1.2.2-1mdv2010.0.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/conf/rpms/x86_64/coova-chilli-1.2.2-1mdv2010.0.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/conf/rpms/x86_64/lib64chilli0-1.2.1-1mdv2010.0.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/conf/rpms/x86_64/python-coova-chilli-1.2.1-1mdv2010.0.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/conf/rpms/x86_64/coova-chilli-1.2.1-1mdv2010.0.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /conf/sudoers
 ,7 → 19,7
 Cmnd_Alias      SQL=/usr/local/sbin/alcasar-mysql.sh                                                    # pour exporter la base mysql
 Cmnd_Alias      GHOST=/usr/local/bin/alcasar-mondo.sh                                                   # pour générer une image iso du serveur
 Cmnd_Alias      EXPORT=/usr/local/bin/alcasar-log-export.sh                                             # pour exporter/sauvegarder les fichiers journaux
-Cmnd_Alias      BL=/usr/local/sbin/alcasar-bl.sh,/usr/local/sbin/alcasar-havp.sh                        # pour gérer le filtrage WEB (blacklists, whitelist et antivirus)
+Cmnd_Alias      BL=/usr/local/sbin/alcasar-bl.sh                                                        # pour gérer les blacklists et whitelist
 Cmnd_Alias      NF=/usr/local/sbin/alcasar-nf.sh                                                        # pour gérer le filtrage réseau
 Cmnd_Alias      LOGOUT=/usr/local/sbin/alcasar-logout.sh                                                # pour déconnecter les usagers
 Cmnd_Alias      UAM=/usr/local/sbin/alcasar-uamallowed.sh                                               # pour gérer les site de confiance (uamallowed)

Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 142 → Rev 141