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

Correction génération mot de passe par eole-db
2019-09-30 09:43:36 +02:00 · 2019-09-29 10:08:53 +02:00 · 2019-06-18 09:19:44 +02:00 · 2019-06-18 09:19:25 +02:00
3 changed files with 4 additions and 5 deletions
--- a/pretemplate/01-gitea-init
+++ b/pretemplate/01-gitea-init
@ -16,7 +16,7 @@ HOMEDIR="${WKDIR}/${USER}"
 OS="linux"
 ARCH="amd64"

-APPVERSION="1.8.2"
+APPVERSION="1.8.3"
 APPNAME="gitea"
 APPBINARY="gitea"
 APPSIG="7C9E68152594688862D62AF62D9AE806EC1592E2"
--- a/tmpl/gitea-db.yml
+++ b/tmpl/gitea-db.yml
@ -34,8 +34,7 @@ createscript: "/usr/share/eole/db/gitea/gen/00-create-gitea-db.sql"
 %set cnt_prefix = %%getVar('container_path_reseau', '')
 pwd_files:
    - {file: '%%cnt_prefix/etc/gitea/conf/app.ini',
-       pattern: 'PASSWD   = ',
-       end_pattern: '',
+       pattern: 'PASSWD   = `',
+       end_pattern: '`',
       owner: 'root:gitservice',
       mod: '660' }
-
--- a/tmpl/gitea.conf
+++ b/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
Author	SHA1	Message	Date
William Petit	0d517df3ee	Merge branch 'develop' into dist/eole/2.6.2/develop	2019-09-30 09:43:36 +02:00
William Petit	93b96fb8e0	Correction génération mot de passe par eole-db	2019-09-29 10:08:53 +02:00
William Petit	5fa6632153	Merge branch 'develop' into dist/eole/2.6.2/develop	2019-06-18 09:19:44 +02:00
William Petit	e42436c303	Upgrade to Gitea 1.8.3	2019-06-18 09:19:25 +02:00