Merge branch 'develop' into dist/eole/2.6.2/develop
This commit is contained in:
commit
46a39a539e
|
@ -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>
|
<tcpwrapper>gitea</tcpwrapper>
|
||||||
</service_access>
|
</service_access>
|
||||||
</container>
|
</container>
|
||||||
</containers>
|
</containers>
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue