[vhffs-dev] [827] <panel>stats_url moved to <web> and to <repository>, however they are not used yet

[subversion@xxxxxxxxx]

Revision: 827
Author:   gradator
Date:     2007-08-30 13:26:56 +0000 (Thu, 30 Aug 2007)

Log Message:
-----------
<panel>stats_url moved to <web> and to <repository>, however they are not used yet

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Conf.pm
    trunk/vhffs-backend/conf/vhffs.conf.dist.in
    trunk/vhffs-tests/conf/vhffs.conf


Modified: trunk/vhffs-api/src/Vhffs/Conf.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 05:26:02 UTC (rev 826)
+++ trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 13:26:56 UTC (rev 827)
@@ -515,19 +515,6 @@
 }
 
 
-sub get_panel_statsurl
-{
-	if( $Config{"global"}{"panel"}{stats_url} )
-	{
-		return $Config{"global"}{"panel"}{stats_url};	
-	}
-	else
-	{
-		return undef;
-	}
-}
-
-
 sub get_panel_helpurl
 {
 	if( $Config{"global"}{"panel"}{help_url} )

Modified: trunk/vhffs-backend/conf/vhffs.conf.dist.in
===================================================================
--- trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 05:26:02 UTC (rev 826)
+++ trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 13:26:56 UTC (rev 827)
@@ -64,18 +64,15 @@
 	####################
 	#Panel configuration
 	<panel>
-		#URL to the panel
+		#URL of the panel
 		url			=	http://your.panel.url
 
-		# Obfuscation technique for emails (none, simple, entities or javascript)
+		#Obfuscation technique for emails (none, simple, entities or javascript)
 		mail_obfuscation	=	simple
 
 		#This is the URL display for the "Help" link in the panel
 		help_url		=	http://help.hoster
 
-		#URL to the statistics
-		stats_url		=	http://stats.hoster
-
 		phpmyadmin_url		=	http://phpmyadmin.hoster
 		phppgadmin_url		=	http://phppgadmin.hoster
 
@@ -181,8 +178,6 @@
 
 		# Where to put parsed logfile from each website, it uses the same hash model of web storage,
 		# consider using the same tree for both so user have access to its logs in its ftp account.
-		# If log_parsed_root = /data/web and log_parsed_dir = logs then example.com logs
-		# will be in /data/web/1b/df/72/example.com/logs/
 		log_parsed_root		=	/data/web
 
 		# Same as incoming
@@ -193,7 +188,7 @@
 		log_awstats_sample	=	/usr/lib/vhffs/bots/misc/awstats.sample
 
 		# Where to find awstat (caution, you must apply the vhffs patch on)
-		log_awstats		=	/var/www/stats/awstats.pl
+		log_awstats		=	/data/logs/web/awstats.pl
 
 		# Is apache running locally or not ? (If not you should use the ugly remote restart of apaches over nfs)
 		log_apachelocal		=	yes
@@ -203,6 +198,9 @@
 
 		# URL to the documentation (optional)
 		url_doc			=	http://help.myhoster.net/web
+
+		# URL to the statistics
+		url_stats		=	http://stats.hoster
 	</web>
 
 	<mysql>
@@ -303,10 +301,9 @@
 		url_doc		=	http://help.myhoster.net/mail
 	</mail>
 
-	#The mailuser service allow a user to get a mail account on a default domain
-	#With with module, ALL users get an email address for a domain
+	#The mailuser service allows a user to get a mail account on a default domain
 	#The domain MUST exists on VHFFS, and should be owned by the user given in this configuration
-	# groupneeded : the user cannot create his mail account if it doesn't have a group
+	# groupneeded : the user cannot create his mail account if it doesn't have at least one group
 	<mailuser>
 		#use this module or not
 		activate	=	no
@@ -319,8 +316,7 @@
 		url_doc		=	http://help.myhoster.net/mailuser
 	</mailuser>
 
-	#The mailgroup service allow a group to get a mail account on a default domain
-	#With with module, ALL groups get an email address for a domain
+	#The mailgroup service allows a group to get a mail account on a default domain
 	#The domain MUST exists on VHFFS, and should be owned by the user given in this configuration
 	<mailgroup>
 		#use this module or not
@@ -348,13 +344,47 @@
 	#Configuration of download repository
 	<repository>
 		#use this module or not
-		activate	=	no
+		activate		=	no
 
-		repository_url	=	"http://download.vhffs.org/";
-		default_quota	=	1024
+		repository_url		=	"http://download.vhffs.org/";
+		default_quota		=	1024
 
+		# Where to find log from webserver, each webserver should be in a separate directory, example :
+		# - /data/logs/repository/incoming/webserver0
+		# - /data/logs/repository/incoming/webserver1
+		# - ...
+		log_incoming_root	=	/data/logs/repository/incoming
+
+		# The number of maximum rotations, a rotation is made each time the robots to create stats is ran
+		log_incoming_rotations	=	7
+
+		# Should I compress rotated logs ?
+		log_incoming_compress	=	yes
+
+		# Where to put parsed logfile from each repository
+		log_parsed_root		=	/data/logs/repository/parsed
+
+		# Same as incoming
+		log_parsed_rotation	=	7
+		log_parsed_compress	=	yes
+
+		# Where to find the awstat sampe file ?
+		log_awstats_sample	=	/usr/lib/vhffs/bots/misc/repository.awstats.sample
+
+		# Where to find awstat (caution, you must apply the vhffs patch on)
+		log_awstats		=	/data/logs/repository/awstats.pl
+
+		# Is apache running locally or not ? (If not you should use the ugly remote restart of apaches over nfs)
+		log_apachelocal		=	yes
+
+		# If it runs locally, where is apache2ctl ?
+		log_apachectl		=	/usr/sbin/apache2ctl
+
 		# URL to the documentation (optional)
-		url_doc		=	http://help.myhoster.net/repository
+		url_doc			=	http://help.myhoster.net/repository
+
+		# URL to the statistics
+		url_stats		=	http://stats.downloads.hoster
 	</repository>
 
 </services>

Modified: trunk/vhffs-tests/conf/vhffs.conf
===================================================================
--- trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 05:26:02 UTC (rev 826)
+++ trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 13:26:56 UTC (rev 827)
@@ -51,10 +51,6 @@
 		#This is the URL display for the "Help" link in the panel
 		help_url		=	http://help.hoster
 
-		#URL to the statistics
-		stats_url		=	http://stats.hoster
-
-
 		phpmyadmin_url		=	http://phpmyadmin.hoster
 		phppgadmin_url		=	http://phppgadmin.hoster
 
@@ -245,6 +241,8 @@
 
 		repository_url	=	"http://download.vhffs.org/";
 		default_quota	=	1024
+
+		url_stats	=	http://stats.download.vhffs.org
 	</repository>
 </services>