Merge branch 'master' into dist/eole/2.6.2/master

README.md

@@ -1 +1 @@
-Eolisation de Gogs !
+Eolisation de Gitea !

dicos/50_gitea.xml

@@ -48,7 +48,7 @@
 
           <variable name='gitea_web_name' type='string' description='Nom DNS de la forge' mandatory='True'/>
           <variable name='git_root' type='string' description='Repertoire des dépôts git' mandatory='True'>
-            <value>/var/db/gitea/repo</value>
+            <value>/srv/forge/git</value>
           </variable>
           <variable name='gitea_registration' type='oui/non' description="Les utilisateurs peuvent s'enregistrer">
             <value>non</value>

systemd/forge.service

@@ -10,7 +10,7 @@ After=redis.service
 [Service]
 #LimitMEMLOCK=infinity
 #LimitNOFILE=65535
-RestartSec=2s
+RestartSec=4s
 Type=simple
 User=git
 Group=gitservice

tmpl/gitea.conf

@@ -70,7 +70,7 @@ HOST = %%{gitea_dbserver}:%%{gitea_dbport}
 %end if
 NAME = gitea
 USER = gitea 
-PASSWD=gitea1234
+PASSWD   = gitea1234
 ; For "postgres" only, either "disable", "require" or "verify-full"
 SSL_MODE = disable
 ; For "sqlite3" only