[Fusionforge-commits] r10039 - in trunk/gforge: etc/httpd.conf.d etc/httpd.conf.d-fhs etc/httpd.conf.d-opt etc/httpd.conf.d-usrlocal utils

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Jun 16 17:24:30 CEST 2010


Author: lolando
Date: 2010-06-16 17:24:30 +0200 (Wed, 16 Jun 2010)
New Revision: 10039

Modified:
   trunk/gforge/etc/httpd.conf.d-fhs/log.inc
   trunk/gforge/etc/httpd.conf.d-opt/log.inc
   trunk/gforge/etc/httpd.conf.d-usrlocal/log.inc
   trunk/gforge/etc/httpd.conf.d/log.inc
   trunk/gforge/utils/manage-apache-config.sh
Log:
Use core/log_path for logging directory

Modified: trunk/gforge/etc/httpd.conf.d/log.inc
===================================================================
--- trunk/gforge/etc/httpd.conf.d/log.inc	2010-06-16 15:24:01 UTC (rev 10038)
+++ trunk/gforge/etc/httpd.conf.d/log.inc	2010-06-16 15:24:30 UTC (rev 10039)
@@ -1,6 +1,6 @@
 # Custom logging
 
-LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
-CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
+LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
+CustomLog {core/log_path}/access.log fusionforge
 LogFormat "%{Host}i %h %l %u %t %{SSL_PROTOCOL}x:%{SSL_CIPHER}x \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combinedvhssl
-CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/awstats.log" combinedvhssl
+CustomLog {core/log_path}/awstats.log combinedvhssl

Modified: trunk/gforge/etc/httpd.conf.d-fhs/log.inc
===================================================================
--- trunk/gforge/etc/httpd.conf.d-fhs/log.inc	2010-06-16 15:24:01 UTC (rev 10038)
+++ trunk/gforge/etc/httpd.conf.d-fhs/log.inc	2010-06-16 15:24:30 UTC (rev 10039)
@@ -1,6 +1,6 @@
 # Custom logging
 
-LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
-CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
+LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
+CustomLog /var/log/gforge/access.log fusionforge
 LogFormat "%{Host}i %h %l %u %t %{SSL_PROTOCOL}x:%{SSL_CIPHER}x \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combinedvhssl
-CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/awstats.log" combinedvhssl
+CustomLog /var/log/gforge/awstats.log combinedvhssl

Modified: trunk/gforge/etc/httpd.conf.d-opt/log.inc
===================================================================
--- trunk/gforge/etc/httpd.conf.d-opt/log.inc	2010-06-16 15:24:01 UTC (rev 10038)
+++ trunk/gforge/etc/httpd.conf.d-opt/log.inc	2010-06-16 15:24:30 UTC (rev 10039)
@@ -1,6 +1,6 @@
 # Custom logging
 
-LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
-CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
+LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
+CustomLog /opt/fusionforge/log/access.log fusionforge
 LogFormat "%{Host}i %h %l %u %t %{SSL_PROTOCOL}x:%{SSL_CIPHER}x \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combinedvhssl
-CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/awstats.log" combinedvhssl
+CustomLog /opt/fusionforge/log/awstats.log combinedvhssl

Modified: trunk/gforge/etc/httpd.conf.d-usrlocal/log.inc
===================================================================
--- trunk/gforge/etc/httpd.conf.d-usrlocal/log.inc	2010-06-16 15:24:01 UTC (rev 10038)
+++ trunk/gforge/etc/httpd.conf.d-usrlocal/log.inc	2010-06-16 15:24:30 UTC (rev 10039)
@@ -1,6 +1,6 @@
 # Custom logging
 
-LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
-CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
+LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
+CustomLog /var/log/gforge/access.log fusionforge
 LogFormat "%{Host}i %h %l %u %t %{SSL_PROTOCOL}x:%{SSL_CIPHER}x \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combinedvhssl
-CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/awstats.log" combinedvhssl
+CustomLog /var/log/gforge/awstats.log combinedvhssl

Modified: trunk/gforge/utils/manage-apache-config.sh
===================================================================
--- trunk/gforge/utils/manage-apache-config.sh	2010-06-16 15:24:01 UTC (rev 10038)
+++ trunk/gforge/utils/manage-apache-config.sh	2010-06-16 15:24:30 UTC (rev 10039)
@@ -16,6 +16,7 @@
     sed -e 's,{core/config_path},/etc/gforge,g' \
 	-e 's,{core/source_path},/usr/share/gforge,g' \
 	-e 's,{core/data_path},/var/lib/gforge,g' \
+	-e 's,{core/log_path},/var/log/gforge,g' \
 	-e 's,{core/chroot},/var/lib/gforge/chroot,g' \
 	-e 's,{core/custom_path},/etc/gforge/custom,g' \
 	-e 's,{core/url_prefix},/,g' \
@@ -29,6 +30,7 @@
     sed -e 's,{core/config_path},/opt/fusionforge/etc,g' \
 	-e 's,{core/source_path},/opt/fusionforge,g' \
 	-e 's,{core/data_path},/opt/fusionforge/data,g' \
+	-e 's,{core/log_path},/opt/fusionforge/log,g' \
 	-e 's,{core/chroot},/opt/fusionforge/data/chroot,g' \
 	-e 's,{core/custom_path},/opt/fusionforge/etc/custom,g' \
 	-e 's,{core/url_prefix},/,g' \
@@ -42,6 +44,7 @@
     sed -e 's,{core/config_path},/etc/gforge,g' \
 	-e 's,{core/source_path},/usr/local/share/gforge,g' \
 	-e 's,{core/data_path},/var/local/lib/gforge,g' \
+	-e 's,{core/log_path},/var/log/gforge,g' \
 	-e 's,{core/chroot},/var/local/lib/gforge/chroot,g' \
 	-e 's,{core/custom_path},/etc/gforge/custom,g' \
 	-e 's,{core/url_prefix},/,g' \




More information about the Fusionforge-commits mailing list