Merge remote-tracking branch 'origin/dist/eole/2.6.2/develop' into dist/eole/2.6.2/master

Merge branch 'master' into dist/eole/2.6.2/master
2019-06-18 11:01:31 +02:00 · 2019-06-18 10:59:27 +02:00 · 2018-11-05 15:09:27 +01:00 · 2018-10-30 16:35:34 +01:00 · 2018-10-30 15:23:24 +01:00 · 2018-10-30 15:23:08 +01:00
2 changed files with 4 additions and 3 deletions
--- a/tmpl/gitea-db.yml
+++ b/tmpl/gitea-db.yml
@ -34,7 +34,8 @@ 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	abe1f6e651	Merge remote-tracking branch 'origin/dist/eole/2.6.2/develop' into dist/eole/2.6.2/master	2019-06-18 11:01:31 +02:00
William Petit	e5c692d551	Merge branch 'master' into dist/eole/2.6.2/master	2019-06-18 10:59:27 +02:00
Philippe Caseiro	20ed228419	Merge branch 'master' into dist/eole/2.6.2/master	2018-11-05 15:09:27 +01:00
Philippe Caseiro	497a67919f	Merge branch 'master' into dist/eole/2.6.2/master	2018-10-30 16:35:34 +01:00
Philippe Caseiro	47e6c65ec6	eole-gitea need eole-mysql to work	2018-10-30 15:23:24 +01:00
Philippe Caseiro	de9406ab4d	Merge branch 'master' into dist/eole/2.6.2/master	2018-10-30 15:23:08 +01:00
Philippe Caseiro	94421b8a58	Updating package depends	2018-10-30 15:02:55 +01:00
Philippe Caseiro	01906c6f62	Adding debian packaging	2018-10-30 14:56:16 +01:00