From 0839f68e186d171a52658cb722186bb65c565a9a Mon Sep 17 00:00:00 2001
From: William Petit <wpetit@cadoles.com>
Date: Mon, 30 Sep 2019 14:46:15 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Utilisation=20du=20serveur=20SSH=20int?=
 =?UTF-8?q?=C3=A9gr=C3=A9=20=C3=A0=20Gitea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dicos/50_gitea.xml | 2 +-
 tmpl/gitea.conf    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dicos/50_gitea.xml b/dicos/50_gitea.xml
index bf03e4a..01e59b6 100644
--- a/dicos/50_gitea.xml
+++ b/dicos/50_gitea.xml
@@ -22,7 +22,7 @@
               <port service_accesslist="gitea_without_nginx" port_type="SymLinkOption">gitea_http_port</port>
             </service_access>
             <service_access service='gitea_ssh'>
-              <tcpwrapper>sshd</tcpwrapper>
+              <tcpwrapper>gitea</tcpwrapper>
             </service_access>
         </container>
     </containers>
diff --git a/tmpl/gitea.conf b/tmpl/gitea.conf
index a0b931f..60b2401 100644
--- a/tmpl/gitea.conf
+++ b/tmpl/gitea.conf
@@ -30,6 +30,7 @@ HTTP_ADDR =
 HTTP_PORT = %%gitea_http_port
 ; Disable SSH feature when not available
 DISABLE_SSH = false
+START_SSH_SERVER = true
 SSH_PORT = %%gitea_ssh_port
 ; Disable CDN even in "prod" mode
 OFFLINE_MODE = false

From d8bce9cd5151065e0a42562ccfdd2bc4f9d14956 Mon Sep 17 00:00:00 2001
From: William Petit <wpetit@cadoles.com>
Date: Mon, 30 Sep 2019 14:46:51 +0200
Subject: [PATCH 2/2] Suppression commentaires inutiles

---
 dicos/50_gitea.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dicos/50_gitea.xml b/dicos/50_gitea.xml
index 01e59b6..e75482b 100644
--- a/dicos/50_gitea.xml
+++ b/dicos/50_gitea.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <creole>
     <files>
-        <!-- Je suis un commentaire -->
         <file filelist='gitea-nginx' name='/etc/nginx/sites-available/gitea' source='gitea.nginx' mkdir='True' rm='True'/>
         <file filelist='gitea' name='/usr/share/eole/bastion/data/51-gitea-nat_rules' mkdir='True' rm='True' mode='0755'/>
         <file filelist='gitea' name='/etc/eole/eole-db.d/gitea-db.yml' rm='True' mkdir='True'/>
@@ -14,9 +13,7 @@
         <container name='forge' id='101'>
             <package>apt-transport-https</package>
             <package>git-core</package>
-            <!-- FIXME this have to be installed <package>gitea</package> -->
             <file filelist='gitea' name='/etc/gitea/conf/app.ini' source='gitea.conf' mkdir='True' rm='True' mode='770' owner='root' group='gitservice'/>
-            <!-- <service servicelist='xxxx'>nom-du-service-a-lancer-dans-le-conteneur</service> -->
             <service servicelist='gitea'>forge</service>
             <service_access service='gitea_without_nginx'>
               <port service_accesslist="gitea_without_nginx" port_type="SymLinkOption">gitea_http_port</port>