diff --git a/dicos/50_gitea.xml b/dicos/50_gitea.xml index bf03e4a..d534ba7 100644 --- a/dicos/50_gitea.xml +++ b/dicos/50_gitea.xml @@ -1,7 +1,6 @@ - @@ -14,15 +13,13 @@ apt-transport-https git-core - - forge gitea_http_port - sshd + gitea_ssh_port diff --git a/tmpl/gitea-db.yml b/tmpl/gitea-db.yml index 425fbc1..423a9c3 100644 --- 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' } - diff --git a/tmpl/gitea.conf b/tmpl/gitea.conf index 3a86cc4..60b2401 100644 --- a/tmpl/gitea.conf +++ b/tmpl/gitea.conf @@ -30,6 +30,7 @@ HTTP_ADDR = HTTP_PORT = %%gitea_http_port ; Disable SSH feature when not available DISABLE_SSH = false +START_SSH_SERVER = true SSH_PORT = %%gitea_ssh_port ; Disable CDN even in "prod" mode OFFLINE_MODE = false @@ -70,7 +71,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