From f2a2bd15fd7629dbbac442177f6dc795037013f2 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Wed, 2 Mar 2016 14:21:05 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20des=20probl=C3=A8mes=20iptables=20?=
 =?UTF-8?q?sur=20eolebase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dicos/50_gogs.xml      | 17 +++++++++++++----
 tmpl/51-gogs-nat_rules |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/dicos/50_gogs.xml b/dicos/50_gogs.xml
index 8cc3cdf..9f1d406 100644
--- a/dicos/50_gogs.xml
+++ b/dicos/50_gogs.xml
@@ -57,6 +57,7 @@
           <variable name='git_domain' type='string' description='Domaine git ... fixme ...' mode='expert'>
             <value>localhost</value>
           </variable>
+		  <variable name='gogs_nginx' type='oui/non' hidden='True'/>
         </family>
     </variables>
     <constraints>
@@ -68,16 +69,24 @@
             <param>non</param>
             <target type='filelist'>gogs</target>
             <target type='filelist'>gogs-nginx</target>
-            <target type='servicelist'>gogs</target> 
-            <target type='family'>forge</target> 
+            <target type='servicelist'>gogs</target>
+            <target type='family'>forge</target>
             <target type='service_accesslist'>gogs_ssh</target>
         </condition>
-        <condition name='disabled_if_in' source='activer_revprox' fallback='True'>
+        <fill name='calc_multi_condition' target='gogs_nginx'>
+            <param>oui</param>
+            <param name="operator">OR</param>
+            <param type="eole" name="condition_1" optional="True">activer_revprox</param>
+            <param name="condition_2">non</param>
+            <param name='match'>oui</param>
+            <param name='mismatch'>non</param>
+        </fill>
+        <condition name='disabled_if_in' source='gogs_nginx'>
           <param>non</param>
           <target type='filelist'>gogs-nginx</target>
           <target type='service_accesslist'>gogs_with_nginx</target>
         </condition>
-        <condition name='disabled_if_in' source='activer_revprox' fallback='True'>
+        <condition name='disabled_if_in' source='gogs_nginx'>
           <param>oui</param>
           <target type='service_accesslist'>gogs_without_nginx</target>
         </condition>
diff --git a/tmpl/51-gogs-nat_rules b/tmpl/51-gogs-nat_rules
index 91557fa..4b3ff01 100644
--- a/tmpl/51-gogs-nat_rules
+++ b/tmpl/51-gogs-nat_rules
@@ -3,7 +3,7 @@
 #
 # Rules for SSH git clone
 #
-/sbin/iptables -A eth0-cont -d 192.0.2.101/32 -p tcp -m tcp --dport 22 --tcp-flags FIN,SYN,RST,ACK SYN -j ACCEPT
 %if %%getVar('mode_conteneur_actif','non') == 'oui'
+/sbin/iptables -A eth0-cont -d %%adresse_ip_forge/32 -p tcp -m tcp --dport 22 --tcp-flags FIN,SYN,RST,ACK SYN -j ACCEPT
 /sbin/iptables -t nat -A PREROUTING -i eth0 -s 0/0 -p tcp --syn --dport %%git_ssh_port -j DNAT --to-destination %%container_ip_forge:22
 %end if