Subversion Repositories ALCASAR

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2877 → Rev 2878

/CHANGELOG
11,7 → 11,7
- Improve the voucher (tickets) display with a serif font
- Local DNS resolution simplification
- ALCASAR E2guardian html template when intercepted (due to blacklisted-URL or malware detected)
- Retrieve letsencrypt configuration when updating
- Retrieve letsencrypt and gammu-smsd configuration when updating
BUGS
- Network IP addresses can now be set as exception
- "sudo" RPM isn't automatically loaded
/conf/alcasar-e2g-en.html
40,7 → 40,7
</tr><tr>
<td></td><td><a href="javascript:history.back()">Previous page</a></td>
</tr>
</tr></table>
</table>
</div>
</div>
</div>
/conf/alcasar-e2g-fr.html
40,7 → 40,7
</tr><tr>
<td></td><td><a href="javascript:history.back()">Page précédente</a></td>
</tr>
</tr></table>
</table>
</div>
</div>
</div>
/iso/scripts/build-image.sh
10,14 → 10,14
#
#######################
###### Variables ######
###############################################################################""
################################################################################
 
CURRENT_DIR="$(readlink -f "$(dirname $0)")"
LOG_FILE="$CURRENT_DIR/build-image.log"
 
# Mageia
MAGEIA_VERSION=`cat /etc/release|cut -c 16`
ARCH=`cat /etc/release|cut -c 33-38`
MAGEIA_VERSION=`cat /etc/release|cut -d" " -f3`
ARCH=`cat /etc/release|cut -d" " -f6`
MAGEIA_NEW_DIR=/tmp/mageia_new
MAGEIA_OFFICIAL_DIR=/tmp/mageia_official
# ISO file
40,7 → 40,7
 
# RPMs
RPM_DIR="/root/rpms"
BASE_RPM_LIST="acpi acpid alsa-utils aoss arp-scan basesystem bash-completion coreutils-doc cpupower curl dhcp-client dmraid dnf dnf-plugins-core dosfstools dracut drakx-net-text gpm grub2 grub2-efi grub2-mageia-theme harddrake hdparm hexedit info iwlwifi-agn-ucode kernel-server-latest kernel-firmware kernel-firmware-nonfree ldetect lftp lib64alsa-plugins lib64glib-networking-gnutls locales-en locales-fr lsof lvm2 mageia-theme-Default man-db mandi-ifw man-pages microcode microcode_ctl mtools ntfs-3g numlock os-prober p11-kit perl-Hal-Cdroms plymouth procmail python3 python3-dbus radeon-firmware ralink-firmware rtlwifi-firmware sharutils shorewall-ipv6 strace sysfsutils tmpwatch tree vim-minimal vnstat xdg-user-dirs-gtk sudo"
BASE_RPM_LIST="acpi acpid alsa-utils aoss arp-scan basesystem bash-completion coreutils-doc cpupower curl dhcp-client dmraid dnf dnf-plugins-core dosfstools dracut drakx-net-text gpm grub2 grub2-efi grub2-mageia-theme harddrake hdparm hexedit info iwlwifi-agn-ucode kernel-server-latest kernel-firmware kernel-firmware-nonfree ldetect lftp lib64alsa-plugins lib64glib-networking-gnutls locales-en locales-fr lsof lvm2 mageia-theme-Default man-db mandi-ifw man-pages microcode microcode_ctl mtools ntfs-3g numlock os-prober p11-kit perl-Hal-Cdroms plymouth procmail python3 python3-dbus radeon-firmware ralink-firmware rtlwifi-firmware sharutils shorewall-ipv6 strace sysfsutils tmpwatch tree vim-minimal vnstat xdg-user-dirs-gtk sudo socat"
 
#######################
###### Functions ######
/readme.txt
8,7 → 8,7
- Update ALCASAR 3.5
--> Copy, uncompress and run the installation script. It ask you if you want to update
- Update ALCASAR 3.x
--> On your running ALCASAR, create and retrieve the configuration file with the command "alcasar-conf.sh -create". This configuration file (alcasar-conf.tar.gz) is stored in "/var/tmp/" (or in "/tmp/").
--> On your running ALCASAR, create and retrieve the configuration file via ACC (or with the command "alcasar-conf.sh -create"). This configuration file (alcasar-conf.tar.gz) is stored in "/var/tmp/" (or in "/tmp/").
--> Install the Linux-Mageia-7.1 as a new installation, but without formating the "/var" partition. Just before running the ALCASAR installation script, verify that your configuration file (alcasar-conf.tar.gz) is indeed in "/var/tmp/" folder. Copy it in this folder if necessary.
*********** Français ********
- Nouvelle installation : Démarrez votre système avec l'image ISO de Linux-Mageia7.1 (ou l'image ISO de "Mageiar" qui est une image ISO personnalisée de Linux-Mageia (Linux Mageia + ALCASAR = Mageiar).
16,5 → 16,5
- Mise à jour d'une version 3.5
--> copiez, décompressez et lancez le script d'installation. Il vous demandera si vous voulez mettre à jour.
- Mise à jour d'une version 3.x
--> Sur votre ALCASAR en fonctionnement, créez et récupérez le fichier de configuration via la commande "alcasar-conf.sh -create". Ce fichier de configuration (alcasar-conf.tar.gz) est enregistré dans le répertoire "/var/tmp/' (ou "/tmp/").
--> Sur votre ALCASAR en fonctionnement, créez et récupérez le fichier de configuration via l'ACC (ou avec la commande "alcasar-conf.sh -create"). Ce fichier de configuration (alcasar-conf.tar.gz) est enregistré dans le répertoire "/var/tmp/' (ou "/tmp/").
--> Installez Linux-Mageia-7.1 comme pour une nouvelle installation, mais sans formater la partition "/var/". Juste avant de lancer le script d'installation d'alcasar, vérifiez que votre fichier de configuration (alcasar-conf.tar.gz) et bien dans le répertoire "/var/tmp". Copiez-le dans ce répertoire le cas échéant.
/scripts/alcasar-conf.sh
20,7 → 20,10
DIR_ETC="/usr/local/etc" # conf directory
DIR_E2G="/etc/e2guardian/lists" # Toulouse BL directory
DIR_BLACKLIST="$DIR_E2G/blacklists" # Toulouse BL directory
CONF_FILE="$DIR_ETC/alcasar.conf" # main alcasar conf file
CONF_FILE="$DIR_ETC/alcasar.conf" # main alcasar conf file
PASSWD_FILE="/root/ALCASAR-passwords.txt"
DB_USER=$(grep '^db_user=' $PASSWD_FILE | cut -d'=' -f 2-)
DB_PASS=$(grep '^db_password=' $PASSWD_FILE | cut -d'=' -f 2-)
EXTIF=`grep ^EXTIF= $CONF_FILE|cut -d"=" -f2` # EXTernal InterFace
INTIF=`grep ^INTIF= $CONF_FILE|cut -d"=" -f2` # INTernal InterFace
MTU=`grep ^PUBLIC_MTU= $CONF_FILE|cut -d"=" -f2`
474,9 → 477,12
$SED "s?^ORGANISME.*?ORGANISME=$ORGANISME?g" /etc/bashrc
# sudoers
$SED "s?^Host_Alias.*?Host_Alias LAN_ORG=$PRIVATE_NETWORK/$PRIVATE_NETMASK,localhost #réseau de l'organisme?g" /etc/sudoers
# gammu-smsd
$SED "s?^user =.*?user = $DB_USER?g" /etc/gammu_smsd_conf
$SED "s?^password =.*?password = $DB_PASS?g" /etc/gammu_smsd_conf
# Services start
if [ "$PARENT_SCRIPT" != "alcasar.sh" ] # don't launch on install stage
then
# Services start
/usr/bin/systemctl start network && echo -n "Start service : network" && sleep 1
$DIR_BIN/alcasar-dhcp.sh -$DHCP_mode && echo -n ", chilli" # apply DHCP mode and start CoovaChilli
for i in unbound unbound-blackhole ntpd
/scripts/alcasar-daemon.sh
26,9 → 26,11
echo "the $service service is disabled! trying to start it..."
if [ $service == 'gammu-smsd' ]; then
/usr/local/bin/alcasar-sms.sh --start
else
/usr/bin/systemctl start $service.service
fi
if [ $service == 'sshd' ]; then
[ -s /etc/ssh/ssh_host_rsa_key ] || rm -f /etc/ssh/ssh_host_* # sometimes sshd doesn't initialise its keys
fi
/usr/bin/systemctl start $service.service
else
nb_srv=$((nb_srv+1))
fi
/web/acc/alcasar-3.5.1-exploitation-en.pdf
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/web/acc/alcasar-3.5.1-exploitation-fr.pdf
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/web/acc/alcasar-3.5.1-installation-en.pdf
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/web/acc/alcasar-3.5.1-installation-fr.pdf
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/web/acc/alcasar-3.5.1-technique.pdf
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream