Cadoles
/
eole-gitea
18
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

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

This commit is contained in:
wpetit 2019-09-30 17:12:11 +02:00
parent abe1f6e651 aff3f9cee7
commit 03d9f64381
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dicos/50_gitea.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<creole> <creole>
<files> <files>
<!-- Je suis un commentaire -->
<file filelist='gitea-nginx' name='/etc/nginx/sites-available/gitea' source='gitea.nginx' mkdir='True' rm='True'/> <file filelist='gitea-nginx' name='/etc/nginx/sites-available/gitea' source='gitea.nginx' mkdir='True' rm='True'/>
<file filelist='gitea' name='/usr/share/eole/bastion/data/51-gitea-nat_rules' mkdir='True' rm='True' mode='0755'/> <file filelist='gitea' name='/usr/share/eole/bastion/data/51-gitea-nat_rules' mkdir='True' rm='True' mode='0755'/>
<file filelist='gitea' name='/etc/eole/eole-db.d/gitea-db.yml' rm='True' mkdir='True'/> <file filelist='gitea' name='/etc/eole/eole-db.d/gitea-db.yml' rm='True' mkdir='True'/>
@ -14,15 +13,13 @@
<container name='forge' id='101'> <container name='forge' id='101'>
<package>apt-transport-https</package> <package>apt-transport-https</package>
<package>git-core</package> <package>git-core</package>
<!-- FIXME this have to be installed <package>gitea</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='xxxx'>nom-du-service-a-lancer-dans-le-conteneur</service> -->
<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'>
<tcpwrapper>sshd</tcpwrapper> <port service_accesslist="gitea_ssh'" port_type="SymLinkOption">gitea_ssh_port</port>
</service_access> </service_access>
</container> </container>
</containers> </containers>

5
tmpl/gitea-db.yml
View File

@ -34,8 +34,7 @@ createscript: "/usr/share/eole/db/gitea/gen/00-create-gitea-db.sql"
%set cnt_prefix = %%getVar('container_path_reseau', '') %set cnt_prefix = %%getVar('container_path_reseau', '')
pwd_files: pwd_files:
- {file: '%%cnt_prefix/etc/gitea/conf/app.ini', - {file: '%%cnt_prefix/etc/gitea/conf/app.ini',
pattern: 'PASSWD = ', pattern: 'PASSWD = `',
end_pattern: '', end_pattern: '`',
owner: 'root:gitservice', owner: 'root:gitservice',
mod: '660' } mod: '660' }

3
tmpl/gitea.conf
View File

@ -30,6 +30,7 @@ HTTP_ADDR =
HTTP_PORT = %%gitea_http_port HTTP_PORT = %%gitea_http_port
; Disable SSH feature when not available ; Disable SSH feature when not available
DISABLE_SSH = false DISABLE_SSH = false
START_SSH_SERVER = true
SSH_PORT = %%gitea_ssh_port SSH_PORT = %%gitea_ssh_port
; Disable CDN even in "prod" mode ; Disable CDN even in "prod" mode
OFFLINE_MODE = false OFFLINE_MODE = false
@ -70,7 +71,7 @@ HOST = %%{gitea_dbserver}:%%{gitea_dbport}
%end if %end if
NAME = gitea NAME = gitea
USER = gitea USER = gitea
PASSWD = gitea1234 PASSWD = `gitea1234`
; For "postgres" only, either "disable", "require" or "verify-full" ; For "postgres" only, either "disable", "require" or "verify-full"
SSL_MODE = disable SSL_MODE = disable
; For "sqlite3" only ; For "sqlite3" only