From 9babd36be2e37904dc0113c43a78ed2262bd7a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 1 Aug 2019 14:17:11 +0200 Subject: [PATCH 1/5] Update to gitea v1.9.0 --- conf/source/arm.src | 4 ++-- conf/source/arm_1.8.src | 5 +++++ conf/source/armv7.src | 4 ++-- conf/source/armv7_1.8.src | 8 ++++++++ conf/source/i386.src | 4 ++-- conf/source/i386_1.8.src | 5 +++++ conf/source/x86-64.src | 4 ++-- conf/source/x86-64_1.8.src | 5 +++++ manifest.json | 2 +- scripts/upgrade | 4 ++++ 10 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 conf/source/arm_1.8.src create mode 100644 conf/source/armv7_1.8.src create mode 100644 conf/source/i386_1.8.src create mode 100644 conf/source/x86-64_1.8.src diff --git a/conf/source/arm.src b/conf/source/arm.src index 9d17643..ec5d91f 100644 --- a/conf/source/arm.src +++ b/conf/source/arm.src @@ -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 diff --git a/conf/source/arm_1.8.src b/conf/source/arm_1.8.src new file mode 100644 index 0000000..d5005b9 --- /dev/null +++ b/conf/source/arm_1.8.src @@ -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 diff --git a/conf/source/armv7.src b/conf/source/armv7.src index faf17e7..a48f59b 100644 --- a/conf/source/armv7.src +++ b/conf/source/armv7.src @@ -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 diff --git a/conf/source/armv7_1.8.src b/conf/source/armv7_1.8.src new file mode 100644 index 0000000..918684d --- /dev/null +++ b/conf/source/armv7_1.8.src @@ -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 diff --git a/conf/source/i386.src b/conf/source/i386.src index fa9a6e6..be860f1 100644 --- a/conf/source/i386.src +++ b/conf/source/i386.src @@ -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 diff --git a/conf/source/i386_1.8.src b/conf/source/i386_1.8.src new file mode 100644 index 0000000..256641b --- /dev/null +++ b/conf/source/i386_1.8.src @@ -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 diff --git a/conf/source/x86-64.src b/conf/source/x86-64.src index 329b91f..5da34a0 100644 --- a/conf/source/x86-64.src +++ b/conf/source/x86-64.src @@ -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 diff --git a/conf/source/x86-64_1.8.src b/conf/source/x86-64_1.8.src new file mode 100644 index 0000000..d5d2530 --- /dev/null +++ b/conf/source/x86-64_1.8.src @@ -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 diff --git a/manifest.json b/manifest.json index 37df4e4..b860b78 100644 --- a/manifest.json +++ b/manifest.json @@ -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" diff --git a/scripts/upgrade b/scripts/upgrade index 127e9bd..71cd1df 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -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 From c734163ed7d05658cbaa31b3d28d3d0e85540486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 1 Aug 2019 15:32:59 +0200 Subject: [PATCH 2/5] Fix check starting service --- scripts/change_url | 3 ++- scripts/install | 5 +++-- scripts/restore | 3 ++- scripts/upgrade | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 87eea15..6486964 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -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 "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -a restart -t 5 sleep 1 # Store the checksum with the 'INTERNAL_TOKEN' value. diff --git a/scripts/install b/scripts/install index 40deb45..3e6d8f1 100644 --- a/scripts/install +++ b/scripts/install @@ -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." @@ -113,10 +114,10 @@ yunohost service add "$app" --log "/var/log/$app/$app.log" 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 "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5 sleep 1 # Store the checksum with the 'INTERNAL_TOKEN' value. diff --git a/scripts/restore b/scripts/restore index c13cf0d..8abb1d1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -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." @@ -69,5 +70,5 @@ yunohost service add "$app" --log /var/log/"$app"/"$app".log # Reload services systemctl reload nginx.service -ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd" +ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5 sleep 1 diff --git a/scripts/upgrade b/scripts/upgrade index 71cd1df..07ec290 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -178,7 +178,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 "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5 sleep 1 # Store the checksum with the 'INTERNAL_TOKEN' value. From 9e2c149643a55a8215ab91ebca498050304a94cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 5 Aug 2019 16:51:46 +0200 Subject: [PATCH 3/5] Change the log managment (also for fail2ban support) --- conf/app.ini | 25 ++++++++++++++++++++++++- scripts/change_url | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/conf/app.ini b/conf/app.ini index e06c763..9d2f924 100644 --- a/conf/app.ini +++ b/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" 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__ diff --git a/scripts/change_url b/scripts/change_url index 6486964..cba3629 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -51,7 +51,7 @@ config_nginx config_gitea # RELOAD services -ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -a restart -t 5 +ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -a restart sleep 1 # Store the checksum with the 'INTERNAL_TOKEN' value. diff --git a/scripts/install b/scripts/install index 3e6d8f1..ebcf97e 100644 --- a/scripts/install +++ b/scripts/install @@ -117,7 +117,7 @@ ynh_use_logrotate "/var/log/$app" ynh_app_setting_set $app upstream_version $upstream_version # Reload services -ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5 +ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" sleep 1 # Store the checksum with the 'INTERNAL_TOKEN' value. diff --git a/scripts/restore b/scripts/restore index 8abb1d1..7bc7e3a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -70,5 +70,5 @@ yunohost service add "$app" --log /var/log/"$app"/"$app".log # Reload services systemctl reload nginx.service -ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5 +ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" sleep 1 diff --git a/scripts/upgrade b/scripts/upgrade index 07ec290..e112428 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -178,7 +178,7 @@ ynh_app_setting_set $app upstream_version $(ynh_app_upstream_version) set_access_settings # Reload services -ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5 +ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" sleep 1 # Store the checksum with the 'INTERNAL_TOKEN' value. From f2e84f11223f7e8db2b4290fc53400b684af7378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 5 Aug 2019 22:58:17 +0200 Subject: [PATCH 4/5] Add timeout to 5 second, to bypass when the log was written before it was catched --- scripts/change_url | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index cba3629..088387b 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -51,7 +51,7 @@ config_nginx config_gitea # RELOAD services -ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -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. diff --git a/scripts/install b/scripts/install index ebcf97e..93e6a92 100644 --- a/scripts/install +++ b/scripts/install @@ -117,7 +117,7 @@ ynh_use_logrotate "/var/log/$app" ynh_app_setting_set $app upstream_version $upstream_version # Reload services -ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" +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. diff --git a/scripts/restore b/scripts/restore index 7bc7e3a..9adcfb4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -70,5 +70,5 @@ yunohost service add "$app" --log /var/log/"$app"/"$app".log # Reload services systemctl reload nginx.service -ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" +ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -t 10 sleep 1 diff --git a/scripts/upgrade b/scripts/upgrade index e112428..d8928ad 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -178,7 +178,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 "/var/log/$app/gitea.log" +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. From b6dcf3d9c35514fb84f2addef3e20588e1650283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 7 Sep 2019 11:02:15 +0200 Subject: [PATCH 5/5] Fix log path --- scripts/install | 2 +- scripts/restore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 93e6a92..74eb776 100644 --- a/scripts/install +++ b/scripts/install @@ -108,7 +108,7 @@ ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ../conf/login_source.sql 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" diff --git a/scripts/restore b/scripts/restore index 9adcfb4..82bb8d4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -66,7 +66,7 @@ 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