From e5f0182aadd3dcf041de59b3b9e34d4fb0399692 Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <Nicolas.Dandrimont@crans.org>
Date: Tue, 15 Feb 2011 11:38:14 +0100
Subject: [PATCH] [bcfg2] Configuration du service de statistiques web

darcs-hash:20110215103814-ffbb2-ad4a8af5092c1b486235c0dcb6a30b7a44df7991.gz
---
 Bundler/bcfg2.xml         |  1 +
 Python/etc/bcfg2-web.conf | 12 ++++++++++++
 Python/etc/bcfg2.conf     |  7 ++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 Python/etc/bcfg2-web.conf

diff --git a/Bundler/bcfg2.xml b/Bundler/bcfg2.xml
index 51bd5fa..57392d0 100644
--- a/Bundler/bcfg2.xml
+++ b/Bundler/bcfg2.xml
@@ -3,6 +3,7 @@
   <ConfigFile name="/etc/default/bcfg2"/>
   <Package name="bcfg2"/>
   <Group name="bcfg2-server">
+    <ConfigFile name="/etc/bcfg2-web.conf"/>
     <Package name="bcfg2-server"/>
     <Service name="bcfg2-server"/>
     <!-- Mise a jour des statistiques bcfg2 et envoi du mail -->
diff --git a/Python/etc/bcfg2-web.conf b/Python/etc/bcfg2-web.conf
new file mode 100644
index 0000000..5215a84
--- /dev/null
+++ b/Python/etc/bcfg2-web.conf
@@ -0,0 +1,12 @@
+# -*- coding: utf-8; mode: python -*-
+
+header("Fichier de configuration de bcfg2, version web")
+
+@[server]
+%repository = "/var/lib/bcfg2"
+%plugins = "Metadata,Bundler,Base,SSHbase,Cfg,Rules,Python,DebAutoPkg,Probes,DBStats"
+%svn = "no"
+@
+@[statistics]
+%sendmailpath = "/usr/sbin/sendmail"
+%database_engine = "sqlite3"
diff --git a/Python/etc/bcfg2.conf b/Python/etc/bcfg2.conf
index 3605ce0..b52fe96 100644
--- a/Python/etc/bcfg2.conf
+++ b/Python/etc/bcfg2.conf
@@ -7,12 +7,16 @@ header("Fichier de configuration de bcfg2")
 if has("bcfg2-server"):
     @[server]
     %repository = "/var/lib/bcfg2"
-    %plugins = "Metadata,Bundler,Base,SSHbase,Cfg,Rules,Python,DebAutoPkg,Probes,Statistics"
+    %plugins = "Metadata,Bundler,Base,SSHbase,Cfg,Rules,Python,DebAutoPkg,Probes,DBStats"
     %svn = "no"
 
+@
 @[statistics]
 %sendmailpath = "/usr/sbin/sendmail"
+if has("bcfg2-server"):
+    %database_engine = "sqlite3"
 
+@
 @[communication]
 %protocol = "xmlrpc/ssl"
 %password = secrets.bcfg2_password
@@ -26,6 +30,7 @@ else:
 %agent-port = 6790
 %encoding = "UTF-8"
 
+@
 @[components]
 %bcfg2 = "https://bcfg2.adm.crans.org:6789"
 %encoding = "UTF-8"