Changeset 2963

Timestamp:

06/03/11 14:43:09 (2 years ago)

Author:

xals

Message:

Merge changesets 2959, 2960, 2961, 2962.

Location:

alternc/branches/stable-1.0

Files:

• . (modified) (1 prop)
• bureau/admin/index.php (modified) (1 diff)
• bureau/class/config.php (modified) (2 diffs)
• etc/alternc/functions_hosting (modified) (1 prop)
• etc/alternc/templates/apache2/url.conf (modified) (1 prop)
• etc/alternc/templates/apache2/vhost.conf (modified) (1 prop)
• src/alternc_reload (modified) (4 diffs)
• src/functions_dns.sh (modified) (1 prop)
• src/functions_hosting.sh (modified) (1 prop)

alternc/branches/stable-1.0/bureau/admin/index.php

@@ -73 +73 @@
 <form action="login.php" method="post" target="_top">
 <table border="0" style="border: 1px solid #202020;" cellspacing="0" cellpadding="3" width="300px" >
-<tr><th colspan="2" align="center">Accès AlternC</th></tr>
+<tr><th colspan="2" align="center"><?php __("AlternC access"); ?></th></tr>
 <tr><th align="right"><label for="username"><?php echo _("Username"); ?></label></th><td><input type="text" class="int" name="username" id="username" value="" maxlength="128" size="15" /></td></tr>
 <tr><th align="right"><label for="password"><?php echo _("Password"); ?></label></th><td><input type="password" class="int" name="password" id="password" value="" maxlength="128" size="15" /></td></tr>

alternc/branches/stable-1.0/bureau/class/config.php

@@ -71 +71 @@
         exit();
     }
- }
+}
 if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
   // Gruiiik
@@ -81 +81 @@
 $help_baseurl="http://www.aide-alternc.org/";
 
-/* PHPLIB inclusions : */
-$root="/var/alternc/bureau/";
 /* Server Domain Name */
 $host=getenv("HTTP_HOST");
 
 /* Global variables (AlternC configuration) */
-require_once($root."class/local.php");
+require_once(dirname(__FILE__)."/local.php");
+/* PHPLIB inclusions : */
+$root=$L_ALTERNC_LOC."/bureau/";
 
 require_once($root."class/db_mysql.php");

alternc/branches/stable-1.0/src/alternc_reload

@@ -40 +40 @@
 
 DOMAIN_LOG_FILE="/var/log/alternc/update_domains.log"
+exec >>"$DOMAIN_LOG_FILE" 2>&1
 
 if [ `whoami` = 'root' ]; then
@@ -49 +50 @@
 apache_reload() {
   if [ -x /usr/sbin/apache2ctl ]; then
-    $sudo /usr/sbin/apache2ctl graceful > /dev/null || echo "Cannot restart apache" >> "$DOMAIN_LOG_FILE"
+    $sudo /usr/sbin/apache2ctl graceful || echo "Cannot restart apache"  
   fi
 }
@@ -59 +60 @@
     case $zone in
       "all")
-        $sudo rndc reload > /dev/null || echo "Cannot reload bind" >> "$DOMAIN_LOG_FILE"
+        $sudo rndc reload  || echo "Cannot reload bind" 
         apache_reload # keep for compatibility
         ;;
@@ -66 +67 @@
         ;;
       *)
-        $sudo rndc reload "$zone" > /dev/null || echo "Cannot reload bind for zone $zone" >> "$DOMAIN_LOG_FILE"
+        $sudo rndc reload "$zone"  || echo "Cannot reload bind for zone $zone" 
         ;;
     esac