Cadoles
/
eole-gitea
20
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:
Philippe Caseiro 2018-10-30 16:35:34 +01:00
parent 47e6c65ec6 25763e68c0
commit 497a67919f
6 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,5 +1,5 @@
################################
# Makefile pour eole-gogs
# Makefile pour eole-gitea
################################
SOURCE=eole-gitea

29
dicos/50_gitea.xml
View File

@ -4,7 +4,8 @@
<!-- Je suis un commentaire -->
<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/mysql/eole-gitea/gen/00-create-gitea-db.sql' mkdir='True' rm='True'/>
<file filelist='gitea' name='/etc/eole/eole-db.d/gitea-db.yml' rm='True' mkdir='True'/>
<file filelist='gitea' name='/usr/share/eole/db/gitea/gen/00-create-gitea-db.sql' mkdir='True' rm='True'/>
<service_access service='gitea_with_nginx'>
<port service_accesslist="gitea_with_nginx">443</port>
</service_access>
@ -14,7 +15,7 @@
<package>apt-transport-https</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'/>
<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_access service='gitea_without_nginx'>
@ -65,6 +66,14 @@
<value>localhost</value>
</variable>
<variable name='gitea_nginx' type='oui/non' hidden='True'/>
<variable type='string' name='gitea_db_mode' description='Serveur de bases de données à utiliser'/>
</family>
<family name="BDD Forge" mode="expert">
<variable type='string' name='gitea_dbserver' description='Adresse du serveur de base de données'/>
<variable type='number' name='gitea_dbport' description="Port d'écoute du serveur de base de données"/>
<variable type='string' name='gitea_allow_hosts' description="Hôtes authorisés à utiliser la base de données" multi='True'/>
<variable type='string' name='gitea_dbuser' description='Utilisateur du serveur de base de données'/>
<variable type='string' name='gitea_dbpass' description='Fichier de mot de passe du serveur'/>
</family>
</variables>
<constraints>
@ -88,11 +97,13 @@
<fill name='calc_multi_condition' target='gitea_nginx'>
<param>oui</param>
<param name="operator">OR</param>
<param type="eole" name="condition_1" optional="True">activer_revprox</param>
<param type="eole" name="condition_1" optional="True">activer_nginx_web</param>
<param name="condition_2">non</param>
<param name='match'>oui</param>
<param name='mismatch'>non</param>
</fill>
<condition name='disabled_if_in' source='gitea_nginx'>
<param>non</param>
<target type='filelist'>gitea-nginx</target>
@ -102,6 +113,18 @@
<param>oui</param>
<target type='service_accesslist'>gitea_without_nginx</target>
</condition>
<check name='valid_enum' target='gitea_db_mode'>
<param>['default', 'externe', 'local']</param>
</check>
<condition name='disabled_if_in' source='gitea_db_mode'>
<param>local</param>
<target type='family'>BDD Forge</target>
</condition>
<condition name='disabled_if_in' source='gitea_db_mode'>
<param>default</param>
<target type='family'>BDD Forge</target>
</condition>
</constraints>
<help>
<variable name='activer_gitea'>Activer la forge Gitea, Gitea est une forge basée sur Git clone de github (fork de gogs)</variable>

8
posttemplate/01-gitea-nginx
View File

@ -1,11 +1,11 @@
#!/bin/bash
ENABLE=`CreoleGet activer_gogs 'non'`
ENABLE=`CreoleGet activer_gitea 'non'`
if [ -L /etc/nginx/sites-enabled/gogs ];then
rm -f /etc/nginx/sites-enabled/gogs
if [ -L /etc/nginx/sites-enabled/gitea ];then
rm -f /etc/nginx/sites-enabled/gitea
fi
if [ "${ENABLE}" = 'oui' ];then
ln -s /etc/nginx/sites-available/gogs /etc/nginx/sites-enabled/gogs
ln -s /etc/nginx/sites-available/gitea /etc/nginx/sites-enabled/gitea
fi

6
tmpl/00-create-gitea-db.sql
View File

@ -1,13 +1,13 @@
-- example de création d'une base de données MySQL
-- création de la base de donnée
CREATE DATABASE gogs CHARACTER SET utf8 COLLATE utf8_general_ci;
CREATE DATABASE gitea CHARACTER SET utf8 COLLATE utf8_general_ci;
-- création du user de la base
grant all privileges on gogs.* to gogs@%%container_ip_forge identified by 'gogs1234';
grant all privileges on gitea.* to gitea@%%container_ip_forge identified by 'gitea1234';
flush privileges ;
-- connexion à la base
\r gogs
\r gitea
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";

6
tmpl/gitea-db.yml
View File

@ -34,8 +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: ';',
owner: 'root:www-data',
pattern: 'PASSWD = ',
end_pattern: '',
owner: 'root:gitservice',
mod: '660' }

13
tmpl/gitea.conf
View File

@ -56,7 +56,18 @@ LANDING_PAGE = explore
; Either "mysql", "postgres" or "sqlite3", it's your choice
DB_TYPE = mysql
;FIXME FOR EOLEDB
HOST = %%getVar("container_ip_mysql","127.0.0.1"):3306
%set %%dbMode = %%getVar("gitea_db_mode")
%if %%dbMode == "default"
%if %%edb_local == "oui"
HOST = 127.0.0.1:3306
%else
HOST = %%{edb_host}:%%{edb_port}
%end if
%elif %%dbMode == "local"
HOST = 127.0.0.1:3306
%elif %%dbMode == "externe"
HOST = %%{gitea_dbserver}:%%{gitea_dbport}
%end if
NAME = gitea
USER = gitea
PASSWD=gitea1234