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-17 17:15:39 +02:00 · 2019-06-17 17:03:29 +02:00 · 2019-06-17 17:01:44 +02:00
3 changed files with 4 additions and 5 deletions
--- a/debian/control
+++ b/debian/control
@ -8,7 +8,7 @@ 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-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
--- 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   = ',
+       pattern: 'PASSWD   = `',
-       end_pattern: '',
+       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	22525b938a	Merge branch 'develop' into dist/eole/2.6.2/develop	2019-06-17 17:15:39 +02:00
William Petit	e5c7da0072	Merge branch 'develop' into dist/eole/2.6.2/develop	2019-06-17 17:03:29 +02:00
William Petit	11a467a98e	Handle Gitea version upgrade in pretemplate script Check for version update with script expected version versus installed version	2019-06-17 17:01:44 +02:00
William Petit	a5e06df596	Merge branch 'develop' into dist/eole/2.6.2/develop	2019-06-17 14:24:34 +02:00
Philippe Caseiro	94fb92496f	Merge branch 'develop' into dist/eole/2.6.2/develop	2018-10-31 12:44:52 +01:00
Philippe Caseiro	272f206d85	Updating package name	2018-10-31 09:18:03 +01:00
Philippe Caseiro	a68203c7e5	Merge branch 'develop' into dist/eole/2.6.2/develop	2018-10-31 09:17:28 +01:00
Philippe Caseiro	16332a190f	Adding debian packaging	2018-10-30 16:38:14 +01:00