WebSVN – ALCASAR – Path Comparison – /

Ignore whitespace Rev 315 → Rev 316

/gestion/alcasar-1.9-installation.pdf
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

/gestion/admin/firewallEyes/images/commandHeaderBkg.jpg
Cannot display: file marked as a binary type.
svn:mime-type = image/jpeg
Property changes:
Deleted: svn:mime-type
-image/jpeg
\ No newline at end of property

/gestion/admin/firewallEyes/images/firewallEyes.jpg
Cannot display: file marked as a binary type.
svn:mime-type = image/jpeg
Property changes:
Deleted: svn:mime-type
-image/jpeg
\ No newline at end of property

/gestion/admin/firewallEyes/images/port-src.gif
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

/gestion/admin/firewallEyes/images/logo-firewallEyes.gif
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

/gestion/admin/firewallEyes/images/src-port.gif
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

/gestion/admin/firewallEyes/images/buttonBkg.jpg
Cannot display: file marked as a binary type.
svn:mime-type = image/jpeg
Property changes:
Deleted: svn:mime-type
-image/jpeg
\ No newline at end of property

/gestion/admin/firewallEyes/images/info.gif
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

/gestion/admin/firewallEyes/images/port-dst.gif
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

/gestion/admin/firewallEyes/images/dst-port.gif
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

/gestion/admin/firewallEyes/images/header-background.jpg
Cannot display: file marked as a binary type.
svn:mime-type = image/jpeg
Property changes:
Deleted: svn:mime-type
-image/jpeg
\ No newline at end of property

/gestion/admin/firewallEyes/images/source.gif
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

/gestion/admin/firewallEyes/images/destination.gif
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

/gestion/admin/firewallEyes/readme.txt
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/gestion/admin/firewallEyes/gpl.txt
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/gestion/alcasar-certificat.pdf
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

/gestion/alcasar-1.9-presentation.pdf
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

/gestion/favicon.ico
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

/gestion/alcasar-1.9-exploitation.pdf
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

/gestion/redirect/logo-alcasar.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/Rubix.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/OpenBSD.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/CentOS.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/Gentoo.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/Arch.gif
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

/gestion/phpsysinfo/images/unknown.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/PLD.gif
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

/gestion/phpsysinfo/images/Fedora.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/Ubuntu.gif
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

/gestion/phpsysinfo/images/Trustix.gif
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

/gestion/phpsysinfo/images/Cobalt.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/free-eos.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/Redhat.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/SunOS.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/xp.gif
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

/gestion/phpsysinfo/images/FreeBSD.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/Slackware.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/Suse.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/NetBSD.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/Mandrake.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/Debian.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/Darwin.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/images/lfs.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/phpsysinfo/templates/alcasar/images/redbar_left.gif
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

/gestion/phpsysinfo/templates/alcasar/images/redbar_right.gif
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

/gestion/phpsysinfo/templates/alcasar/images/redbar_middle.gif
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

/gestion/phpsysinfo/templates/alcasar/images/bar_left.gif
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

/gestion/phpsysinfo/templates/alcasar/images/bar_middle.gif
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

/gestion/phpsysinfo/templates/alcasar/images/trans.gif
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

/gestion/images/state_ok.gif
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

/gestion/images/right.gif
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

/gestion/images/footer_gnupg.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/footer_squid.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/logo-alcasar.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/footer_awstats.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/alcasar.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/att.gif
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

/gestion/images/down2.gif
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

/gestion/images/tpf.gif
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

/gestion/images/linux_ksc2_old.jpg
Cannot display: file marked as a binary type.
svn:mime-type = image/jpeg
Property changes:
Deleted: svn:mime-type
-image/jpeg
\ No newline at end of property

/gestion/images/footer_linux.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/linux_ksc2.jpg
Cannot display: file marked as a binary type.
svn:mime-type = image/jpeg
Property changes:
Deleted: svn:mime-type
-image/jpeg
\ No newline at end of property

/gestion/images/tux16.ico
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

/gestion/images/footer_dansguardian.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/right2.gif
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

/gestion/images/graph.gif
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

/gestion/images/cron.gif
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

/gestion/images/footer_mysql.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/organisme.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/create.gif
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

/gestion/images/logo-alcasar.gif
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

/gestion/images/footer_coova.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/footer_mondo.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/footer_apache.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/footer_php.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/stop.gif
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

/gestion/images/footer_freeradius.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/footer_firewalleyes.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/mini-tux.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/state_error.gif
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

/gestion/images/footer_netfilter.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/info.gif
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

/gestion/images/footer_mandriva.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/gestion/images/pix.gif
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

/gestion/images/pass.gif
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

/gestion/images/down.gif
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

 /alcasar.sh
 ,11 → 42,11
 DATE_SHORT=`date '+%d/%m/%Y'`
 # ******* Files parameters - paramètres fichiers *********
 DIR_INSTALL=`pwd`                               # répertoire d'installation
-DIR_GESTION="$DIR_INSTALL/gestion"              # répertoire d'installation contenant l'interface de gestion
 DIR_CONF="$DIR_INSTALL/conf"                    # répertoire d'installation contenant les fichiers de configuration
 DIR_SCRIPTS="$DIR_INSTALL/scripts"              # répertoire d'installation contenant les scripts
 DIR_SAVE="/var/Save"                            # répertoire de sauvegarde (ISO, backup, etc.)
-DIR_WEB="/var/www/html"                         # répertoire du centre de gestion
+DIR_WEB="/var/www/html"                         # répertoire racine APACHE
+DIR_ACC="$DIR_WEB/acc"                          # répertoire du centre de gestion 'ALCASAR Control Center'
 DIR_DEST_BIN="/usr/local/bin"                   # répertoire des scripts
 DIR_DEST_SBIN="/usr/local/sbin"                 # répertoire des scripts d'admin
 DIR_DEST_ETC="/usr/local/etc"                   # répertoire des fichiers de conf
 ,13 → 452,13
         [ -d $DIR_WEB ] && rm -rf $DIR_WEB
         mkdir $DIR_WEB
 # Copie et configuration des fichiers du centre de gestion
-        cp -rf $DIR_GESTION/* $DIR_WEB/
+        cp -rf $DIR_INSTALL/web/* $DIR_WEB/
         echo "$VERSION du $DATE" > $DIR_WEB/VERSION
-        $SED "s?99/99/9999?$DATE_SHORT?g" $DIR_WEB/menu.php
-        $SED "s?\$DB_RADIUS = .*?\$DB_RADIUS = \"$DB_RADIUS\"\;?g" $DIR_WEB/phpsysinfo/includes/xml/portail.php
-        $SED "s?\$DB_USER = .*?\$DB_USER = \"$DB_USER\"\;?g" $DIR_WEB/phpsysinfo/includes/xml/portail.php
-        $SED "s?\$radiuspwd = .*?\$radiuspwd = \"$radiuspwd\"\;?g" $DIR_WEB/phpsysinfo/includes/xml/portail.php
-        chmod 640 $DIR_WEB/phpsysinfo/includes/xml/portail.php
+        $SED "s?99/99/9999?$DATE_SHORT?g" $DIR_ACC/menu.php
+        $SED "s?\$DB_RADIUS = .*?\$DB_RADIUS = \"$DB_RADIUS\"\;?g" $DIR_ACC/phpsysinfo/includes/xml/portail.php
+        $SED "s?\$DB_USER = .*?\$DB_USER = \"$DB_USER\"\;?g" $DIR_ACC/phpsysinfo/includes/xml/portail.php
+        $SED "s?\$radiuspwd = .*?\$radiuspwd = \"$radiuspwd\"\;?g" $DIR_ACC/phpsysinfo/includes/xml/portail.php
+        chmod 640 $DIR_ACC/phpsysinfo/includes/xml/portail.php
         chown -R apache:apache $DIR_WEB/*
         for i in ISO base logs/firewall logs/httpd logs/squid ;
         do
 ,19 → 494,19
 #       - la redirection suite à l'indisponibilité d'Internet (via watchdog)
 #       - l'accès au centre de gestion (lien https)
 # On utilise la réécriture d'URL pour rediriger toute les URLs
-        FIC_VIRTUAL=`find /etc/httpd/conf -type f -name *default_vhosts*`
-        [ -e /etc/httpd/conf/vhosts.default ]  || cp $FIC_VIRTUAL /etc/httpd/conf/vhosts.default
-        cat <<EOF > $FIC_VIRTUAL
-NameVirtualHost *:80
-<VirtualHost *:80>
-ServerName $HOSTNAME
-DocumentRoot $DIR_WEB/redirect
-RewriteEngine on
-RewriteRule ^.*logo-alcasar.* /logo-alcasar.png [L]
-RewriteRule ^(.*)$ /index.php [L]
-</VirtualHost>
-EOF
-        $SED "s?^\$private_ip =.*?\$private_ip = \"$PRIVATE_IP\";?g" $DIR_WEB/redirect/index-access-deny.php $DIR_WEB/redirect/index-network-pb.php
+#       FIC_VIRTUAL=`find /etc/httpd/conf -type f -name *default_vhosts*`
+#       [ -e /etc/httpd/conf/vhosts.default ]  || cp $FIC_VIRTUAL /etc/httpd/conf/vhosts.default
+#       cat <<EOF > $FIC_VIRTUAL
+#NameVirtualHost *:80
+#<VirtualHost *:80>
+#ServerName $HOSTNAME
+#DocumentRoot $DIR_WEB/redirect
+#RewriteEngine on
+#RewriteRule ^.*logo-alcasar.* /logo-alcasar.png [L]
+#RewriteRule ^(.*)$ /index.php [L]
+#</VirtualHost>
+#EOF
+#       $SED "s?^\$private_ip =.*?\$private_ip = \"$PRIVATE_IP\";?g" $DIR_WEB/redirect/index-access-deny.php $DIR_WEB/redirect/index-network-pb.php
 # Définition du premier compte lié au profil 'admin'
         if [ "$mode" = "install" ]
         then
 ,12 → 522,12
                 read admin_portail
                 echo "- Nom du premier compte lié au profil 'admin' : $admin_portail" >> $FIC_PARAM
 # Création du fichier de clés de ce compte dans le profil "admin"
-                [ -d $DIR_WEB/digest ] && rm -rf $DIR_WEB/digest
-                mkdir -p $DIR_WEB/digest
-                chmod 755 $DIR_WEB/digest
-                until [ -s $DIR_WEB/digest/key_admin ]
+                [ -d $DIR_ACC/digest ] && rm -rf $DIR_ACC/acc/digest
+                mkdir -p $DIR_ACC/digest
+                chmod 755 $DIR_ACC/digest
+                until [ -s $DIR_ACC/digest/key_admin ]
                         do
-                                /usr/sbin/htdigest -c $DIR_WEB/digest/key_admin $HOSTNAME $admin_portail
+                                /usr/sbin/htdigest -c $DIR_ACC/digest/key_admin $HOSTNAME $admin_portail
                         done
 # Création des fichiers de clés des deux autres profils (backup + manager) contenant ce compte
                 $DIR_DEST_SBIN/alcasar-profil.sh -list
 ,12 → 535,12
 # Sécurisation du centre
         rm -f /etc/httpd/conf/webapps.d/*
         cat <<EOF > /etc/httpd/conf/webapps.d/alcasar.conf
-<Directory $DIR_WEB/digest>
+<Directory $DIR_ACC/digest>
         AllowOverride none
         Order deny,allow
         Deny from all
 </Directory>
-<Directory $DIR_WEB/admin>
+<Directory $DIR_ACC>
         SSLRequireSSL
         AllowOverride None
         Order deny,allow
 ,10 → 551,10
         AuthType digest
         AuthName $HOSTNAME
         BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
-        AuthUserFile $DIR_WEB/digest/key_admin
+        AuthUserFile $DIR_ACC/digest/key_all
         ErrorDocument 404 https://$PRIVATE_IP/
 </Directory>
-<Directory $DIR_WEB/manager/htdocs>
+<Directory $DIR_ACC/admin>
         SSLRequireSSL
         AllowOverride None
         Order deny,allow
 ,10 → 565,10
         AuthType digest
         AuthName $HOSTNAME
         BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
-        AuthUserFile $DIR_WEB/digest/key_manager
+        AuthUserFile $DIR_ACC/digest/key_admin
         ErrorDocument 404 https://$PRIVATE_IP/
 </Directory>
-<Directory $DIR_WEB/manager/html>
+<Directory $DIR_ACC/manager/htdocs>
         SSLRequireSSL
         AllowOverride None
         Order deny,allow
 ,10 → 579,10
         AuthType digest
         AuthName $HOSTNAME
         BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
-        AuthUserFile $DIR_WEB/digest/key_manager
+        AuthUserFile $DIR_ACC/digest/key_manager
         ErrorDocument 404 https://$PRIVATE_IP/
 </Directory>
-<Directory $DIR_WEB/backup>
+<Directory $DIR_ACC/manager/html>
         SSLRequireSSL
         AllowOverride None
         Order deny,allow
 ,9 → 593,23
         AuthType digest
         AuthName $HOSTNAME
         BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
-        AuthUserFile $DIR_WEB/digest/key_backup
+        AuthUserFile $DIR_ACC/digest/key_manager
         ErrorDocument 404 https://$PRIVATE_IP/
 </Directory>
+<Directory $DIR_ACC/backup>
+        SSLRequireSSL
+        AllowOverride None
+        Order deny,allow
+        Deny from all
+        Allow from 127.0.0.1
+        Allow from $PRIVATE_NETWORK_MASK
+        require valid-user
+        AuthType digest
+        AuthName $HOSTNAME
+        BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
+        AuthUserFile $DIR_ACC/digest/key_backup
+        ErrorDocument 404 https://$PRIVATE_IP/
+</Directory>
 Alias /save/ "$DIR_SAVE/"
 <Directory $DIR_SAVE>
         SSLRequireSSL
 ,7 → 621,7
         require valid-user
         AuthType digest
         AuthName $HOSTNAME
-        AuthUserFile $DIR_WEB/digest/key_backup
+        AuthUserFile $DIR_ACC/digest/key_backup
         ErrorDocument 404 https://$PRIVATE_IP/
         ReadmeName      /readmeSave.html
 </Directory>
 ,12 → 748,12
 param_web_radius ()
 {
 # copie de l'interface d'origine dans la structure Alcasar
-        [ -d /usr/share/freeradius-web ] && cp -rf /usr/share/freeradius-web/* $DIR_WEB/manager/
+        [ -d /usr/share/freeradius-web ] && cp -rf /usr/share/freeradius-web/* $DIR_ACC/manager/
 # copie des fichiers modifiés et suppression des fichiers inutiles
-        cp -rf $DIR_GESTION/manager/* $DIR_WEB/manager/
-        rm -f $DIR_WEB/manager/index.html $DIR_WEB/manager/readme
-        rm -f $DIR_WEB/manager/htdocs/about.html $DIR_WEB/manager/htdocs/index.html $DIR_WEB/manager/htdocs/content.html
-        chown -R apache:apache $DIR_WEB/manager/
+        cp -rf $DIR_INSTALL/web/acc/manager/* $DIR_ACC/manager/
+        rm -f $DIR_ACC/manager/index.html $DIR_ACC/manager/readme
+        rm -f $DIR_ACC/manager/htdocs/about.html $DIR_ACC/manager/htdocs/index.html $DIR_ACC/manager/htdocs/content.html
+        chown -R apache:apache $DIR_ACC/manager/
 # Modification du fichier de configuration
         [ -e /etc/freeradius-web/admin.conf.default ] || cp /etc/freeradius-web/admin.conf /etc/freeradius-web/admin.conf.default
         $SED "s?^general_domain:.*?general_domain: $ORGANISME.$DOMAIN?g" /etc/freeradius-web/admin.conf
 ,8 → 784,8
         chown -R apache:apache /etc/freeradius-web
 # Ajout de l'alias vers la page de "changement de mot de passe usager"
         cat <<EOF >> /etc/httpd/conf/webapps.d/alcasar.conf
-Alias /pass/ "$DIR_WEB/manager/pass/"
-<Directory $DIR_WEB/manager/pass>
+Alias /pass/ "$DIR_ACC/manager/pass/"
+<Directory $DIR_ACC/manager/pass>
         SSLRequireSSL
         AllowOverride None
         Order deny,allow
 ,8 → 1007,8
 ##################################################################################
 param_awstats()
 {
-        cp -rf /usr/share/awstats/www/ $DIR_WEB/awstats/
-        chown -R apache:apache $DIR_WEB/awstats
+        cp -rf /usr/share/awstats/www/ $DIR_ACC/awstats/
+        chown -R apache:apache $DIR_ACC/awstats
         cp /etc/awstats/awstats.conf /etc/awstats/awstats.conf.default
         $SED "s?^LogFile=.*?LogFile=\"/var/log/squid/access.log\"?g" /etc/awstats/awstats.conf
         $SED "s?^LogFormat=.*?LogFormat=4?g" /etc/awstats/awstats.conf
 ,7 → 1020,7
         $SED "s?^BuildReportFormat=.*?BuildReportFormat=xhtml?g" /etc/awstats/awstats.conf
         $SED "s?^UseFramesWhenCGI=.*?UseFramesWhenCGI=0?g" /etc/awstats/awstats.conf
         cat <<EOF >> /etc/httpd/conf/webapps.d/alcasar.conf
-<Directory $DIR_WEB/awstats>
+<Directory $DIR_ACC/awstats>
         SSLRequireSSL
         Options ExecCGI
         AddHandler cgi-script .pl
 ,7 → 1033,7
         AuthType digest
         AuthName $HOSTNAME
         BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
-        AuthUserFile $DIR_WEB/digest/key_admin
+        AuthUserFile $DIR_ACC/digest/key_admin
         ErrorDocument 404 https://$PRIVATE_IP/
 </Directory>
 SetEnv PERL5LIB /usr/share/awstats/lib:/usr/share/awstats/plugins
 ,8 → 1089,8
 # on copie par défaut la BL de toulouse embarqués dans l'archive d'ALCASAR
         rm -rf /etc/dansguardian/lists/blacklists
         tar zxf $DIR_CONF/blacklists.tar.gz --directory=/etc/dansguardian/lists/ 2>&1 >/dev/null
-        cp -f $DIR_CONF/VERSION-BL $DIR_WEB/
-        chown apache:apache $DIR_WEB/VERSION-BL
+        cp -f $DIR_CONF/VERSION-BL $DIR_ACC/
+        chown apache:apache $DIR_ACC/VERSION-BL
 # on crée le répertoire de la BL secondaire
         mkdir /etc/dansguardian/lists/blacklists/ossi
         touch /etc/dansguardian/lists/blacklists/ossi/domains
 ,7 → 1122,7
         chown -R root:apache /usr/local/etc/{alcasar-dnsfilter-available,alcasar-dnsfilter-enabled}
 # On fait pointer le black-hole sur une page interne
         $SED "s?^IP_RETOUR=.*?IP_RETOUR=\"$PRIVATE_IP\"?g" $DIR_DEST_SBIN/alcasar-bl.sh
-        ln -sf $DIR_WEB/redirect/index-access-deny.php $DIR_WEB/redirect/index.php
+        ln -sf $DIR_WEB/index-access-deny.php $DIR_WEB/index.php
 # On récupère la dernière version de la BL Toulouse
         $DIR_DEST_SBIN/alcasar-bl.sh -download
 }
 ,11 → 1357,11
                 do
                         if [ "`echo $i|grep version|cut -d'=' -f1`" == "version" ]
                         then
-                                version=`echo $i|cut -d"=" -f2`
+                                mdv_version=`echo $i|cut -d"=" -f2`
                         fi
                 done
                 IFS="$old"
-                if [ ! "$version" = "$MDV_NEEDED" ]
+                if [ ! "$mdv_version" = "$MDV_NEEDED" ]
                 then
                         echo "La version actuelle de Linux Mandriva va être mise à jour en ($MDV_NEEDED). En cas de problème, suivez la procédure manuelle (cf. doc exploitation)"
                         sleep 5

 /scripts/alcasar-conf.sh
 ,7 → 37,12
                 /usr/local/sbin/alcasar-mysql.sh -dump
                 cp /var/Save/base/`ls /var/Save/base|tail -1` $DIR_UPDATE
 # Sauvegarde des comptes de gestion
-                cp -rf $DIR_WEB/digest $DIR_UPDATE
+                if [ -e $DIR_WEB/digest ]
+                then
+                        cp -rf $DIR_WEB/digest $DIR_UPDATE # versions < 2.x
+                else
+                        cp -rf $DIR_WEB/acc/digest $DIR_UPDATE # version >= 2.x
+                fi
 # Sauvegarde du nom d'organisme
                 echo `hostname` > $DIR_UPDATE/hostname
 # Sauvegarde du logo
 ,12 → 100,14
                 chmod -R g+rw /etc/dansguardian/lists
 # on active/desactive la BL
                 active_bl=`cat /etc/dansguardian/dansguardian.conf|grep ^reportinglevel|cut -d" " -f3`
+                PARENT_SCRIPT=$0
+                export PARENT_SCRIPT
                 if [ $active_bl -eq "-1" ]
-                      then $DIR_DEST_SBIN/alcasar-bl.sh -on
-                      else $DIR_DEST_SBIN/alcasar-bl.sh -off
+                      then $DIR_DEST_SBIN/alcasar-bl.sh -off
+                      else $DIR_DEST_SBIN/alcasar-bl.sh -on
                 fi
 # Récupération des comptes de gestion (admin + manager + backup)
-                cp -rf $DIR_UPDATE/digest $DIR_WEB/
+                cp -rf $DIR_UPDATE/digest $DIR_WEB/acc
                 $DIR_DEST_SBIN/alcasar-profil.sh -list
 # Récupération des règles de filtrage réseau
                 cp -rf $DIR_UPDATE/etc/* $DIR_DEST_ETC/

 /scripts/sbin/alcasar-profil.sh
 ,7 → 5,7
 ADM_PROFIL="admin"
 PROFILS="backup manager"
 ALL_PROFILS=`echo $ADM_PROFIL $PROFILS`
-DIR_KEY="/var/www/html/digest"
+DIR_KEY="/var/www/html/acc/digest"
 SED="/bin/sed -i"
 HOSTNAME=`uname -n`
 # liste les comptes de chaque profile
 ,13 → 17,16
         done
 }
 # ajoute les comptes du profil "admin" aux autres profils
+# crée le fichier de clés contenant tous les compte (pour l'accès au centre de gestion)
 function concat () {
         for i in $PROFILS
         do
                 cp -f $DIR_KEY/key_only_$ADM_PROFIL $DIR_KEY/key_$i
                 cat $DIR_KEY/key_only_$i >> $DIR_KEY/key_$i
+                cat $DIR_KEY/key_only_$i >> $DIR_KEY/key_all
         done
         cp -f $DIR_KEY/key_only_$ADM_PROFIL $DIR_KEY/key_$ADM_PROFIL
+        cat $DIR_KEY/key_only_$ADM_PROFIL >> $DIR_KEY/key_all
         chown -R root:apache $DIR_KEY
         chmod 640 $DIR_KEY/key_*
 }
 ,10 → 44,14
 for i in $PROFILS
 do
         if [ ! -e $DIR_KEY/key_only_$i ]
-                then
+        then
                 touch $DIR_KEY/key_only_$i
         fi
 done
+if [ ! -e $DIR_KEY/key_all ]
+then
+        touch $DIR_KEY/key_all
+fi
 concat
 if [ $nb_args -eq 0 ]
 then

 /scripts/sbin/alcasar-bl.sh
 ,7 → 6,8
 DIR_tmp="/tmp/blacklists"
 FILE_tmp="/tmp/fileFilter.txt"
-DIR_DANSGUARDIAN="/etc/dansguardian/lists"
+DIR_DG="/etc/dansguardian/lists"
+DIR_DG_BL="$DIR_DG/blacklists"
 BL_CATEGORIES="/usr/local/etc/alcasar-bl-categories"
 BL_CATEGORIES_ENABLED="/usr/local/etc/alcasar-bl-categories-enabled"
 DIR_DNS_FILTER_AVAILABLE="/usr/local/etc/alcasar-dnsfilter-available"
 ,10 → 24,10
 # Décompression de la BL (en conservant la WL)
 function install () {
-        [ -d $DIR_DANSGUARDIAN ] || mkdir -p $DIR_DANSGUARDIAN
-        [ -d $DIR_DANSGUARDIAN/blacklists/ossi ] && mv -f $DIR_DANSGUARDIAN/blacklists/ossi $DIR_tmp
-        tar zxf $DIR_tmp/blacklists.tar.gz --directory=$DIR_DANSGUARDIAN/
-        [ -d $DIR_tmp/ossi ] && mv -f $DIR_tmp/ossi $DIR_DANSGUARDIAN/blacklists/
+        [ -d $DIR_DG ] || mkdir -p $DIR_DG
+        [ -d $DIR_DG_BL/ossi ] && mv -f $DIR_DG_BL/ossi $DIR_tmp
+        tar zxf $DIR_tmp/blacklists.tar.gz --directory=$DIR_DG/
+        [ -d $DIR_tmp/ossi ] && mv -f $DIR_tmp/ossi $DIR_DG_BL/
         cd /root
         rm -rf $DIR_tmp
 }
 ,7 → 35,7
 # Adaptation de la BL Toulouse à la structure Dnsmasq
 function adapt () {
         # On récupère le nom des répertoire (catégories)
-        find $DIR_DANSGUARDIAN -type f -name domains > $BL_CATEGORIES
+        find $DIR_DG_BL/ -type f -name domains > $BL_CATEGORIES
         # On supprime le suffice "/domains"
         $SED "s?\/domains??g" $BL_CATEGORIES
         rm -f $DIR_DNS_FILTER_AVAILABLE/*
 ,7 → 59,7
 function cat_choice (){
         # un peu de ménage
         rm -rf $DIR_DNS_FILTER_ENABLED/*
-        $SED "/\.Include/d" $DIR_DANSGUARDIAN/bannedsitelist $DIR_DANSGUARDIAN/bannedurllist
+        $SED "/\.Include/d" $DIR_DG/bannedsitelist $DIR_DG/bannedurllist
         # on adapte le fichier $BL_CATEGORIES au choix de catégorie
         $SED "s?^[^#]?#&?g" $BL_CATEGORIES # on commente ce qui ne l'est pas
         for ENABLE_CATEGORIE in `cat $BL_CATEGORIES_ENABLED`
 ,7 → 74,7
                 do
                 ln -s $DIR_DNS_FILTER_AVAILABLE/$i.conf $DIR_DNS_FILTER_ENABLED/$i
                 # echo ".Include<$DIR_DANSGUARDIAN/blacklists/$i/domains>" >> $DIR_DANSGUARDIAN/bannedsitelist
-                echo ".Include<$DIR_DANSGUARDIAN/blacklists/$i/urls>" >> $DIR_DANSGUARDIAN/bannedurllist
+                echo ".Include<$DIR_DG_BL/$i/urls>" >> $DIR_DG/bannedurllist
                 done
 }
 usage="Usage: alcasar-bl.sh -on | -off | -download| -reload"
 ,15 → 94,21
         -on)
                 cat_choice
                 $SED "s/^reportinglevel =.*/reportinglevel = 3/g" /etc/dansguardian/dansguardian.conf
+                if [ ! $PARENT_SCRIPT -eq "alcasar.sh" ] # on ne relance pas les processus d'une install
+                then
                 service dansguardian restart
                 service dnsmasq restart
+                fi
                 ;;
         # désactivation du filtrage
         -off)
                 rm -rf $DIR_DNS_FILTER_ENABLED/*
                 $SED "s/^reportinglevel =.*/reportinglevel = -1/g" /etc/dansguardian/dansguardian.conf
-                service dansguardian reload
+                if [ ! $PARENT_SCRIPT -eq "alcasar.sh" ] # on ne relance pas les processus lors d'une install
+                then
+                service dansguardian restart
                 service dnsmasq restart
+                fi
                 ;;
         # Mise a jour de la blacklist 'Toulouse' et adaptation à dansguardian et dnsmasq
         -download)
 ,8 → 120,8
                 else
                         transfert
                         install
-                        chown -R dansguardian:apache $DIR_DANSGUARDIAN
-                        chmod -R g+w $DIR_DANSGUARDIAN
+                        chown -R dansguardian:apache $DIR_DG
+                        chmod -R g+w $DIR_DG
                         DATE=`date '+%d %B %Y - %Hh%M'`
                         echo "Univ-tlse du $DATE " > /var/www/html/VERSION-BL
                         rm -rf /tmp/con_ok.html
 ,19 → 131,19
         # regénération suite à modification (choix catégories ou BL secondaire)
         -reload)
                 # pour Dansguardian
-                chown -R dansguardian:apache $DIR_DANSGUARDIAN/blacklists/ossi
-                chmod -R g+w $DIR_DANSGUARDIAN/blacklists/ossi
+                chown -R dansguardian:apache $DIR_DG_BL/ossi
+                chmod -R g+w $DIR_DG_BL/ossi
                 cat_choice
                 service dansguardian restart
                 # pour dnsmasq (noms de domaine réhabilités)
-                if [ `wc -w $DIR_DANSGUARDIAN/exceptionsitelist|cut -d " " -f1` != "0" ]
+                if [ `wc -w $DIR_DG/exceptionsitelist|cut -d " " -f1` != "0" ]
                 then
-                        for i in `cat $DIR_DANSGUARDIAN/exceptionsitelist`
+                        for i in `cat $DIR_DG/exceptionsitelist`
                         do
                                 $SED "/$i/d" $DIR_DNS_FILTER_AVAILABLE/*
                         done
                 fi
-                cp -f $DIR_DANSGUARDIAN/blacklists/ossi/domains $DIR_DNS_FILTER_AVAILABLE/ossi.conf
+                cp -f $DIR_DG_BL/ossi/domains $DIR_DNS_FILTER_AVAILABLE/ossi.conf
                 $SED "s?.*?address=/&/$IP_RETOUR?g" $DIR_DNS_FILTER_AVAILABLE/ossi.conf
                 service dnsmasq restart
 ;;

 /scripts/alcasar-watchdog.sh
 ,7 → 14,9
 INTIF="eth1"
 PRIVATE_IP="192.168.182.1"
 tmp_file="/tmp/watchdog.txt"
-Network_Pb_Page="/var/www/html/redirect/index-network-pb.php"
+DIR_WEB="/var/www/html"
+Network_Pb_Page="$DIR_WEB/index-network-pb.php"
+Network_Deny_Page="$DIR_WEB/index-access-deny.php"
 IFS=$'\n'
 # Fonction appelée si un Pb de connectivité Internet
 ,7 → 40,7
         net_pb=`cat /etc/dnsmasq.d/alcasar-dnsmasq.conf|grep "address=/#/"|wc -l`
         if [ $net_pb != "1" ]
                 then
-                ln -sf /var/www/html/redirect/index-network-pb.php /var/www/html/redirect/index.php
+                ln -sf $Network_Pb_Page $DIR_WEB/index.php
                 /bin/sed -i "s?^conf-dir=.*?address=\/#\/$PRIVATE_IP?g" /etc/dnsmasq.d/alcasar-dnsmasq.conf
                 /etc/init.d/dnsmasq restart
         fi
 ,7 → 74,7
         net_pb=`cat /etc/dnsmasq.d/alcasar-dnsmasq.conf|grep "address=/#/"|wc -l`
         if [ $net_pb -eq "1" ]
                 then
-                ln -sf /var/www/html/redirect/index-access-deny.php /var/www/html/redirect/index.php
+                ln -sf $Network_Deny_Page $DIR_WEB/index.php
                 /bin/sed -i "s?^address=\/#\/.*?conf-dir=/usr/local/etc/alcasar-dnsfilter-enabled?g" /etc/dnsmasq.d/alcasar-dnsmasq.conf
                 /etc/init.d/dnsmasq restart
         fi

Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 315 → Rev 316