Subversion Repositories ALCASAR

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1002 → Rev 1003

/alcasar.sh
271,10 → 271,10
$SED "/^password.*/d" /boot/grub/menu.lst
$SED "1ipassword --md5 $md5_grubpwd" /boot/grub/menu.lst
mysqlpwd=`cat /dev/urandom | tr -dc [:alnum:] | head -c8` # mot de passe de l'administrateur Mysqld
echo -n "Name and password of MYSQL administrator : " >> $PASSWD_FILE
echo -n "Name and password of Mysql/mariadb administrator : " >> $PASSWD_FILE
echo "root / $mysqlpwd" >> $PASSWD_FILE
radiuspwd=`cat /dev/urandom | tr -dc [:alnum:] | head -c8` # mot de passe de l'utilisateur Mysqld (utilisé par freeradius)
echo -n "Name and password of MYSQL user : " >> $PASSWD_FILE
echo -n "Name and password of Mysql/mariadb user : " >> $PASSWD_FILE
echo "$DB_USER / $radiuspwd" >> $PASSWD_FILE
secretuam=`cat /dev/urandom | tr -dc [:alnum:] | head -c8` # secret partagé entre intercept.php et coova-chilli
echo -n "Shared secret between the script 'intercept.php' and coova-chilli : " >> $PASSWD_FILE
1344,7 → 1344,7
#"(^http://[0-9a-z]+\.youtube\.[a-z]+[-/%.0-9a-z]*\?)(.*)"->"\1\2&edufilter=ABCD1234567890abcdef"
EOF
# change the the google safesearch ("safe=strict" instead of "safe=vss")
$SED "s?safe=vss?safe=strict?g" $DIR_DG/lists/urlregexlist
$SED "s?safe=vss?safe=strict?g" $DIR_DG/lists/urlregexplist
chown -R dansguardian:apache $DIR_DG
chmod -R g+rw $DIR_DG
# On crée la structure du DNS-blackhole :
1623,15 → 1623,18
/usr/sbin/msec
# modification /etc/inittab
[ -e /etc/inittab.default ] || cp /etc/inittab /etc/inittab.default
# On ne garde que 3 terminaux
# We keep only 3 TTYs
$SED "s?^4.*?#&?g" /etc/inittab
$SED "s?^5.*?#&?g" /etc/inittab
$SED "s?^6.*?#&?g" /etc/inittab
# switch to multi-users runlevel (instead of x11)
ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
$SED "s?^id.*?id:3:initdefault:?g" /etc/inittab
# On limite le temps d'attente de grub (3s) et on change la résolution d'écran
$SED "s?^timeout.*?timeout 3?g" /boot/grub/menu.lst
$SED "s?^kernel.*?& vga=791?g" /boot/grub/menu.lst
$SED "s? vga=791??2g" /boot/grub/menu.lst
# On supprime les services et les utilisateurs inutiles
# Remove unused services and users
for svc in alsa sound dm atd bootlogd stop-bootlogd
do
/sbin/chkconfig --del $svc
1812,7 → 1815,7
for func in init network gestion AC init_db param_radius param_web_radius param_chilli param_squid param_dansguardian antivirus param_ulogd param_awstats param_dnsmasq BL cron post_install
do
$func
# echo "*** 'debug' : end of function $func ***"; read a
echo "*** 'debug' : end of function $func ***"; read a
done
;;
-u | --uninstall)
/VERSION
1,0 → 0,0
2.6.1
2.7
/conf/rpms/i586/ulogd-1.24-18-mdv2011.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/ulogd-1.24-18-mdv2011.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
/CHANGELOG
3,7 → 3,8
************ CHANGELOG ***********
---------------------- 2.7 -----------------
NEWS
- the URL filter works with the new google safesearch regex ('safe=strict' instead of 'safe=vss')
- Migration to Mageia2 (in progress)
- The URL filter works with the new google safesearch regex ('safe=strict' instead of 'safe=vss')
 
---------------------- 2.6.1 -----------------
Bugs
/scripts/alcasar-urpmi.sh
2,16 → 2,16
# $Id$
 
# alcasar-urpmi.sh
# by Franck BOUIJOUX and Richard REY
# by 3abtux and Rexy
# This script is distributed under the Gnu General Public License (GPL)
 
# script de mise en place des dépots RPM
# configure the RPM repository
 
VERSION="2010.2"
VERSION="2"
ARCH="i586"
# ****** Alcasar needed RPMS - paquetages nécessaires au fonctionnement d'Alcasar ******
PACKAGES="freeradius freeradius-mysql freeradius-ldap freeradius-web apache-mpm-prefork apache-mod_ssl apache-mod_php squid dansguardian postfix MySQL logwatch ntp awstats buffer vim-enhanced bind-utils arpscan ulogd openssh-server php-xml php-ldap pam_ccreds rng-utils lsb-release dnsmasq sudo syslinux rsync cronie-anacron pciutils clamav pm-fallback-policy "
PACKAGES="freeradius freeradius-mysql freeradius-ldap freeradius-web apache-mpm-prefork apache-mod_ssl apache-mod_php squid dansguardian postfix mariadb logwatch ntp awstats bind-utils openssh-server php-xml php-ldap pam_ccreds rng-utils dnsmasq syslinux rsync cronie-anacron clamav pm-fallback-policy"
 
rpm_repository_sync ()
{
20,10 → 20,11
downloader: wget
}
EOF
urpmi.addmedia --probe-synthesis --mirrorlist ${!MIRRORLIST} main /media/main/release
urpmi.addmedia --update --probe-synthesis --mirrorlist ${!MIRRORLIST} main_updates /media/main/updates
urpmi.addmedia --probe-synthesis --mirrorlist ${!MIRRORLIST} contrib /media/contrib/release
urpmi.addmedia --update --probe-synthesis --mirrorlist ${!MIRRORLIST} contrib_updates /media/contrib/updates
echo ${!MIRRORLIST}
urpmi.addmedia core --probe-synthesis --mirrorlist ${!MIRRORLIST} /media/core/release
urpmi.addmedia core-updates --update --probe-synthesis --mirrorlist ${!MIRRORLIST} /media/core/updates
#urpmi.addmedia --probe-synthesis --mirrorlist ${!MIRRORLIST} contrib /media/contrib/release
#urpmi.addmedia --update --probe-synthesis --mirrorlist ${!MIRRORLIST} contrib_updates /media/contrib/updates
}
 
rpm_error ()
34,47 → 35,64
echo "Try an other install later."
echo "If this problem occurs again, change the MIRRORLIST[1&2] variables in the file 'scripts/alcasar-urpmi.sh'"
}
# extract the current Mandriva version and hardware architecture (i586 ou X64)
# extract the current Mandriva/Mageia version and hardware architecture (i586 ou X64)
fic=`cat /etc/product.id`
unknown_os=0
old="$IFS"
IFS=","
set $fic
for i in $*
do
if [ "`echo $i|grep distribution|cut -d'=' -f1`" == "distribution" ]
then
DISTRIBUTION=`echo $i|cut -d"=" -f2`
unknown_os=`expr $unknown_os + 1`
fi
if [ "`echo $i|grep version|cut -d'=' -f1`" == "version" ]
then
CURRENT_VERSION=`echo $i|cut -d"=" -f2`
if [ $CURRENT_VERSION != "2009.0" ] && [ $CURRENT_VERSION != "2009.1" ] && [ $CURRENT_VERSION != "2010.0" ] && [ $CURRENT_VERSION != "2010.1" ] && [ $CURRENT_VERSION != "2010.2" ]
then
echo "La migration automatique du système ne peut être réalisée."
echo "Réalisez une mise à jour manuelle (cf. doc)."
echo "The automatic system update can't perform."
echo "Do a manual update (see doc)."
exit 1
fi
unknown_os=`expr $unknown_os + 1`
fi
if [ "`echo $i|grep arch|cut -d'=' -f1`" == "arch" ]
then
ARCH=`echo $i|cut -d"=" -f2`
unknown_os=`expr $unknown_os + 1`
fi
done
IFS="$old"
if [ $unknown_os != 3 ]
then
echo "le système installé n'est pas reconnu"
echo "the installed operating system is unknown"
exit 1
fi
if [ $DISTRIBUTION == "Mandriva" ]
then
if [ $CURRENT_VERSION != "2009.0" ] && [ $CURRENT_VERSION != "2009.1" ] && [ $CURRENT_VERSION != "2010.0" ] && [ $CURRENT_VERSION != "2010.1" ] && [ $CURRENT_VERSION != "2010.2" ]
then
echo "La migration automatique du système ne peut être réalisée."
echo "Réalisez une mise à jour manuelle (cf. doc)."
echo "The automatic system update can't perform."
echo "Do a manual update (see doc)."
exit 1
fi
fi
# We prefer wget than curl
urpmi --no-verify-rpm --auto conf/rpms/$ARCH/wget*.rpm
# Set the RPM repository
MIRROR_NBR=2
# For french ALCASARistes
MIRRORLIST1="http://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/official/$VERSION/$ARCH"
# For Europeans
MIRRORLIST1="http://www.mirrorservice.org/sites/mageia.org/pub/mageia/distrib/$VERSION/$ARCH"
# For International install
MIRRORLIST2="http://api.mandriva.com/mirrors/basic.$VERSION.$ARCH.list"
MIRRORLIST2="http://mirrors.mageia.org/api/mageia.$VERSION.$ARCH.list"
try_nb="0"; nb_repository="0"
while [ "$nb_repository" != "4" ]
while [ "$nb_repository" != "2" ]
do
try_nb=`expr $try_nb + 1`
MIRRORLIST="MIRRORLIST$try_nb"
rpm_repository_sync
nb_repository=`cat /etc/urpmi/urpmi.cfg|grep mirrorlist|wc -l`
if [ "$nb_repository" != "4" ]
if [ "$nb_repository" != "2" ]
then
echo "Une erreur a été détectée lors de la synchronisation avec le dépot N°$try_nb."
echo "An error occurs when synchronising the repositories N°$try_nb"
99,7 → 117,7
done
# delete unused RPMs
echo "Cleaning the system : "
for rm_rpm in shorewall dhcp-server cyrus-sasl distcache-server avahi mandi radeontool mondo mindi
for rm_rpm in shorewall dhcp-server cyrus-sasl distcache-server avahi mandi radeontool mondo mindi task-x11 x11-server-common
do
/usr/sbin/urpme --auto $rm_rpm --auto-orphans 2>/dev/null
echo -n "."
/readme.txt
1,9 → 1,9
$Id: readme-2.0.txt 581 2011-04-21 16:59:59Z richard $
 
Alcasar-2.6.1
Alcasar-2.7
 
*********** English **********
- Complete install : Need the CD double architecture of Linux Mandriva 2010.1 (mandriva-linux-free-2010-spring-dual.iso).
- Complete install : Need the CD double architecture (32b and 64b) of Linux Mageia2 (Mageia-2-dual-CD.iso).
--> Follow the install doc.
- To update automaticly the earlier versions of Alcasar (>= V1.7), just execute the install script ("sh alcasar.sh --install")
- In case of update a version less than 2.1 :
12,7 → 12,7
 
*********** Français ********
 
- Installation complète : elle s'effectue sur la base du CD double architecture (32b et 64b) de la distribution Linux-mandriva 2010.1 (mandriva-linux-free-2010-spring-dual.iso).
- Installation complète : elle s'effectue sur la base du CD double architecture (32b et 64b) de la distribution Linux Mageia2 (Mageia-2-dual-CD.iso).
--> Suivez la procédure d'installation.
- La mise à jour des anciennes versions d'Alcasar (>= V1.7) est automatique en lançant le script d'installation ("sh alcasar.sh --install")
- Dans le cas de la mise à jour d'une version inférieure à 2.1 :