From e8049b0eb1780400fefe967c5c4185d5d4b9d539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 11 Mar 2020 21:03:22 +0000 Subject: [PATCH 1/3] Upgrade gitea to 1.11.3 --- README.md | 2 +- conf/source/arm.src | 4 ++-- conf/source/armv7.src | 4 ++-- conf/source/i386.src | 4 ++-- conf/source/x86-64.src | 4 ++-- manifest.json | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e0c85d1..814776e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Overview Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to Github. -**Shipped version:** 1.11.2 +**Shipped version:** 1.11.3 Screenshots ----------- diff --git a/conf/source/arm.src b/conf/source/arm.src index 1ee0441..da70eb6 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.11.2/gitea-1.11.2-linux-arm-6 -SOURCE_SUM=e2186aa1a63e38b72358da44a220f3c9324f157bc9df07be66605c9c60066f04 +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.11.3/gitea-1.11.3-linux-arm-6 +SOURCE_SUM=578180011bc0f08208dcf6222d6e9c524efc1b2a5e62ef0858f3e8a742106c8a SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=gitea SOURCE_EXTRACT=false diff --git a/conf/source/armv7.src b/conf/source/armv7.src index 708b007..41046f0 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.11.2/gitea-1.11.2-linux-arm-6 -SOURCE_SUM=e2186aa1a63e38b72358da44a220f3c9324f157bc9df07be66605c9c60066f04 +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.11.3/gitea-1.11.3-linux-arm-6 +SOURCE_SUM=578180011bc0f08208dcf6222d6e9c524efc1b2a5e62ef0858f3e8a742106c8a SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=gitea SOURCE_EXTRACT=false diff --git a/conf/source/i386.src b/conf/source/i386.src index 8e73f5c..08fa821 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.11.2/gitea-1.11.2-linux-386 -SOURCE_SUM=635fd818a3661cc2f205623fe8d0a59f192a766187f6bdde151895915f5badb3 +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.11.3/gitea-1.11.3-linux-386 +SOURCE_SUM=9b85e8615a68424bb4621f9430c440955394c385969d2e86d94796373992d229 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 061b742..6d07d43 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.11.2/gitea-1.11.2-linux-amd64 -SOURCE_SUM=0dd45a6b7a397e8c81753686bf3595b55c717070389a8fd7fea72a487be9bb5b +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.11.3/gitea-1.11.3-linux-amd64 +SOURCE_SUM=bd4d3d4f2d3998ebd1fecc1e8fc09971bc822aa8437a72b7131bee6b944f5d51 SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=gitea SOURCE_EXTRACT=false diff --git a/manifest.json b/manifest.json index 4e9ea6a..37eda47 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ }, "url": "http://gitea.io", "license": "MIT", - "version": "1.11.2~ynh1", + "version": "1.11.3~ynh1", "maintainer": { "name": "rafi59", "email": "rafi59_dev@srvmaison.fr.nf" From c87d5a3c66734d02d59a0b9f92a6e1d0db1f6ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 19 Mar 2020 17:51:48 +0100 Subject: [PATCH 2/3] Fix wrong home directory --- scripts/install | 2 +- scripts/restore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index b61967d..1082312 100644 --- a/scripts/install +++ b/scripts/install @@ -59,7 +59,7 @@ ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass" # Add users ynh_script_progression --message="Configuring system user..." -ynh_system_user_create --username= $app --home_dir=/opt/yunohost/$app --use_shell +ynh_system_user_create --username=$app --home_dir=/home/$app --use_shell # create needed directories create_dir diff --git a/scripts/restore b/scripts/restore index 2cc109d..b486eab 100644 --- a/scripts/restore +++ b/scripts/restore @@ -40,7 +40,7 @@ test ! -e "$final_path" || ynh_die --message "This path already contains a folde # Add users ynh_script_progression --message="Configuring system user..." -ynh_system_user_create --username= $app --home_dir=/opt/yunohost/$app --use_shell +ynh_system_user_create --username=$app --home_dir=/home/$app --use_shell # Restore all files ynh_script_progression --message="Restoring files..." --weight=10 From f933d4089625f8d28485cd633fc4c795e4f964eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 27 Mar 2020 13:55:02 +0100 Subject: [PATCH 3/3] Fix start service managment and listen only on localhost --- conf/app.ini | 1 + scripts/change_url | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/app.ini b/conf/app.ini index 9c557f0..9f00522 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -20,6 +20,7 @@ FORCE_PRIVATE = false [server] DOMAIN = __DOMAIN__ HTTP_PORT = __PORT__ +HTTP_ADDR = 127.0.0.1 ROOT_URL = https://__URL__/ DISABLE_SSH = false SSH_PORT = __SSH_PORT__ diff --git a/scripts/change_url b/scripts/change_url index c14ee9d..a57b886 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -55,7 +55,7 @@ config_gitea # RELOAD services ynh_script_progression --message="Starting services..." -ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -a restart -t 10 +ynh_systemd_action -l "Starting new server: tcp:127.0.0.1:" -p "/var/log/$app/gitea.log" -t 10 sleep 1 # Store the checksum with the 'INTERNAL_TOKEN' value. diff --git a/scripts/install b/scripts/install index 1082312..57901c4 100644 --- a/scripts/install +++ b/scripts/install @@ -126,7 +126,7 @@ ynh_app_setting_set --app $app --key upstream_version --value $(ynh_app_upstream # Reload services ynh_script_progression --message="Starting gitea services..." --weight=3 -ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -t 10 +ynh_systemd_action -l "Starting new server: tcp:127.0.0.1:" -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 b486eab..49ab3e8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -78,7 +78,7 @@ yunohost service add "$app" --log /var/log/"$app"/gitea.log # Reload services ynh_script_progression --message="Reloading services..." systemctl reload nginx.service -ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -t 10 +ynh_systemd_action -l "Starting new server: tcp:127.0.0.1:" -p "/var/log/$app/gitea.log" -t 10 sleep 1 ynh_script_progression --message="Restoration completed for $app" --last diff --git a/scripts/upgrade b/scripts/upgrade index 4a969ad..58eccbf 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -202,7 +202,7 @@ set_access_settings # Reload services ynh_script_progression --message="Starting gitea services..." --weight=3 -ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -t 10 +ynh_systemd_action -l "Starting new server: tcp:127.0.0.1:" -p "/var/log/$app/gitea.log" -t 10 sleep 1 # Store the checksum with the 'INTERNAL_TOKEN' value.