Changeset 2858


Ignore:
Timestamp:
03/06/11 20:11:49 (2 years ago)
Author:
fufroma
Message:

Correction de bugs
Correction d'identations

Location:
alternc/trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • alternc/trunk/bureau/admin/adm_deactivate.php

    r2680 r2858  
    115115 
    116116# 2.1 keep a copy of where it was, in an SQL request 
    117           $backup .= "UPDATE `sub_domaines` SET `type`='$type', valeur='$dest' WHERE `domaine`='$domain' AND sub='$sub';\n"; 
    118           $backup .= "DELETE FROM `sub_domaines_standby` WHERE domaine='$domain' and sub='$sub';\n"; 
    119           $backup .= "INSERT INTO sub_domaines_standby (compte,domaine,sub,valeur,type,action) values ('$cuid','$domain','$sub','$dest','$type',1);\n"; // UPDATE 
     117          $backup .= "UPDATE `sub_domaines` SET `type`='$type', valeur='$dest',web_action='UPDATE' WHERE `domaine`='$domain' AND sub='$sub';\n"; 
    120118           
    121119# 2.2 change the subdomain to redirect to http://spam.koumbit.org/ 

  • alternc/trunk/etc/alternc/apache2.conf

    r2855 r2858  
    1212</Directory> 
    1313 
    14 <Directory /var/alternc> 
    15         Order allow,deny 
    16         Allow from none 
     14<Directory /> 
     15  Options FollowSymLinks 
     16  AllowOverride None 
    1717</Directory> 
     18 
     19<Directory /var/alternc/bureau> 
     20  Order allow,deny 
     21  Allow from all 
     22 
     23  php_admin_flag safe_mode_gid off 
     24  php_admin_flag safe_mode off 
     25  php_admin_flag register_globals on 
     26  AddDefaultCharset ISO-8859-1 
     27  php_admin_value open_basedir /etc/alternc/:/var/run/alternc/:/var/alternc/bureau/:/var/alternc/html/:/var/alternc/tmp:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/ 
     28</Directory> 
     29 
    1830 
    1931<Directory /var/alternc/html> 
    … …  
    3446 
    3547<Directory /usr/share/phpmyadmin> 
    36         AllowOverride AuthConfig Options FileInfo Limit Indexes 
    37         Options Indexes Includes FollowSymLinks MultiViews 
    38         Order allow,deny 
    39         Allow from all 
     48  AllowOverride AuthConfig Options FileInfo Limit Indexes 
     49  Options Indexes Includes FollowSymLinks MultiViews 
     50  Order allow,deny 
     51  Allow from all 
    4052</Directory> 
    4153 

  • alternc/trunk/etc/alternc/templates/apache2/panel.conf

    r2855 r2858  
    11<VirtualHost *:80> 
    2         DocumentRoot /var/alternc/bureau 
    3         ServerName %%fqdn%% 
    4          
    5         alias /admin/sql        /usr/share/phpmyadmin 
    6         alias /webmail          /usr/share/squirrelmail 
    7          
    8         <Directory /> 
    9                 Options FollowSymLinks 
    10                 AllowOverride None 
    11         </Directory> 
    12         <Directory /var/alternc/bureau> 
    13     Order allow,deny 
    14     Allow from all 
    15  
    16                 php_admin_flag safe_mode_gid off 
    17                 php_admin_flag safe_mode off 
    18                     php_admin_flag register_globals on 
    19                 AddDefaultCharset ISO-8859-1 
    20                 php_admin_value open_basedir /etc/alternc/:/var/run/alternc/:/var/alternc/bureau/:/var/alternc/html/:/var/alternc/tmp:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/ 
    21         </Directory> 
    22  
    23         LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc 
     2  DocumentRoot /var/alternc/bureau 
     3  ServerName %%fqdn%% 
     4   
     5  alias /admin/sql        /usr/share/phpmyadmin 
     6  alias /webmail          /usr/share/squirrelmail 
     7   
     8  LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc 
    249  CustomLog /var/log/apache2/access.log alternc 
    2510</VirtualHost> 

  • alternc/trunk/etc/alternc/templates/apache2/url.conf

    r2857 r2858  
    77  RewriteRule ^/(.*)$ %%redirect%%/$1 [R=301,L]  
    88 
    9         LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc 
     9  LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc 
    1010  CustomLog /var/log/apache2/access.log alternc 
    1111</Virtualhost> 

  • alternc/trunk/etc/alternc/templates/apache2/vhost.conf

    r2855 r2858  
    77  </Directory> 
    88 
    9         LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc 
     9  LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc 
    1010  CustomLog /var/log/apache2/access.log alternc 
    1111</VirtualHost> 

  • alternc/trunk/etc/alternc/templates/apache2/webmail.conf

    r2855 r2858  
    1010  </Directory> 
    1111 
    12         LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc 
     12  LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc 
    1313  CustomLog /var/log/apache2/access.log alternc 
    1414</VirtualHost> 

  • alternc/trunk/src/functions_hosting.sh

    r2833 r2858  
    163163 
    164164host_delete() { 
    165     local FQDN=$1 
     165    local VTYPE=$1 
     166    local FQDN=$2 
    166167    # Execute post-install hooks 
    167168    launch_hooks "delete" "$1" "$2" "$3" "$4" 

  • alternc/trunk/tools/get_account_by_domain

    r2613 r2858  
    7777! [ -f "$ALTERNC_CONF_FILE" ] && { echo $MISSING_CONF_FILE ; exit 1 ; } || . $ALTERNC_CONF_FILE 
    7878mysql="$mysql --defaults-file=/etc/alternc/my.cnf" 
    79 $mysql -e "select count(*) from domaines_standby;" > /dev/null 2>&1 
     79$mysql -e "desc domaines;" > /dev/null 2>&1 
    8080[ "$?" != 0 ] && { echo "$MYSQL_UNREACHABLE_DATABASE" ; exit 1 ; } 
    8181 

  • alternc/trunk/tools/get_domains_by_account

    r2613 r2858  
    7676# Must have access to mysql to retreive accounts owning domains : 
    7777mysql="$mysql --defaults-file=/etc/alternc/my.cnf -B -N -e" 
    78 $mysql "select count(*) from domaines_standby;" > /dev/null 2>&1 
     78$mysql "desc domaines;" > /dev/null 2>&1 
    7979[ "$?" != 0 ] && { echo "$MYSQL_UNREACHABLE_DATABASE" ; exit 1 ; } 
    8080 

  • alternc/trunk/tools/top_http_users

    r2613 r2858  
    170170# Must have access to mysql to retreive accounts owning domains : 
    171171mysql="$mysql --defaults-file=/etc/alternc/my.cnf -B -N -e" 
    172 $mysql "select count(*) from domaines_standby;" > /dev/null 2>&1 
     172$mysql "desc domaines;" > /dev/null 2>&1 
    173173[ "$?" != 0 ] && { echo "$MYSQL_UNREACHABLE_DATABASE" ; exit 1 ; } 
    174174# Prevents executing more than one shell at the same time 
Note: See TracChangeset for help on using the changeset viewer.