Compare commits
No commits in common. "develop" and "2.6.2/master" have entirely different histories.
develop
...
2.6.2/mast
4
Makefile
4
Makefile
|
|
@ -3,8 +3,8 @@
|
|||
################################
|
||||
|
||||
SOURCE=eole-gitea
|
||||
VERSION=1.13.2
|
||||
EOLE_VERSION=2.7.2
|
||||
VERSION=1.5.2
|
||||
EOLE_VERSION=2.6.2
|
||||
PKGAPPS=non
|
||||
#FLASK_MODULE=<APPLICATION>
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<containers>
|
||||
<container name='forge' id='101'>
|
||||
<package>apt-transport-https</package>
|
||||
<package>git</package>
|
||||
<package>git-core</package>
|
||||
<file filelist='gitea' name='/etc/gitea/conf/app.ini' source='gitea.conf' mkdir='True' rm='True' mode='770' owner='root' group='gitservice'/>
|
||||
<service servicelist='gitea'>forge</service>
|
||||
<service_access service='gitea_without_nginx'>
|
||||
|
|
@ -37,8 +37,6 @@
|
|||
<value>non</value>
|
||||
</variable>
|
||||
<variable name='gitea_mail_from' type='string' description="Adresse courriel a l'origine des messages de la forge"/>
|
||||
<variable name='gitea_smtp_srv' type='string' description="Adresse IP ou DNS du serveur SMTP à utiliser"/>
|
||||
<variable name='gitea_smtp_prt' type='port' description="Port du serveur SMTP à utiliser"/>
|
||||
<variable name='gitea_mail_auth' type='oui/non' description="Utiliser un compte pour le serveur smtp">
|
||||
<value>non</value>
|
||||
</variable>
|
||||
|
|
@ -79,10 +77,6 @@
|
|||
<condition name='hidden_if_in' source='gitea_mail'>
|
||||
<param>non</param>
|
||||
<target type='variable'>gitea_mail_from</target>
|
||||
<target type='variable'>gitea_smtp_srv</target>
|
||||
<target type='variable'>gitea_smtp_prt</target>
|
||||
<target type='variable'>gitea_email_user</target>
|
||||
<target type='variable'>gitea_email_password</target>
|
||||
</condition>
|
||||
<condition name='disabled_if_in' source='activer_gitea'>
|
||||
<param>non</param>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ HOMEDIR="${WKDIR}/${USER}"
|
|||
OS="linux"
|
||||
ARCH="amd64"
|
||||
|
||||
APPVERSION="1.16.8"
|
||||
APPVERSION="1.10.0"
|
||||
APPNAME="gitea"
|
||||
APPBINARY="gitea"
|
||||
APPSIG="7C9E68152594688862D62AF62D9AE806EC1592E2"
|
||||
|
|
|
|||
|
|
@ -60,12 +60,12 @@ DB_TYPE = mysql
|
|||
%set %%dbMode = %%getVar("gitea_db_mode")
|
||||
%if %%dbMode == "default"
|
||||
%if %%edb_local == "oui"
|
||||
HOST = /var/run/mysqld/mysqld.sock
|
||||
HOST = 127.0.0.1:3306
|
||||
%else
|
||||
HOST = %%{edb_host}:%%{edb_port}
|
||||
%end if
|
||||
%elif %%dbMode == "local"
|
||||
HOST = /var/run/mysqld/mysqld.sock
|
||||
HOST = 127.0.0.1:3306
|
||||
%elif %%dbMode == "externe"
|
||||
HOST = %%{gitea_dbserver}:%%{gitea_dbport}
|
||||
%end if
|
||||
|
|
@ -137,7 +137,11 @@ SUBJECT = %(APP_NAME)s
|
|||
; Gmail: smtp.gmail.com:587
|
||||
; QQ: smtp.qq.com:25
|
||||
; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used.
|
||||
HOST = %%gitea_smtp_srv:%%gitea_srv_prt
|
||||
%if %%getVar('activer_exim_relay_smtp','non') == 'oui'
|
||||
HOST = %%exim_relay_smtp:25
|
||||
%else
|
||||
HOST = 127.0.0.1
|
||||
%end if
|
||||
; Do not verify the certificate of the server. Only use this for self-signed certificates
|
||||
SKIP_VERIFY = true
|
||||
; Use client certificate
|
||||
|
|
@ -236,17 +240,13 @@ AVATAR_UPLOAD_PATH = data/avatars
|
|||
GRAVATAR_SOURCE = gravatar
|
||||
DISABLE_GRAVATAR = false
|
||||
|
||||
[repository.upload]
|
||||
ALLOWED_TYPES = application/zip|application/gzip|application/x-gzip|application/x-gtar|application/x-tgz|application/x-compressed-tar|text/plain
|
||||
|
||||
[attachment]
|
||||
; Whether attachments are enabled. Defaults to `true`
|
||||
ENABLE = true
|
||||
; Path for attachments. Defaults to `data/attachments`
|
||||
PATH = data/attachments
|
||||
; One or more allowed types, e.g. image/jpeg|image/png
|
||||
; ALLOWED_TYPES = image/jpeg|image/png
|
||||
ALLOWED_TYPES = */*
|
||||
ALLOWED_TYPES = image/jpeg|image/png
|
||||
; Max size of each file. Defaults to 32MB
|
||||
MAX_SIZE = 32
|
||||
; Max number of files per upload. Defaults to 10
|
||||
|
|
@ -266,15 +266,15 @@ MODE = console, file
|
|||
; Buffer length of channel, keep it as it is if you don't know what it is.
|
||||
BUFFER_LEN = 10000
|
||||
; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
|
||||
LEVEL = Info
|
||||
LEVEL = Trace
|
||||
|
||||
; For "console" mode only
|
||||
[log.console]
|
||||
LEVEL = Info
|
||||
LEVEL =
|
||||
|
||||
; For "file" mode only
|
||||
[log.file]
|
||||
LEVEL = Info
|
||||
LEVEL =
|
||||
; This enables automated log rotate(switch of following options), default is true
|
||||
LOG_ROTATE = true
|
||||
; Max line number of single file, default is 1000000
|
||||
|
|
@ -288,7 +288,7 @@ MAX_DAYS = 7
|
|||
|
||||
; For "conn" mode only
|
||||
[log.conn]
|
||||
LEVEL = Info
|
||||
LEVEL =
|
||||
; Reconnect host for every single message, default is false
|
||||
RECONNECT_ON_MSG = false
|
||||
; Try to reconnect when connection is lost, default is false
|
||||
|
|
@ -300,7 +300,7 @@ ADDR =
|
|||
|
||||
; For "smtp" mode only
|
||||
[log.smtp]
|
||||
LEVEL = Info
|
||||
LEVEL =
|
||||
; Name displayed in mail title, default is "Diagnostic message from serve"
|
||||
SUBJECT = Diagnostic message from serve
|
||||
; Mail server
|
||||
|
|
@ -313,7 +313,7 @@ RECEIVERS =
|
|||
|
||||
; For "database" mode only
|
||||
[log.database]
|
||||
LEVEL = Info
|
||||
LEVEL =
|
||||
; Either "mysql" or "postgres"
|
||||
DRIVER =
|
||||
; Based on xorm, e.g.: root:root@localhost/gitea?charset=utf8
|
||||
|
|
|
|||
Loading…
Reference in New Issue