Changeset 447 for branches/stable


Ignore:
Timestamp:
Mar 17, 2006, 10:16:24 AM (14 years ago)
Author:
bcornec
Message:

mindi now supports LABEL for swap partitions (patch from Julien Pinon <julien.pinon_at_linagora.com>)
updated web site conf file for virtual hosting

Location:
branches/stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r441 r447  
    13401340    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
    13411341    redhat_label=""
    1342     if [ "`echo "$current_partition" | fgrep -i "LABEL="`" != "" ] ; then
     1342    if [ "`echo "$current_partition" | fgrep -i "LABEL=SWAP"`" != "" ] ; then
     1343            redhat_label=`echo "$current_partition" | cut -d'=' -f2`
     1344            actual_dev="/dev/`echo "$redhat_label" | cut -d '-' -f2`"
     1345            current_partition=$actual_dev
     1346    elif [ "`echo "$current_partition" | fgrep -i "LABEL="`" != "" ] ; then
    13431347        str_to_find_fmt_with=$current_partition
    13441348        redhat_label=`echo "$current_partition" | cut -d'=' -f2`
  • branches/stable/website/about.shtml

    r396 r447  
    9090      <P ALIGN=CENTER>
    9191       <I>Michael Clark</I><BR>
    92        original DPF docs</P>
     92       original PDF docs</P>
    9393  <div class="h2-5">
    9494          <h2>The Mondo Rescue Community</h2>
  • branches/stable/website/mondorescue.org.conf

    r389 r447  
    22# Apache Virtual Host Configuration File
    33#
    4 NameVirtualHost *:80
     4NameVirtualHost *
    55
    6 <VirtualHost *:80>
     6<VirtualHost *>
    77    ServerName www.mondorescue.org
     8    #ServerAlias mondorescue.org
    89    ServerAdmin webmaster@mondorescue.org
    910    DocumentRoot /mondo/www/html/mondo
    1011    CustomLog /var/log/httpd/www.mondorescue.org/access_log combined
    1112    Errorlog /var/log/httpd/www.mondorescue.org/error_log
     13    RewriteEngine On
     14    RewriteRule     ^/index\.html$  /index.shtml
     15    RewriteRule     ^/$  /index.shtml
    1216    <Directory "/mondo/www/html/mondo">
     17    DirectoryIndex index.shtml
    1318        Options -Indexes MultiViews FollowSymLinks +Includes
    1419        AllowOverride None
     
    1823</VirtualHost>
    1924
    20 <VirtualHost *:80>
     25<VirtualHost *>
     26    ServerName oldwww.mondorescue.org
     27    ServerAdmin webmaster@mondorescue.org
     28    DocumentRoot /mondo/www/html/oldwww
     29    CustomLog /var/log/httpd/oldwww.mondorescue.org/access_log combined
     30    Errorlog /var/log/httpd/oldwww.mondorescue.org/error_log
     31    <Directory "/mondo/www/html/oldwww">
     32        Options -Indexes MultiViews FollowSymLinks +Includes
     33        AllowOverride None
     34        Order allow,deny
     35        Allow from all
     36    </Directory>
     37</VirtualHost>
     38
     39<VirtualHost *>
    2140    ServerName www1.mondorescue.org
    2241    ServerAdmin webmaster@mondorescue.org
     
    3150    </Directory>
    3251</VirtualHost>
     52
     53<VirtualHost *>
     54    ServerName www.mondorescue.com
     55    ServerAdmin webmaster@mondorescue.com
     56    DocumentRoot /mondo/www/html/mondo
     57    CustomLog /var/log/httpd/www.mondorescue.com/access_log combined
     58    Errorlog /var/log/httpd/www.mondorescue.com/error_log
     59    <Directory "/mondo/www/html/mondo">
     60    DirectoryIndex index.shtml
     61        Options -Indexes MultiViews FollowSymLinks +Includes
     62        AllowOverride None
     63        Order allow,deny
     64        Allow from all
     65    </Directory>
     66</VirtualHost>
Note: See TracChangeset for help on using the changeset viewer.