mirror of
https://framagit.org/YunoHost-Apps/gitea_ynh.git
synced 2024-12-22 09:35:06 +01:00
Merge branch 'v1.9' into add-fail2ban
This commit is contained in:
commit
21a71f78a7
25
conf/app.ini
25
conf/app.ini
@ -2,6 +2,7 @@
|
||||
APP_NAME = Gitea
|
||||
RUN_USER = __APP__
|
||||
RUN_MODE = prod
|
||||
|
||||
[database]
|
||||
DB_TYPE = mysql
|
||||
HOST = 127.0.0.1:3306
|
||||
@ -10,9 +11,12 @@ USER = __DB_USER__
|
||||
PASSWD = __DB_PASSWORD__
|
||||
SSL_MODE = disable
|
||||
PATH = data/gitea.db
|
||||
LOG_SQL = false
|
||||
|
||||
[repository]
|
||||
ROOT = __REPOS_PATH__
|
||||
FORCE_PRIVATE = false
|
||||
|
||||
[server]
|
||||
DOMAIN = __DOMAIN__
|
||||
HTTP_PORT = __PORT__
|
||||
@ -22,11 +26,13 @@ SSH_PORT = __SSH_PORT_
|
||||
OFFLINE_MODE = false
|
||||
APP_DATA_PATH = __DATA_PATH__
|
||||
LANDING_PAGE = explore
|
||||
|
||||
[mailer]
|
||||
ENABLED = true
|
||||
HOST = 127.0.0.1:25
|
||||
FROM = "Gitea" <gitea-noreply@__DOMAIN__>
|
||||
SKIP_VERIFY = true
|
||||
|
||||
[service]
|
||||
REGISTER_EMAIL_CONFIRM = false
|
||||
ENABLE_NOTIFY_MAIL = true
|
||||
@ -35,16 +41,33 @@ ENABLE_CAPTCHA = false
|
||||
REQUIRE_SIGNIN_VIEW = false
|
||||
ENABLE_REVERSE_PROXY_AUTHENTICATION = false
|
||||
ENABLE_REVERSE_PROXY_AUTO_REGISTERATION = false
|
||||
|
||||
[picture]
|
||||
AVATAR_UPLOAD_PATH = __DATA_PATH__/avatars
|
||||
|
||||
[attachment]
|
||||
PATH = __DATA_PATH__/attachments
|
||||
|
||||
[session]
|
||||
PROVIDER = memory
|
||||
|
||||
[log]
|
||||
MODE = file
|
||||
LEVEL = Warn
|
||||
LEVEL = Info
|
||||
ROOT_PATH = /var/log/__APP__
|
||||
|
||||
REDIRECT_MACARON_LOG= true
|
||||
MACARON = file
|
||||
|
||||
ROUTER_LOG_LEVEL = Warn
|
||||
ROUTER = file
|
||||
|
||||
ENABLE_ACCESS_LOG = Warn
|
||||
ACCESS = file
|
||||
|
||||
ENABLE_XORM_LOG = Warn
|
||||
XORM = file
|
||||
|
||||
[security]
|
||||
INSTALL_LOCK = true
|
||||
SECRET_KEY = __KEY__
|
||||
|
@ -1,5 +1,5 @@
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.8.2/gitea-1.8.2-linux-arm-6
|
||||
SOURCE_SUM=38ab6c0ac42e87370238c2482432420ff509b5a03d964712a984d4d603bb4c97
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.9.0/gitea-1.9.0-linux-arm-6
|
||||
SOURCE_SUM=f2dff72ee94dd1c1bd2c067470469470ea079c47c07e862995cb85dc877ca389
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FILENAME=gitea
|
||||
SOURCE_EXTRACT=false
|
||||
|
5
conf/source/arm_1.8.src
Normal file
5
conf/source/arm_1.8.src
Normal file
@ -0,0 +1,5 @@
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.8.3/gitea-1.8.3-linux-arm-6
|
||||
SOURCE_SUM=920b74ec10be323e5dc684fe3b5c3b157bf6f1d6cca0ee1c4f9693f766d1574d
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FILENAME=gitea
|
||||
SOURCE_EXTRACT=false
|
@ -1,8 +1,8 @@
|
||||
# The armv7 build is brocken
|
||||
# See : https://github.com/go-gitea/gitea/issues/6700
|
||||
# Use temporary the armv6 binary
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.8.2/gitea-1.8.2-linux-arm-6
|
||||
SOURCE_SUM=38ab6c0ac42e87370238c2482432420ff509b5a03d964712a984d4d603bb4c97
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.9.0/gitea-1.9.0-linux-arm-6
|
||||
SOURCE_SUM=f2dff72ee94dd1c1bd2c067470469470ea079c47c07e862995cb85dc877ca389
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FILENAME=gitea
|
||||
SOURCE_EXTRACT=false
|
||||
|
8
conf/source/armv7_1.8.src
Normal file
8
conf/source/armv7_1.8.src
Normal file
@ -0,0 +1,8 @@
|
||||
# The armv7 build is brocken
|
||||
# See : https://github.com/go-gitea/gitea/issues/6700
|
||||
# Use temporary the armv6 binary
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.8.3/gitea-1.8.3-linux-arm-6
|
||||
SOURCE_SUM=920b74ec10be323e5dc684fe3b5c3b157bf6f1d6cca0ee1c4f9693f766d1574d
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FILENAME=gitea
|
||||
SOURCE_EXTRACT=false
|
@ -1,5 +1,5 @@
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.8.2/gitea-1.8.2-linux-386
|
||||
SOURCE_SUM=762ab39855958f61165a1332a34d2a227f527acdc3bf60aa91c5a3e4e4e906ce
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.9.0/gitea-1.9.0-linux-386
|
||||
SOURCE_SUM=861125e85b95a90bb84279641ad60ee3c9570dd8b0d134d8419812ba7571af71
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FILENAME=gitea
|
||||
SOURCE_EXTRACT=false
|
||||
|
5
conf/source/i386_1.8.src
Normal file
5
conf/source/i386_1.8.src
Normal file
@ -0,0 +1,5 @@
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.8.3/gitea-1.8.3-linux-386
|
||||
SOURCE_SUM=e58f4a88b01a4880f97ae32a92e869d978a434a9a876c6a3f4e4a5721e8c4bd6
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FILENAME=gitea
|
||||
SOURCE_EXTRACT=false
|
@ -1,5 +1,5 @@
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.8.2/gitea-1.8.2-linux-amd64
|
||||
SOURCE_SUM=a843f2fe526b62ad1e698b80f6193d8c42a3920b35542de014af44d1eb998141
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.9.0/gitea-1.9.0-linux-amd64
|
||||
SOURCE_SUM=8a2e02cee40086effd99058054af8fb1eee9344fad865e0c7292107833da78cc
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FILENAME=gitea
|
||||
SOURCE_EXTRACT=false
|
||||
|
5
conf/source/x86-64_1.8.src
Normal file
5
conf/source/x86-64_1.8.src
Normal file
@ -0,0 +1,5 @@
|
||||
SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.8.3/gitea-1.8.3-linux-amd64
|
||||
SOURCE_SUM=7bb28b21cce4bdf0a24e6f6b21c064afa56d84904052dd55afdf59c419d49988
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FILENAME=gitea
|
||||
SOURCE_EXTRACT=false
|
@ -9,7 +9,7 @@
|
||||
},
|
||||
"url": "http://gitea.io",
|
||||
"license": "MIT",
|
||||
"version": "1.8.0~ynh1",
|
||||
"version": "1.9.0~ynh1",
|
||||
"maintainer": {
|
||||
"name": "rafi59",
|
||||
"email": "rafi59_dev@srvmaison.fr.nf"
|
||||
|
@ -26,6 +26,7 @@ dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
|
||||
admin=$(ynh_app_setting_get "$app" adminusername)
|
||||
key=$(ynh_app_setting_get "$app" secret_key)
|
||||
port=$(ynh_app_setting_get "$app" web_port)
|
||||
upstream_version=$(ynh_app_setting_get $app upstream_version)
|
||||
|
||||
#=================================================
|
||||
# STANDARD MODIFICATIONS
|
||||
@ -50,7 +51,7 @@ config_nginx
|
||||
config_gitea
|
||||
|
||||
# RELOAD services
|
||||
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd" -a restart
|
||||
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -a restart -t 10
|
||||
sleep 1
|
||||
|
||||
# Store the checksum with the 'INTERNAL_TOKEN' value.
|
||||
|
@ -19,6 +19,7 @@ domain=$YNH_APP_ARG_DOMAIN
|
||||
path_url=$(ynh_normalize_url_path $YNH_APP_ARG_PATH)
|
||||
admin=$YNH_APP_ARG_ADMIN
|
||||
is_public=$YNH_APP_ARG_IS_PUBLIC
|
||||
upstream_version=$(ynh_app_upstream_version)
|
||||
|
||||
# Check domain/path availability
|
||||
ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain."
|
||||
@ -110,16 +111,16 @@ ynh_add_fail2ban_config --logpath "/var/log/$app/gitea.log" --failregex ".*Faile
|
||||
set_access_settings
|
||||
|
||||
# Add gitea to YunoHost's monitored services
|
||||
yunohost service add "$app" --log "/var/log/$app/$app.log"
|
||||
yunohost service add "$app" --log "/var/log/$app/gitea.log"
|
||||
|
||||
# Configure logrotate
|
||||
ynh_use_logrotate "/var/log/$app"
|
||||
|
||||
# Save Version
|
||||
ynh_app_setting_set $app upstream_version $(ynh_app_upstream_version)
|
||||
ynh_app_setting_set $app upstream_version $upstream_version
|
||||
|
||||
# Reload services
|
||||
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd"
|
||||
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -t 10
|
||||
sleep 1
|
||||
|
||||
# Store the checksum with the 'INTERNAL_TOKEN' value.
|
||||
|
@ -20,6 +20,7 @@ path_url=$(ynh_app_setting_get "$app" path)
|
||||
dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
|
||||
admin=$(ynh_app_setting_get "$app" adminusername)
|
||||
port=$(ynh_app_setting_get "$app" web_port)
|
||||
upstream_version=$(ynh_app_setting_get $app upstream_version)
|
||||
|
||||
# Check domain/path availability with app helper
|
||||
ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain."
|
||||
@ -68,9 +69,9 @@ set_permission
|
||||
ynh_use_logrotate "/var/log/$app"
|
||||
|
||||
# Add gitea to YunoHost's monitored services
|
||||
yunohost service add "$app" --log /var/log/"$app"/"$app".log
|
||||
yunohost service add "$app" --log /var/log/"$app"/gitea.log
|
||||
|
||||
# Reload services
|
||||
systemctl reload nginx.service
|
||||
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd"
|
||||
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -t 10
|
||||
sleep 1
|
||||
|
@ -155,6 +155,10 @@ case $upstream_version in
|
||||
ynh_setup_source $final_path source/${architecture}_1.7
|
||||
restart_gitea
|
||||
;&
|
||||
"1.7."* )
|
||||
ynh_setup_source $final_path source/${architecture}_1.8
|
||||
restart_gitea
|
||||
;&
|
||||
esac
|
||||
|
||||
# Install gitea source
|
||||
@ -177,7 +181,7 @@ ynh_app_setting_set $app upstream_version $(ynh_app_upstream_version)
|
||||
set_access_settings
|
||||
|
||||
# Reload services
|
||||
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd"
|
||||
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -t 10
|
||||
sleep 1
|
||||
|
||||
# Store the checksum with the 'INTERNAL_TOKEN' value.
|
||||
|
Loading…
Reference in New Issue
Block a user