From dd070fd43e0756d604a67be1c628b72c4264f015 Mon Sep 17 00:00:00 2001
From: Steven Mondji-Lerider <squidly@nnx.com>
Date: Mon, 18 Feb 2013 17:22:28 +0000
Subject: [PATCH] Template for apache_logformat.conf

---
 .gitattributes                                            | 2 +-
 etc/alternc/{ => templates/alternc}/apache_logformat.conf | 2 +-
 install/alternc.install                                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename etc/alternc/{ => templates/alternc}/apache_logformat.conf (79%)

diff --git a/.gitattributes b/.gitattributes
index 2b46a6cb..af149bd4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -453,11 +453,11 @@ debian/rules -text
 etc/alternc/alternc-sudoers -text
 etc/alternc/alternc.ini -text
 etc/alternc/apache2-ssl.conf -text
-etc/alternc/apache_logformat.conf -text
 etc/alternc/dbusers.cnf.sample -text
 etc/alternc/functions_hosting/hosting_massvhost.sh -text
 etc/alternc/phpmyadmin.inc.php -text
 etc/alternc/templates/alternc/apache2.conf -text
+etc/alternc/templates/alternc/apache_logformat.conf -text
 etc/alternc/templates/alternc/bureau.conf -text
 etc/alternc/templates/apache2/panel.conf -text
 etc/alternc/templates/apache2/url.conf -text
diff --git a/etc/alternc/apache_logformat.conf b/etc/alternc/templates/alternc/apache_logformat.conf
similarity index 79%
rename from etc/alternc/apache_logformat.conf
rename to etc/alternc/templates/alternc/apache_logformat.conf
index aeabd0cd..718a6676 100644
--- a/etc/alternc/apache_logformat.conf
+++ b/etc/alternc/templates/alternc/apache_logformat.conf
@@ -1,5 +1,5 @@
 LogFormat "%{LOGIN}e %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc
-CustomLog "|| /usr/sbin/vlogger -u alterncpanel -g alterncpanel -s access.log -t \"access-%Y%m%d.log\" /var/alternc/logs" alternc
+CustomLog "|| /usr/sbin/vlogger -u alterncpanel -g alterncpanel -s access.log -t \"access-%Y%m%d.log\" %%ALTERNC_LOGS%%" alternc
 
 #Uncomment the following line to active Buffered Logs (Default: Off)
 #BufferedLogs On
diff --git a/install/alternc.install b/install/alternc.install
index 9e000271..be225eaf 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -64,7 +64,7 @@ TEMPLATE_DIR="/etc/alternc/templates"
 
 # Find needed configuration files (without the initial '/')
 # replace this one unconditionnally
-CONFIG_FILES="etc/alternc/bureau.conf etc/incron.d/alternc etc/alternc/apache2.conf"
+CONFIG_FILES="etc/alternc/bureau.conf etc/incron.d/alternc etc/alternc/apache2.conf etc/alternc/apache_logformat.conf"
 
 if [ -e /etc/bind/named.conf ]; then
     CONFIG_FILES="$CONFIG_FILES etc/bind/templates/zone.template