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

Check for version update with script expected version versus installed
version

Makefile

@@ -3,8 +3,8 @@
 ################################
 
 SOURCE=eole-gitea
-VERSION=1.13.2
+VERSION=1.5.2
-EOLE_VERSION=2.7.2
+EOLE_VERSION=2.6.2
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>
 

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,16 @@
+Source: eole-gitea
+Section: web
+Priority: optional
+Maintainer: Cadoles <eole@ac-dijon.fr>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: https://forge.cadoles.com/Cadoles/eole-gitea
+Vcs-Git: https://forge.cadoles.com/Cadoles/eole-gitea.git
+Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-redis
+
+Package: eole-gitea
+Architecture: all
+Depends: ${misc:Depends}, git-core, eole-db, eole-mysql
+Description: Dictionnaires et templates pour la configuration d'un serveur Gitea, testée uniquement avec eolebase
+ .
+ Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles.

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-2
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/eole-gitea.forge.service

@@ -0,0 +1 @@
+../systemd/forge.service

debian/gbp.conf

@@ -0,0 +1,3 @@
+# Set per distribution debian tag
+[DEFAULT]
+debian-tag = debian/eole/%(version)s

debian/rules

@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@
+
+# Force init script name
+override_dh_installinit:
+	dh_installinit --noscripts -peole-redis --name=redis2-server $@
+
+override_dh_systemd_enable:
+	dh_systemd_enable -peole-redis --name=redis2-server
+
+override_dh_systemd_start:
+	dh_systemd_start -peole-server --no-start --no-restart-on-upgrade redis2-server

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

dicos/50_gitea.xml

@@ -10,124 +10,118 @@
         </service_access>
     </files>
     <containers>
-       <container name='forge' id='101'>
+        <container name='forge' id='101'>
-          <package>apt-transport-https</package>
+            <package>apt-transport-https</package>
-          <package>git</package>
+            <package>git-core</package>
-          <file filelist='gitea' name='/etc/gitea/conf/app.ini' source='gitea.conf' mkdir='True' rm='True' mode='770' owner='root' group='gitservice'/>
+            <file filelist='gitea' name='/etc/gitea/conf/app.ini' source='gitea.conf' mkdir='True' rm='True' mode='770' owner='root' group='gitservice'/>
-          <service servicelist='gitea'>forge</service>
+            <service servicelist='gitea'>forge</service>
-          <service_access service='gitea_without_nginx'>
+            <service_access service='gitea_without_nginx'>
-             <port service_accesslist="gitea_without_nginx" port_type="SymLinkOption">gitea_http_port</port>
+              <port service_accesslist="gitea_without_nginx" port_type="SymLinkOption">gitea_http_port</port>
-          </service_access>
+            </service_access>
-          <service_access service='gitea_ssh'>
+            <service_access service='gitea_ssh'>
-             <port service_accesslist="gitea_ssh'" port_type="SymLinkOption">gitea_ssh_port</port>
+              <port service_accesslist="gitea_ssh'" port_type="SymLinkOption">gitea_ssh_port</port>
-          </service_access>
+            </service_access>
-       </container>
+        </container>
     </containers>
     <variables>
-       <family name='services'>
+        <family name='services'>
           <variable name='activer_gitea' type='oui/non' description='Activer la forge Gitea'>
-             <value>non</value>
+                <value>non</value>
-          </variable>
+            </variable>
-       </family>
+        </family>
-       <family name='forge'>
+        <family name='forge'>
           <variable name='gitea_name' type='string' description='Nom de la forge' mandatory='True'>
-             <value>Forge Numérique EOLE</value>
+            <value>Forge Numérique EOLE</value>
           </variable>
           <variable name='gitea_mail' type='oui/non' description="Activer l'envois de courriels">
-             <value>non</value>
+            <value>non</value>
           </variable>
           <variable name='gitea_mail_from' type='string' description="Adresse courriel a l'origine des messages de la forge"/>
-          <variable name='gitea_smtp_srv' type='string' description="Adresse IP ou DNS du serveur SMTP à utiliser"/>
+		      <variable name='gitea_mail_auth' type='oui/non' description="Utiliser un compte pour le serveur smtp">
-          <variable name='gitea_smtp_prt' type='port' description="Port du serveur SMTP à utiliser"/>
+		    	  <value>non</value>
-          <variable name='gitea_mail_auth' type='oui/non' description="Utiliser un compte pour le serveur smtp">
+	    	  </variable>
-             <value>non</value>
+		      <variable name='gitea_email_user' type='string' description="Nom de l'utilisateur SMTP"/>
-          </variable>
+		      <variable name='gitea_email_password' type='string' description="Mot de passe de l'utilisateur"/>
-          <variable name='gitea_email_user' type='string' description="Nom de l'utilisateur SMTP"/>
-          <variable name='gitea_email_password' type='string' description="Mot de passe de l'utilisateur"/>
 
           <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>/srv/forge/git</value>
+            <value>/srv/forge/git</value>
           </variable>
           <variable name='gitea_registration' type='oui/non' description="Les utilisateurs peuvent s'enregistrer">
-             <value>non</value>
+            <value>non</value>
           </variable>
           <variable name='gitea_http_port' type='string' description='Port HTTP pour la forge' mode='expert'>
-             <value>6000</value>
+            <value>6000</value>
           </variable>
           <variable name='gitea_ssh_port' type='string' description='Port SSH pour la forge' mode='expert'>
-             <value>2222</value>
+            <value>2222</value>
           </variable>
           <variable name='gitea_db_file' type='string' description='Fichier de base de données' mode='expert'>
-             <value>/var/db/gitea/gitea.db</value>
+            <value>/var/db/gitea/gitea.db</value>
           </variable>
           <variable name='gitea_domain' type='string' description='Domaine git ... fixme ...' mode='expert'>
-             <value>localhost</value>
+            <value>localhost</value>
           </variable>
-          <variable name='gitea_nginx' type='oui/non' hidden='True'/>
+		      <variable name='gitea_nginx' type='oui/non' hidden='True'/>
           <variable type='string' name='gitea_db_mode' description='Serveur de bases de données à utiliser'/>
-       </family>
+        </family>
-       <family name="BDD Forge" mode="expert">
+        <family name="BDD Forge" mode="expert">
           <variable type='string' name='gitea_dbserver' description='Adresse du serveur de base de données'/>
           <variable type='number' name='gitea_dbport' description="Port d'écoute du serveur de base de données"/>
           <variable type='string' name='gitea_allow_hosts' description="Hôtes authorisés à utiliser la base de données" multi='True'/>
           <variable type='string' name='gitea_dbuser' description='Utilisateur du serveur de base de données'/>
           <variable type='string' name='gitea_dbpass' description='Fichier de mot de passe du serveur'/>
-       </family>
+        </family>
     </variables>
     <constraints>
-       <condition name='hidden_if_in' source='gitea_mail'>
+        <condition name='hidden_if_in' source='gitea_mail'>
-          <param>non</param>
+            <param>non</param>
-          <target type='variable'>gitea_mail_from</target>
+            <target type='variable'>gitea_mail_from</target>
-          <target type='variable'>gitea_smtp_srv</target>
+        </condition>
-          <target type='variable'>gitea_smtp_prt</target>
+        <condition name='disabled_if_in' source='activer_gitea'>
-          <target type='variable'>gitea_email_user</target>
+            <param>non</param>
-          <target type='variable'>gitea_email_password</target>
+            <target type='filelist'>gitea</target>
-       </condition>
+            <target type='filelist'>gitea-nginx</target>
-       <condition name='disabled_if_in' source='activer_gitea'>
+            <target type='servicelist'>gitea</target>
-          <param>non</param>
+            <target type='family'>forge</target>
-          <target type='filelist'>gitea</target>
+            <target type='service_accesslist'>gitea_ssh</target>
-          <target type='filelist'>gitea-nginx</target>
+        </condition>
-          <target type='servicelist'>gitea</target>
+		<condition name='disabled_if_in' source='gitea_mail_auth'>
-          <target type='family'>forge</target>
+			<param>non</param>
-          <target type='service_accesslist'>gitea_ssh</target>
+			<target type='variable'>gitea_email_user</target>
-       </condition>
+			<target type='variable'>gitea_email_password</target>
-       <condition name='disabled_if_in' source='gitea_mail_auth'>
+		</condition>
-          <param>non</param>
+    <fill name='calc_multi_condition' target='gitea_nginx'>
-          <target type='variable'>gitea_email_user</target>
+            <param>oui</param>
-          <target type='variable'>gitea_email_password</target>
+            <param name="operator">OR</param>
-       </condition>
+            <param type="eole" name="condition_1" optional="True">activer_nginx_web</param>
-       <fill name='calc_multi_condition' target='gitea_nginx'>
+            <param name="condition_2">non</param>
-          <param>oui</param>
+            <param name='match'>oui</param>
-          <param name="operator">OR</param>
+            <param name='mismatch'>non</param>
-          <param type="eole" name="condition_1" optional="True">activer_nginx_web</param>
+        </fill>
-          <param name="condition_2">non</param>
-          <param name='match'>oui</param>
-          <param name='mismatch'>non</param>
-       </fill>
 
-
+        
-       <condition name='disabled_if_in' source='gitea_nginx'>
+        <condition name='disabled_if_in' source='gitea_nginx'>
           <param>non</param>
           <target type='filelist'>gitea-nginx</target>
           <target type='service_accesslist'>gitea_with_nginx</target>
-       </condition>
+        </condition>
-       <condition name='disabled_if_in' source='gitea_nginx'>
+        <condition name='disabled_if_in' source='gitea_nginx'>
           <param>oui</param>
           <target type='service_accesslist'>gitea_without_nginx</target>
-       </condition>
+        </condition>
 
-       <check name='valid_enum' target='gitea_db_mode'>
+        <check name='valid_enum' target='gitea_db_mode'>
-          <param>['default', 'externe', 'local']</param>
+            <param>['default', 'externe', 'local']</param>
-       </check>
+        </check>
-       <condition name='disabled_if_in' source='gitea_db_mode'>
+        <condition name='disabled_if_in' source='gitea_db_mode'>
-          <param>local</param>
+            <param>local</param>
-          <target type='family'>BDD Forge</target>
+            <target type='family'>BDD Forge</target>
-       </condition>
+        </condition>
-       <condition name='disabled_if_in' source='gitea_db_mode'>
+        <condition name='disabled_if_in' source='gitea_db_mode'>
-          <param>default</param>
+            <param>default</param>
-          <target type='family'>BDD Forge</target>
+            <target type='family'>BDD Forge</target>
-       </condition>
+        </condition>
     </constraints>
     <help>
         <variable name='activer_gitea'>Activer la forge Gitea, Gitea est une forge basée sur Git clone de github (fork de gogs)</variable>

pretemplate/01-gitea-init

@@ -16,7 +16,7 @@ HOMEDIR="${WKDIR}/${USER}"
 OS="linux"
 ARCH="amd64"
 
-APPVERSION="1.16.8"
+APPVERSION="1.8.3"
 APPNAME="gitea"
 APPBINARY="gitea"
 APPSIG="7C9E68152594688862D62AF62D9AE806EC1592E2"
@@ -132,4 +132,4 @@ function main {
    
 }
 
-main
+main

tmpl/gitea.conf

@@ -60,12 +60,12 @@ DB_TYPE = mysql
 %set %%dbMode = %%getVar("gitea_db_mode")
 %if %%dbMode == "default"
    %if %%edb_local == "oui"
-HOST = /var/run/mysqld/mysqld.sock
+HOST = 127.0.0.1:3306
    %else
 HOST = %%{edb_host}:%%{edb_port}
    %end if
 %elif %%dbMode == "local"
-HOST = /var/run/mysqld/mysqld.sock
+HOST = 127.0.0.1:3306
 %elif %%dbMode == "externe"
 HOST = %%{gitea_dbserver}:%%{gitea_dbport}
 %end if
@@ -137,7 +137,11 @@ SUBJECT = %(APP_NAME)s
 ; Gmail: smtp.gmail.com:587
 ; QQ: smtp.qq.com:25
 ; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used.
-HOST = %%gitea_smtp_srv:%%gitea_srv_prt
+   %if %%getVar('activer_exim_relay_smtp','non') == 'oui'
+HOST = %%exim_relay_smtp:25
+   %else
+HOST = 127.0.0.1
+   %end if
 ; Do not verify the certificate of the server. Only use this for self-signed certificates
 SKIP_VERIFY = true
 ; Use client certificate
@@ -236,17 +240,13 @@ AVATAR_UPLOAD_PATH = data/avatars
 GRAVATAR_SOURCE = gravatar
 DISABLE_GRAVATAR = false
 
-[repository.upload]
-ALLOWED_TYPES = application/zip|application/gzip|application/x-gzip|application/x-gtar|application/x-tgz|application/x-compressed-tar|text/plain
-
 [attachment]
 ; Whether attachments are enabled. Defaults to `true`
 ENABLE = true
 ; Path for attachments. Defaults to `data/attachments`
 PATH = data/attachments
 ; One or more allowed types, e.g. image/jpeg|image/png
-; ALLOWED_TYPES = image/jpeg|image/png
+ALLOWED_TYPES = image/jpeg|image/png
-ALLOWED_TYPES = */*
 ; Max size of each file. Defaults to 32MB
 MAX_SIZE = 32
 ; Max number of files per upload. Defaults to 10
@@ -266,15 +266,15 @@ MODE = console, file
 ; Buffer length of channel, keep it as it is if you don't know what it is.
 BUFFER_LEN = 10000
 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
-LEVEL = Info
+LEVEL = Trace
 
 ; For "console" mode only
 [log.console]
-LEVEL = Info
+LEVEL =
 
 ; For "file" mode only
 [log.file]
-LEVEL = Info
+LEVEL =
 ; This enables automated log rotate(switch of following options), default is true
 LOG_ROTATE = true
 ; Max line number of single file, default is 1000000
@@ -288,7 +288,7 @@ MAX_DAYS = 7
 
 ; For "conn" mode only
 [log.conn]
-LEVEL = Info
+LEVEL =
 ; Reconnect host for every single message, default is false
 RECONNECT_ON_MSG = false
 ; Try to reconnect when connection is lost, default is false
@@ -300,7 +300,7 @@ ADDR =
 
 ; For "smtp" mode only
 [log.smtp]
-LEVEL = Info
+LEVEL =
 ; Name displayed in mail title, default is "Diagnostic message from serve"
 SUBJECT = Diagnostic message from serve
 ; Mail server
@@ -313,7 +313,7 @@ RECEIVERS =
 
 ; For "database" mode only
 [log.database]
-LEVEL = Info
+LEVEL =
 ; Either "mysql" or "postgres"
 DRIVER =
 ; Based on xorm, e.g.: root:root@localhost/gitea?charset=utf8