From a643b0aa96df1c0d6123289a38e9b9aede9feeda Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Mon, 1 Sep 2014 00:43:45 +0200
Subject: [PATCH] portail captif sur odlyd

---
 Bundler/gunicorn.xml      |  3 +++
 Metadata/groups.xml       | 11 ++++++-----
 Python/etc/monit/services |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Bundler/gunicorn.xml b/Bundler/gunicorn.xml
index ed327f9..524a09b 100644
--- a/Bundler/gunicorn.xml
+++ b/Bundler/gunicorn.xml
@@ -1,4 +1,7 @@
 <Bundle name="gunicorn">
   <Package name="gunicorn"/>
   <Path name="/etc/logrotate.d/gunicorn"/>
+  <Group name="portail-captif">
+     <Path name="/etc/gunicorn.d/portail_captif"/>
+  </Group>
 </Bundle>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 87b4620..7d012de 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -6,17 +6,16 @@
 
   <Group name="komaz"
      profile="true">
-    <Group name="crans-wheezy"/>
-    <Group name="router-wifi"/>
-    <Group name="firewall"/>
+     <Group name="crans-wheezy"/>
+    <!--<Group name="router-wifi"/>
     <Group name="comptage-upload"/>
     <Group name="connection-main"/>
     <Group name="firmware-bnx2"/>
     <Group name="ident-daemon"/>
     <Group name="vlan-ens"/>
     <Group name="vlan-wifi"/>
-    <Group name="nginx"/> <!-- Proxy web et pages déco -->
-    <Group name="connexion-secours"/>
+    <Group name="connexion-secours"/>-->
+    <!--<Group name="nginx"/> --><!-- Proxy web et pages déco -->
   </Group>
 
   <Group name="odlyd"
@@ -24,6 +23,8 @@
     <Group name="crans-wheezy"/>
     <Group name="ident-daemon"/>
     <Group name="connection-main"/>
+    <Group name="firewall"/>
+    <Group name="portail-captif"/>
   </Group>
 
 
diff --git a/Python/etc/monit/services b/Python/etc/monit/services
index 259cf69..239a8d5 100644
--- a/Python/etc/monit/services
+++ b/Python/etc/monit/services
@@ -145,7 +145,7 @@ service("dhcp-detect")
 
 service("radvd", pidf='radvd/radvd')
 
-if has("komaz"):
+if False: #has("komaz"):
     service(None,
             name="filtrage_firewall")
 service('netacct-crans',