From f3b46f422a2274fecb4565029fcaea1d91c6ff8e Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Thu, 28 Feb 2019 18:02:13 +0100 Subject: [PATCH 01/12] Upgrade to 1.7.3 --- conf/arm.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/arm.src b/conf/arm.src index c829f50..8f37252 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.0/gitea-1.7.0-linux-arm-6 -SOURCE_SUM=7502937fd6cb1ff11a9d51c7df658d5c6346f9f2312c6384f12b4c305fb7f7bc +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.3/gitea-1.7.3-linux-arm-6 +SOURCE_SUM=c38394be40634b0e1bd0fac0898474ff50e4535af610c12ee16ec3cabd2d4771 SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=gitea SOURCE_EXTRACT=false diff --git a/conf/armv7.src b/conf/armv7.src index d07338e..5eb2360 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.0/gitea-1.7.0-linux-arm-7 -SOURCE_SUM=2d8c095de0f0d83da5681aa84b14fb8ee278a5e020787227d88583c8b544da69 +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.3/gitea-1.7.3-linux-arm-7 +SOURCE_SUM=fd4ba028a30eb2fac1f8570fd3f6157f0c46c21992a2062dd7a6751cc8a47f2f SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=gitea SOURCE_EXTRACT=false diff --git a/conf/i386.src b/conf/i386.src index 805e122..2fcf64e 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.0/gitea-1.7.0-linux-386 -SOURCE_SUM=4a9639e1642d55cafa05d8988b3f9b23e61f003102ceee4e68205f2abcb9d94f +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.3/gitea-1.7.3-linux-386 +SOURCE_SUM=a420bccb17e6e1c317c014475ce5a5bf8091da123cc55b0569660ae43ababf44 SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=gitea SOURCE_EXTRACT=false diff --git a/conf/x86-64.src b/conf/x86-64.src index b3366e5..ce97cc3 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.0/gitea-1.7.0-linux-amd64 -SOURCE_SUM=fbce93006146f2e96901bd5940b04c4f54582051a363a1146b10b398958aaab6 +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.3/gitea-1.7.3-linux-amd64 +SOURCE_SUM=49b733a3272dc49cb869c1ba9624a9880168f27b8112197d0c7fa32411dbf625 SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=gitea SOURCE_EXTRACT=false From 915efa69e030c128065ccd17f8baee2696be75cb Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Sat, 2 Mar 2019 14:14:42 +0100 Subject: [PATCH 02/12] Fix version and add maintainer in manifest --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 57bcfde..a02bf1e 100644 --- a/manifest.json +++ b/manifest.json @@ -9,10 +9,10 @@ }, "url": "http://gitea.io", "license": "MIT", - "version": "1.5.2~ynh1", + "version": "1.7.3~ynh1", "maintainer": { - "name": "", - "email": "" + "name": "rafi59", + "email": "rafi59_dev@srvmaison.fr.nf" }, "multi_instance": true, "services": [ From e36fda963d72d29182bfcab97692cda5028310d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 15 Feb 2019 11:33:29 +0100 Subject: [PATCH 03/12] Implement migrations from gogs --- conf/gogs_migrations | 5 + conf/gogs_post_migration.sh | 32 ++++ conf/{ => source}/arm.src | 0 conf/source/arm_1.0.src | 5 + conf/source/arm_1.1.src | 5 + conf/source/arm_1.2.src | 5 + conf/source/arm_1.3.src | 5 + conf/source/arm_1.4.src | 5 + conf/source/arm_1.5.src | 5 + conf/source/arm_1.6.src | 5 + conf/source/armv7.src | 5 + conf/source/armv7_1.0.src | 5 + conf/source/armv7_1.1.src | 5 + conf/source/armv7_1.2.src | 5 + conf/source/armv7_1.3.src | 5 + conf/source/armv7_1.4.src | 5 + conf/source/armv7_1.5.src | 5 + conf/source/armv7_1.6.src | 5 + conf/{ => source}/i386.src | 0 conf/source/i386_1.0.src | 5 + conf/source/i386_1.1.src | 5 + conf/source/i386_1.2.src | 5 + conf/source/i386_1.3.src | 5 + conf/source/i386_1.4.src | 5 + conf/source/i386_1.5.src | 5 + conf/source/i386_1.6.src | 5 + conf/{ => source}/x86-64.src | 0 conf/source/x86-64_1.0.src | 5 + conf/source/x86-64_1.1.src | 5 + conf/source/x86-64_1.2.src | 5 + conf/source/x86-64_1.3.src | 5 + conf/source/x86-64_1.4.src | 5 + conf/source/x86-64_1.5.src | 5 + conf/source/x86-64_1.6.src | 5 + scripts/experimental_helper.sh | 295 +++++++++++++++++++++++++++++++++ scripts/install | 5 +- scripts/upgrade | 144 +++++++++++----- 37 files changed, 584 insertions(+), 42 deletions(-) create mode 100644 conf/gogs_migrations create mode 100644 conf/gogs_post_migration.sh rename conf/{ => source}/arm.src (100%) create mode 100644 conf/source/arm_1.0.src create mode 100644 conf/source/arm_1.1.src create mode 100644 conf/source/arm_1.2.src create mode 100644 conf/source/arm_1.3.src create mode 100644 conf/source/arm_1.4.src create mode 100644 conf/source/arm_1.5.src create mode 100644 conf/source/arm_1.6.src create mode 100644 conf/source/armv7.src create mode 100644 conf/source/armv7_1.0.src create mode 100644 conf/source/armv7_1.1.src create mode 100644 conf/source/armv7_1.2.src create mode 100644 conf/source/armv7_1.3.src create mode 100644 conf/source/armv7_1.4.src create mode 100644 conf/source/armv7_1.5.src create mode 100644 conf/source/armv7_1.6.src rename conf/{ => source}/i386.src (100%) create mode 100644 conf/source/i386_1.0.src create mode 100644 conf/source/i386_1.1.src create mode 100644 conf/source/i386_1.2.src create mode 100644 conf/source/i386_1.3.src create mode 100644 conf/source/i386_1.4.src create mode 100644 conf/source/i386_1.5.src create mode 100644 conf/source/i386_1.6.src rename conf/{ => source}/x86-64.src (100%) create mode 100644 conf/source/x86-64_1.0.src create mode 100644 conf/source/x86-64_1.1.src create mode 100644 conf/source/x86-64_1.2.src create mode 100644 conf/source/x86-64_1.3.src create mode 100644 conf/source/x86-64_1.4.src create mode 100644 conf/source/x86-64_1.5.src create mode 100644 conf/source/x86-64_1.6.src diff --git a/conf/gogs_migrations b/conf/gogs_migrations new file mode 100644 index 0000000..5e7a3c4 --- /dev/null +++ b/conf/gogs_migrations @@ -0,0 +1,5 @@ +/opt/$app +/home/$app +/var/log/$app +/etc/systemd/system/$app.service +/etc/nginx/conf.d/$domain.d/$app.conf diff --git a/conf/gogs_post_migration.sh b/conf/gogs_post_migration.sh new file mode 100644 index 0000000..5d71529 --- /dev/null +++ b/conf/gogs_post_migration.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# Ending the migration process from Gogs to Gitea + +set -u + +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source /usr/share/yunohost/helpers + +#================================================= +# SET VARIABLES +#================================================= + +old_app="__OLD_APP__" +new_app="__NEW_APP__" +script_name="$0" + +#================================================= +# DELETE OLD APP'S SETTINGS +#================================================= + +ynh_secure_remove "/etc/yunohost/apps/$old_app" +yunohost app ssowatconf + +#================================================= +# DELETE THIS SCRIPT +#================================================= + +echo "rm $script_name" | at now + 1 minutes diff --git a/conf/arm.src b/conf/source/arm.src similarity index 100% rename from conf/arm.src rename to conf/source/arm.src diff --git a/conf/source/arm_1.0.src b/conf/source/arm_1.0.src new file mode 100644 index 0000000..fe6aee6 --- /dev/null +++ b/conf/source/arm_1.0.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.0.2/gitea-1.0.2-linux-arm-6 +SOURCE_SUM=d8cd551840b4b5620609eba92e810f4963b259d2809a34724e8fae7b1db00d91 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/arm_1.1.src b/conf/source/arm_1.1.src new file mode 100644 index 0000000..9b8691d --- /dev/null +++ b/conf/source/arm_1.1.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.1.4/gitea-1.1.4-linux-arm-6 +SOURCE_SUM=f39bce7927b363402d37774484a5d0c893ee55595175e3a4d14a12126bccdd80 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/arm_1.2.src b/conf/source/arm_1.2.src new file mode 100644 index 0000000..6b5755d --- /dev/null +++ b/conf/source/arm_1.2.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.2.3/gitea-1.2.3-linux-arm-6 +SOURCE_SUM=06023c75babee8c9d76cee2886890ae9fe82b84a0e723c11ef9fafe3c5ba9539 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/arm_1.3.src b/conf/source/arm_1.3.src new file mode 100644 index 0000000..22ad6a9 --- /dev/null +++ b/conf/source/arm_1.3.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.3.3/gitea-1.3.3-linux-arm-6 +SOURCE_SUM=b1b20d5905cd275b384da2a08d36ed0730801f23fb33df5c45302c9a6ec62dc6 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/arm_1.4.src b/conf/source/arm_1.4.src new file mode 100644 index 0000000..2b3c5bd --- /dev/null +++ b/conf/source/arm_1.4.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.4.3/gitea-1.4.3-linux-arm-6 +SOURCE_SUM=d7341bd9536dbc7b1c3935efe3b0b6be953b0c3f0390b9b794e8fd54d58fee5b +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/arm_1.5.src b/conf/source/arm_1.5.src new file mode 100644 index 0000000..51d6bf6 --- /dev/null +++ b/conf/source/arm_1.5.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.5.3/gitea-1.5.3-linux-arm-6 +SOURCE_SUM=6d16b6bcc3cf804cc9b4e0e9ce3aa42e6699662f99998a06c25c7a43df64b0b6 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/arm_1.6.src b/conf/source/arm_1.6.src new file mode 100644 index 0000000..3b74aca --- /dev/null +++ b/conf/source/arm_1.6.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.6.4/gitea-1.6.4-linux-arm-6 +SOURCE_SUM=30bb6220cde6b35522bdaf5ffca0d2daba8a0eebee56e3f11cd40d3e5f8f5669 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/armv7.src b/conf/source/armv7.src new file mode 100644 index 0000000..d07338e --- /dev/null +++ b/conf/source/armv7.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.0/gitea-1.7.0-linux-arm-7 +SOURCE_SUM=2d8c095de0f0d83da5681aa84b14fb8ee278a5e020787227d88583c8b544da69 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/armv7_1.0.src b/conf/source/armv7_1.0.src new file mode 100644 index 0000000..9d39570 --- /dev/null +++ b/conf/source/armv7_1.0.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.0.2/gitea-1.0.2-linux-arm-7 +SOURCE_SUM=1533c4b9142d89e3ac78ac9650a1f1507d24f9ac7afcdbe73c83ae5517c36165 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/armv7_1.1.src b/conf/source/armv7_1.1.src new file mode 100644 index 0000000..6b83741 --- /dev/null +++ b/conf/source/armv7_1.1.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.1.4/gitea-1.1.4-linux-arm-7 +SOURCE_SUM=3b66cbca2f6ad10c8323c3d35280d63d17e192ab5e4aaa7415f5048710c00705 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/armv7_1.2.src b/conf/source/armv7_1.2.src new file mode 100644 index 0000000..63fe266 --- /dev/null +++ b/conf/source/armv7_1.2.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.2.3/gitea-1.2.3-linux-arm-7 +SOURCE_SUM=92a1a6fccae6d9382dccee90223457850124a8a9e9505401a04f507b8a90c1dd +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/armv7_1.3.src b/conf/source/armv7_1.3.src new file mode 100644 index 0000000..f5dd751 --- /dev/null +++ b/conf/source/armv7_1.3.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.3.3/gitea-1.3.3-linux-arm-7 +SOURCE_SUM=1f52cbaf97ca70cf6db5c152f6cff7921e9b066ffbe21ee4015616946c9d4251 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/armv7_1.4.src b/conf/source/armv7_1.4.src new file mode 100644 index 0000000..7849e95 --- /dev/null +++ b/conf/source/armv7_1.4.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.4.3/gitea-1.4.3-linux-arm-7 +SOURCE_SUM=2a93d7a09f0f9b999651f156a4c0c65a1d4da0c75a68a13bdd0b920082d514de +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/armv7_1.5.src b/conf/source/armv7_1.5.src new file mode 100644 index 0000000..7d7c476 --- /dev/null +++ b/conf/source/armv7_1.5.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.5.3/gitea-1.5.3-linux-arm-7 +SOURCE_SUM=eb939edb6cdc46702109410f38e358cc572564307e619c4798b6b8b99d6ec7e5 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/armv7_1.6.src b/conf/source/armv7_1.6.src new file mode 100644 index 0000000..100a3b3 --- /dev/null +++ b/conf/source/armv7_1.6.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.6.4/gitea-1.6.4-linux-arm-7 +SOURCE_SUM=e78d31922e42ccaaf6566f32e249fb6ba4af2876102c6248b3ba32d051e69327 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/i386.src b/conf/source/i386.src similarity index 100% rename from conf/i386.src rename to conf/source/i386.src diff --git a/conf/source/i386_1.0.src b/conf/source/i386_1.0.src new file mode 100644 index 0000000..2ca0757 --- /dev/null +++ b/conf/source/i386_1.0.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.0.2/gitea-1.0.2-linux-386 +SOURCE_SUM=966840c7b815662332c3785a65685bed08c8eab508b8af0fe41307b5ebce8399 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/i386_1.1.src b/conf/source/i386_1.1.src new file mode 100644 index 0000000..80a2235 --- /dev/null +++ b/conf/source/i386_1.1.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.1.4/gitea-1.1.4-linux-386 +SOURCE_SUM=d3fc91e4da9282abc2785bb96d1d805c85ae0a253228c2277e21fb332946c0fe +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/i386_1.2.src b/conf/source/i386_1.2.src new file mode 100644 index 0000000..d80179c --- /dev/null +++ b/conf/source/i386_1.2.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.2.3/gitea-1.2.3-linux-386 +SOURCE_SUM=a8593c5e908c7e6c26620d45122d017e38441e915a4ea472543251772dc5a6d9 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/i386_1.3.src b/conf/source/i386_1.3.src new file mode 100644 index 0000000..aa33a24 --- /dev/null +++ b/conf/source/i386_1.3.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.3.3/gitea-1.3.3-linux-386 +SOURCE_SUM=1b746cccffca446876ccc71efe328699f002622dab1d438e2142c8d7c23a22d7 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/i386_1.4.src b/conf/source/i386_1.4.src new file mode 100644 index 0000000..61dd883 --- /dev/null +++ b/conf/source/i386_1.4.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.4.3/gitea-1.4.3-linux-386 +SOURCE_SUM=760dda6f1cd76aa705915686a1d18837af3c4d912f731d1399048409a46ed2ea +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/i386_1.5.src b/conf/source/i386_1.5.src new file mode 100644 index 0000000..a8b9d00 --- /dev/null +++ b/conf/source/i386_1.5.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.5.3/gitea-1.5.3-linux-386 +SOURCE_SUM=292ef977c46b15650a68782666710bc3379bb4b22a3ae2cae761724569ca5857 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/i386_1.6.src b/conf/source/i386_1.6.src new file mode 100644 index 0000000..eabb1f5 --- /dev/null +++ b/conf/source/i386_1.6.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.6.4/gitea-1.6.4-linux-386 +SOURCE_SUM=1ccdca624582fbfb8c2b0a819b63b33e7b05a2d355bb4527cc55a6e367d5765d +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/x86-64.src b/conf/source/x86-64.src similarity index 100% rename from conf/x86-64.src rename to conf/source/x86-64.src diff --git a/conf/source/x86-64_1.0.src b/conf/source/x86-64_1.0.src new file mode 100644 index 0000000..134b97f --- /dev/null +++ b/conf/source/x86-64_1.0.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.0.2/gitea-1.0.2-linux-amd64 +SOURCE_SUM=02ed9a3bb7bcd1c8f3d8888e51a0887b3c0f44b2a80d50c99f9e407e457545ab +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/x86-64_1.1.src b/conf/source/x86-64_1.1.src new file mode 100644 index 0000000..00da3ab --- /dev/null +++ b/conf/source/x86-64_1.1.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.1.4/gitea-1.1.4-linux-amd64 +SOURCE_SUM=1d8804ff7bed26464d61115b9d88ead8a7a7937ceed66fd0bfaceecd4be41274 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/x86-64_1.2.src b/conf/source/x86-64_1.2.src new file mode 100644 index 0000000..faba5e0 --- /dev/null +++ b/conf/source/x86-64_1.2.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.2.3/gitea-1.2.3-linux-amd64 +SOURCE_SUM=bc71b6005617700c9b5654ddf5649aa9ee28dc2344d84254ddeb2678f4d44809 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/x86-64_1.3.src b/conf/source/x86-64_1.3.src new file mode 100644 index 0000000..3cfdf88 --- /dev/null +++ b/conf/source/x86-64_1.3.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.3.3/gitea-1.3.3-linux-amd64 +SOURCE_SUM=4f37b280eb9dcde7820e801e51ca07682faee703c220548da2f8aa9b6adb5231 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/x86-64_1.4.src b/conf/source/x86-64_1.4.src new file mode 100644 index 0000000..b493a9e --- /dev/null +++ b/conf/source/x86-64_1.4.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.4.3/gitea-1.4.3-linux-amd64 +SOURCE_SUM=fe60fca294baa24fe4862bbcfe29c92d5a8a883a48aadb80f3a1270cf5de9bd4 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/x86-64_1.5.src b/conf/source/x86-64_1.5.src new file mode 100644 index 0000000..9b20d7b --- /dev/null +++ b/conf/source/x86-64_1.5.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.5.3/gitea-1.5.3-linux-amd64 +SOURCE_SUM=f84eb0b77b47d88b16b1de6ca443dab4a77e940835748d309956052887b9c507 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/conf/source/x86-64_1.6.src b/conf/source/x86-64_1.6.src new file mode 100644 index 0000000..8ea4b91 --- /dev/null +++ b/conf/source/x86-64_1.6.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.6.4/gitea-1.6.4-linux-amd64 +SOURCE_SUM=e9508e04688e9840708c341125b47b43a2c12cad52185be4b7b6cf7a2fb8bb71 +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitea +SOURCE_EXTRACT=false diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh index 9e3869c..f7e7f26 100644 --- a/scripts/experimental_helper.sh +++ b/scripts/experimental_helper.sh @@ -97,3 +97,298 @@ ynh_clean_check_starting () { kill -s 15 $pid_tail 2>&1 ynh_secure_remove "$templog" 2>&1 } + +# Read the value of a key in a ynh manifest file +# +# usage: ynh_read_manifest manifest key +# | arg: -m, --manifest= - Path of the manifest to read +# | arg: -k, --key= - Name of the key to find +ynh_read_manifest () { + # Declare an array to define the options of this helper. + declare -Ar args_array=( [m]=manifest= [k]=manifest_key= ) + local manifest + local manifest_key + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + + if [ ! -e "$manifest" ]; then + # If the manifest isn't found, try the common place for backup and restore script. + manifest="../settings/manifest.json" + fi + + jq ".$manifest_key" "$manifest" --raw-output +} + +# Read the upstream version from the manifest +# The version number in the manifest is defined by ~ynh +# For example : 4.3-2~ynh3 +# This include the number before ~ynh +# In the last example it return 4.3-2 +# +# usage: ynh_app_upstream_version [-m manifest] +# | arg: -m, --manifest= - Path of the manifest to read +ynh_app_upstream_version () { + declare -Ar args_array=( [m]=manifest= ) + local manifest + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + + manifest="${manifest:-../manifest.json}" + version_key=$(ynh_read_manifest --manifest="$manifest" --manifest_key="version") + echo "${version_key/~ynh*/}" +} + +# Execute a command as another user +# usage: exec_as USER COMMAND [ARG ...] +exec_as() { + local USER=$1 + shift 1 + + if [[ $USER = $(whoami) ]]; then + eval "$@" + else + sudo -u "$USER" "$@" + fi +} + +# Need also the helper https://github.com/YunoHost-Apps/Experimental_helpers/blob/master/ynh_handle_getopts_args/ynh_handle_getopts_args + +# Make the main steps to migrate an app to its fork. +# +# This helper has to be used for an app which needs to migrate to a new name or a new fork +# (like owncloud to nextcloud or zerobin to privatebin). +# +# This helper will move the files of an app to its new name +# or recreate the things it can't move. +# +# To specify which files it has to move, you have to create a "migration file", stored in ../conf +# This file is a simple list of each file it has to move, +# except that file names must reference the $app variable instead of the real name of the app, +# and every instance-specific variables (like $domain). +# $app is especially important because it's this variable which will be used to identify the old place and the new one for each file. +# +# If a database exists for this app, it will be dumped and then imported in a newly created database, with a new name and new user. +# Don't forget you have to then apply these changes to application-specific settings (depends on the packaged application) +# +# Same things for an existing user, a new one will be created. +# But the old one can't be removed unless it's not used. See below. +# +# If you have some dependencies for your app, it's possible to change the fake debian package which manages them. +# You have to fill the $pkg_dependencies variable, and then a new fake package will be created and installed, +# and the old one will be removed. +# If you don't have a $pkg_dependencies variable, the helper can't know what the app dependencies are. +# +# The app settings.yml will be modified as follows: +# - finalpath will be changed according to the new name (but only if the existing $final_path contains the old app name) +# - The checksums of php-fpm and nginx config files will be updated too. +# - If there is a $db_name value, it will be changed. +# - And, of course, the ID will be changed to the new name too. +# +# Finally, the $app variable will take the value of the new name. +# The helper will set the $migration_process variable to 1 if a migration has been successfully handled. +# +# You have to handle by yourself all the migrations not done by this helper, like configuration or special values in settings.yml +# Also, at the end of the upgrade script, you have to add a post_migration script to handle all the things the helper can't do during YunoHost upgrade (mostly for permission reasons), +# especially remove the old user, move some hooks and remove the old configuration directory +# To launch this script, you have to move it elsewhere and start it after the upgrade script. +# `cp ../conf/$script_post_migration /tmp` +# `(cd /tmp; echo "/tmp/$script_post_migration" | at now + 2 minutes)` +# +# usage: ynh_handle_app_migration migration_id migration_list +# | arg: -i, --migration_id= - ID from which to migrate +# | arg: -l, --migration_list= - File specifying every file to move (one file per line) +ynh_handle_app_migration () { + # Need for end of install + ynh_package_install at + + #================================================= + # LOAD SETTINGS + #================================================= + + old_app=$YNH_APP_INSTANCE_NAME + local old_app_id=$YNH_APP_ID + local old_app_number=$YNH_APP_INSTANCE_NUMBER + + # Declare an array to define the options of this helper. + declare -Ar args_array=( [i]=migration_id= [l]=migration_list= ) + # Get the id from which to migrate + local migration_id + # And the file with the paths to move + local migration_list + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + + # Get the new app id in the manifest + local new_app_id=$(grep \"id\": ../manifest.json | cut -d\" -f4) + if [ $old_app_number -eq 1 ]; then + local new_app=$new_app_id + else + local new_app=${new_app_id}__${old_app_number} + fi + + #================================================= + # CHECK IF IT HAS TO MIGRATE + #================================================= + + migration_process=0 + + if [ "$old_app_id" == "$new_app_id" ] + then + # If the 2 id are the same + # No migration to do. + echo 0 + return 0 + else + if [ "$old_app_id" != "$migration_id" ] + then + # If the new app is not the authorized id, fail. + ynh_die "Incompatible application for migration from $old_app_id to $new_app_id" + fi + + echo "Migrate from $old_app_id to $new_app_id" >&2 + + #================================================= + # CHECK IF THE MIGRATION CAN BE DONE + #================================================= + + # TODO Handle multi instance apps... + # Check that there is not already an app installed for this id. + (yunohost app list --installed -f "$new_app" | grep -q id) \ + && ynh_die "$new_app is already installed" + + #================================================= + # CHECK THE LIST OF FILES TO MOVE + #================================================= + + local temp_migration_list="$(tempfile)" + + # Build the list by removing blank lines and comment lines + sed '/^#.*\|^$/d' "../conf/$migration_list" > "$temp_migration_list" + + # Check if there is no file in the destination + local file_to_move="" + while read file_to_move + do + # Replace all occurences of $app by $new_app in each file to move. + local move_to_destination="${file_to_move//\$app/$new_app}" + test -e "$move_to_destination" && ynh_die "A file named $move_to_destination already exists." + done < "$temp_migration_list" + + #================================================= + # COPY YUNOHOST SETTINGS FOR THIS APP + #================================================= + + local settings_dir="/etc/yunohost/apps" + cp -a "$settings_dir/$old_app" "$settings_dir/$new_app" + + # Replace the old id by the new one + ynh_replace_string "\(^id: .*\)$old_app" "\1$new_app" "$settings_dir/$new_app/settings.yml" + # INFO: There a special behavior with yunohost app setting: + # if the id given in argument does not match with the id + # stored in the config file, the config file will be purged. + # That's why we use sed instead of app setting here. + # https://github.com/YunoHost/yunohost/blob/c6b5284be8da39cf2da4e1036a730eb5e0515096/src/yunohost/app.py#L1316-L1321 + + # Change the label if it's simply the name of the app + old_label=$(ynh_app_setting_get $new_app label) + if [ "${old_label,,}" == "$old_app_id" ] + then + # Build the new label from the id of the app. With the first character as upper case + new_label=$(echo $new_app_id | cut -c1 | tr [:lower:] [:upper:])$(echo $new_app_id | cut -c2-) + ynh_app_setting_set $new_app label $new_label + fi + + #================================================= + # MOVE FILES TO THE NEW DESTINATION + #================================================= + + while read file_to_move + do + # Replace all occurence of $app by $new_app in each file to move. + move_to_destination="$(eval echo "${file_to_move//\$app/$new_app}")" + local real_file_to_move="$(eval echo "${file_to_move//\$app/$old_app}")" + echo "Move file $real_file_to_move to $move_to_destination" >&2 + mv "$real_file_to_move" "$move_to_destination" + done < "$temp_migration_list" + + #================================================= + # UPDATE SETTINGS KNOWN ENTRIES + #================================================= + + # Replace nginx checksum + ynh_replace_string "\(^checksum__etc_nginx.*\)_$old_app" "\1_$new_app/" "$settings_dir/$new_app/settings.yml" + + # Replace php5-fpm checksums + ynh_replace_string "\(^checksum__etc_php5.*[-_]\)$old_app" "\1$new_app/" "$settings_dir/$new_app/settings.yml" + + # Replace final_path + ynh_replace_string "\(^final_path: .*\)$old_app" "\1$new_app" "$settings_dir/$new_app/settings.yml" + + #================================================= + # MOVE THE DATABASE + #================================================= + + db_pwd=$(ynh_app_setting_get $old_app mysqlpwd) + db_name=$dbname + + # Check if a database exists before trying to move it + local mysql_root_password=$(cat $MYSQL_ROOT_PWD_FILE) + if [ -n "$db_name" ] && mysqlshow -u root -p$mysql_root_password | grep -q "^| $db_name" + then + new_db_name=$(ynh_sanitize_dbid $new_app) + echo "Rename the database $db_name to $new_db_name" >&2 + + local sql_dump="/tmp/${db_name}-$(date '+%s').sql" + + # Dump the old database + ynh_mysql_dump_db "$db_name" > "$sql_dump" + + # Create a new database + ynh_mysql_setup_db $new_db_name $new_db_name $db_pwd + # Then restore the old one into the new one + ynh_mysql_connect_as $new_db_name $db_pwd $new_db_name < "$sql_dump" + + # Remove the old database + ynh_mysql_remove_db $db_name $db_name + # And the dump + ynh_secure_remove "$sql_dump" + + # Update the value of $db_name + db_name=$new_db_name + ynh_app_setting_set $new_app db_name $db_name + fi + + #================================================= + # CHANGE THE FAKE DEPENDENCIES PACKAGE + #================================================= + + # Check if a variable $pkg_dependencies exists + # If this variable doesn't exist, this part shall be managed in the upgrade script. + if [ -n "${pkg_dependencies:-}" ] + then + # Define the name of the package + local old_package_name="${old_app//_/-}-ynh-deps" + local new_package_name="${new_app//_/-}-ynh-deps" + + if ynh_package_is_installed "$old_package_name" + then + # Install a new fake package + app=$new_app + ynh_install_app_dependencies $pkg_dependencies + # Then remove the old one + app=$old_app + ynh_remove_app_dependencies + fi + fi + + #================================================= + # UPDATE THE ID OF THE APP + #================================================= + + app=$new_app + + + # Set migration_process to 1 to inform that an upgrade has been made + migration_process=1 + fi +} diff --git a/scripts/install b/scripts/install index a31fd41..40deb45 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ config_nginx config_gitea # Install gitea -ynh_setup_source $final_path $architecture +ynh_setup_source $final_path source/$architecture # Set permissions set_permission @@ -112,6 +112,9 @@ yunohost service add "$app" --log "/var/log/$app/$app.log" # Configure logrotate ynh_use_logrotate "/var/log/$app" +# Save Version +ynh_app_setting_set $app upstream_version $(ynh_app_upstream_version) + # Reload services ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd" sleep 1 diff --git a/scripts/upgrade b/scripts/upgrade index ed849fc..0faa002 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,6 +22,7 @@ admin=$(ynh_app_setting_get "$app" adminusername) key=$(ynh_app_setting_get "$app" secret_key) is_public=$(ynh_app_setting_get "$app" is_public) port=$(ynh_app_setting_get "$app" web_port) +upstream_version=$(ynh_app_setting_get $app upstream_version) # Backup the current version of the app ynh_backup_before_upgrade @@ -33,51 +34,39 @@ ynh_clean_setup () { systemctl stop "$app".service #================================================= -# MIGRATION FROM OLD VERSION +# MIGRATION FROM GOGS #================================================= -# Update settings is_public to new standard -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set $app is_public 1 # Fixe is_public en booléen - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set $app is_public 0 - is_public=0 -fi +[[ $YNH_APP_ID == "gogs" ]] \ + && [[ "$(cat "/opt/$app/templates/.VERSION")" != 0.11.79.1211 ]] \ + && ynh_die "It look like that you have an old gogs install. You need first upgrade gogs instance (id : $gogs_migrate_id) and after migrate to gitea." +ynh_handle_app_migration gogs gogs_migrations -if [[ $port == "" ]] -then - port=$(ynh_find_port 6000) - ynh_app_setting_set $app web_port $port -fi +if [[ $migration_process -eq 1 ]]; then + # Replace the user + ynh_system_user_delete $old_app + test getent passwd "$app" &>/dev/null || \ + useradd -d "$DATADIR" --system --user-group "$app" --shell /bin/bash || \ + ynh_die "Unable to create $app system account" -# handle upgrade from old package installation -# this test that /etc/gitea exist since this was used in the old package -# but not in the new -# this code will be removed in the future -if [ -d "/etc/gitea" ] -then - # create needed directories if not already created - create_dir + # Reload variables + dbname=$app + dbuser=$app + final_path="/opt/$app" + DATADIR="/home/$app" + REPO_PATH="$DATADIR/repositories" + DATA_PATH="$DATADIR/data" - # move repositories to new dir - old_repo_path=$(ynh_app_setting_get "$app" repopath) - mv "${old_repo_path:-/home/yunohost.app/gitea}"/* "$REPO_PATH" || true # Avoid if the directory is empty - # cleanup old dir and conf - ynh_secure_remove /opt/gitea - ynh_secure_remove /etc/gitea - ynh_secure_remove /opt/gitea_src + # Clean old binary + ynh_secure_remove $final_path/gogs + ynh_secure_remove $final_path/custom/conf/auth.d - # create needed directories if not already created - create_dir -fi -# end of old package upgrade + # Restore authentication from SQL database + ynh_replace_string "__ADMIN__" "$admin" ../conf/login_source.sql + ynh_replace_string "__APP__" "$app" ../conf/login_source.sql + ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ../conf/login_source.sql -# test if user gitea is locked because of an old installation of the package. -# if it's blocked, unlock it to allow ssh usage with git -if [[ $(grep "$app" /etc/shadow | cut -d: -f2) == '!' ]] -then - usermod -p '*' "$app" + upstream_version="0.0.1" fi #================================================= @@ -87,9 +76,6 @@ fi # Clean template to fix issue : https://github.com/gogits/gogs/issues/4585 ynh_secure_remove "/opt/$app/templates" -# Install gitea -ynh_setup_source $final_path $architecture - # Configure gitea with app.ini file config_gitea @@ -99,6 +85,59 @@ ynh_add_systemd_config # Modify Nginx configuration file and copy it to Nginx conf directory config_nginx +#================================================= +# DB migration +#================================================= + +# Support for the time when the upstream_version was not updated +upstream_version=${upstream_version:-1.7} + +restart_gitea() { + # Set permissions + set_permission + ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd" + # Leave the time to update the database schema + sleep 5 + systemctl stop $app +} + +case $upstream_version in +"0.0.1" ) + ynh_setup_source $final_path source/${architecture}_1.0 + set_permission + systemctl start $app + sleep 20 + systemctl stop $app +;& +"1.0."* ) + ynh_setup_source $final_path source/${architecture}_1.1 + restart_gitea +;& +"1.1."* ) + ynh_setup_source $final_path source/${architecture}_1.2 + restart_gitea +;& +"1.2."* ) + ynh_setup_source $final_path source/${architecture}_1.3 + restart_gitea +;& +"1.3."* ) + ynh_setup_source $final_path source/${architecture}_1.4 + restart_gitea +;& +"1.4."* ) + ynh_setup_source $final_path source/${architecture}_1.5 + restart_gitea +;& +"1.5."* ) + ynh_setup_source $final_path source/${architecture}_1.6 + restart_gitea +;& +esac + +# Install gitea +ynh_setup_source $final_path source/$architecture + #================================================= # GENERIC FINALIZATION #================================================= @@ -106,6 +145,9 @@ config_nginx # Set permissions set_permission +# Save Version +ynh_app_setting_set $app upstream_version $(ynh_app_upstream_version) + # Unprotect root from SSO if public set_access_settings @@ -116,3 +158,23 @@ sleep 1 # Store the checksum with the 'INTERNAL_TOKEN' value. # Should be removed when the issue https://github.com/go-gitea/gitea/issues/3246 is fixed ynh_store_file_checksum "$final_path/custom/conf/app.ini" + +#================================================= +# FINISH MIGRATION PROCESS +#================================================= + +if [[ $migration_process -eq 1 ]]; then + echo "gogs has been successfully migrated to Gitea! \ +A last scheduled operation will run in a couple of minutes to finish the \ +migration in YunoHost side. Do not proceed any application operation while \ +you don't see Gogs as installed." >&2 + + # Execute a post migration script after the end of this upgrade. + # Mainly for some cleaning + script_post_migration=gogs_post_migration.sh + ynh_replace_string "__OLD_APP__" "$old_app" ../conf/$script_post_migration + ynh_replace_string "__NEW_APP__" "$app" ../conf/$script_post_migration + cp ../conf/$script_post_migration /tmp + chmod +x /tmp/$script_post_migration + (cd /tmp; echo "/tmp/$script_post_migration > /tmp/$script_post_migration.log 2>&1" | at now + 2 minutes) +fi From 6bf9db4c361123bba6ac08e5d112610d5a34b84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sun, 17 Feb 2019 00:53:17 +0100 Subject: [PATCH 04/12] Update check_process for check upgrade from old version --- check_process | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 0e7e4b7..80e9493 100644 --- a/check_process +++ b/check_process @@ -28,4 +28,7 @@ Level 7=auto Level 8=0 Level 9=0 - Level 10=0 \ No newline at end of file + Level 10=0 +;;; Upgrade options + ; commit=bf663ad8695a64dba7c45aa518aec048cb2f2b2e + name=First package version From 0631a0d13f13fe71d4c8f34f96f827f54e3b964f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 28 Feb 2019 15:06:37 +0100 Subject: [PATCH 05/12] Update checkprocess to check the migration --- check_process | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 80e9493..500f843 100644 --- a/check_process +++ b/check_process @@ -12,6 +12,8 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=349992d4f3921e4e1adb37a0cace4a5a9eb67099 + upgrade=1 from_commit=4e078e91129725c8b09ba551ab2a04e0328a45b3 backup_restore=1 multi_instance=1 incorrect_path=0 @@ -30,5 +32,7 @@ Level 9=0 Level 10=0 ;;; Upgrade options - ; commit=bf663ad8695a64dba7c45aa518aec048cb2f2b2e + ; commit=349992d4f3921e4e1adb37a0cace4a5a9eb67099 name=First package version + ; commit=4e078e91129725c8b09ba551ab2a04e0328a45b3 + name=Gogs code, check migration from gogs From c30e33a61229f53851cd49341502130ff5e4402c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 1 Mar 2019 23:29:52 +0100 Subject: [PATCH 06/12] Restore all scripts from old settings --- scripts/experimental_helper.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh index f7e7f26..6ce0371 100644 --- a/scripts/experimental_helper.sh +++ b/scripts/experimental_helper.sh @@ -280,6 +280,7 @@ ynh_handle_app_migration () { local settings_dir="/etc/yunohost/apps" cp -a "$settings_dir/$old_app" "$settings_dir/$new_app" + cp -a ../{scripts,conf} "$settings_dir/$new_app" # Replace the old id by the new one ynh_replace_string "\(^id: .*\)$old_app" "\1$new_app" "$settings_dir/$new_app/settings.yml" From 53e99747b04a7c50eb83b3da82c184ab80402be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 1 Mar 2019 23:38:18 +0100 Subject: [PATCH 07/12] Fix upstream version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 57bcfde..5d8de60 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ }, "url": "http://gitea.io", "license": "MIT", - "version": "1.5.2~ynh1", + "version": "1.7.3~ynh1", "maintainer": { "name": "", "email": "" From e5906e7ab4e3c748cfb0d26dbabfc0ff9c0cd4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 1 Mar 2019 23:39:34 +0100 Subject: [PATCH 08/12] Remove old source file --- conf/armv7.src | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 conf/armv7.src diff --git a/conf/armv7.src b/conf/armv7.src deleted file mode 100644 index 5eb2360..0000000 --- a/conf/armv7.src +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.3/gitea-1.7.3-linux-arm-7 -SOURCE_SUM=fd4ba028a30eb2fac1f8570fd3f6157f0c46c21992a2062dd7a6751cc8a47f2f -SOURCE_SUM_PRG=sha256sum -SOURCE_FILENAME=gitea -SOURCE_EXTRACT=false From f1da5932782870a78e2babafb0608a2a245dd517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 2 Mar 2019 00:00:55 +0100 Subject: [PATCH 09/12] Reload variable before create user --- scripts/upgrade | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0faa002..5d2a156 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,11 +43,6 @@ systemctl stop "$app".service ynh_handle_app_migration gogs gogs_migrations if [[ $migration_process -eq 1 ]]; then - # Replace the user - ynh_system_user_delete $old_app - test getent passwd "$app" &>/dev/null || \ - useradd -d "$DATADIR" --system --user-group "$app" --shell /bin/bash || \ - ynh_die "Unable to create $app system account" # Reload variables dbname=$app @@ -57,6 +52,12 @@ if [[ $migration_process -eq 1 ]]; then REPO_PATH="$DATADIR/repositories" DATA_PATH="$DATADIR/data" + # Replace the user + ynh_system_user_delete $old_app + test getent passwd "$app" &>/dev/null || \ + useradd -d "$DATADIR" --system --user-group "$app" --shell /bin/bash || \ + ynh_die "Unable to create $app system account" + # Clean old binary ynh_secure_remove $final_path/gogs ynh_secure_remove $final_path/custom/conf/auth.d From 84725a3bc0588a4c5c4762b47d5b2b47f6c0199c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 2 Mar 2019 00:16:46 +0100 Subject: [PATCH 10/12] Fix hook --- scripts/upgrade | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5d2a156..72ff9c9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,7 +43,6 @@ systemctl stop "$app".service ynh_handle_app_migration gogs gogs_migrations if [[ $migration_process -eq 1 ]]; then - # Reload variables dbname=$app dbuser=$app @@ -67,6 +66,16 @@ if [[ $migration_process -eq 1 ]]; then ynh_replace_string "__APP__" "$app" ../conf/login_source.sql ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ../conf/login_source.sql + # Fix hooks + if [[ -e $REPO_PATH ]];then + ls $REPO_PATH/*/*.git/hooks/pre-receive | while read p; do + ynh_secure_remove $p + done + ls $REPO_PATH/*/*.git/hooks/post-receive | while read p; do + ynh_secure_remove $p + done + fi + upstream_version="0.0.1" fi From 7afcb9ebe93f0ad55e5c681787107537ac817446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 2 Mar 2019 20:31:38 +0100 Subject: [PATCH 11/12] Fix source armv7 --- conf/source/armv7.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/source/armv7.src b/conf/source/armv7.src index d07338e..5eb2360 100644 --- a/conf/source/armv7.src +++ b/conf/source/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.0/gitea-1.7.0-linux-arm-7 -SOURCE_SUM=2d8c095de0f0d83da5681aa84b14fb8ee278a5e020787227d88583c8b544da69 +SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.7.3/gitea-1.7.3-linux-arm-7 +SOURCE_SUM=fd4ba028a30eb2fac1f8570fd3f6157f0c46c21992a2062dd7a6751cc8a47f2f SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=gitea SOURCE_EXTRACT=false From 9c7545471651aeb9c2dd0777e012f04bfcdeabc9 Mon Sep 17 00:00:00 2001 From: Kcchouette Date: Fri, 17 May 2019 23:27:23 +0200 Subject: [PATCH 12/12] Update upgrade command --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 701726f..3fd26ba 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ From the command-line: ## Upgrade From the command-line: -`sudo yunohost app upgrade Gitea -u https://framagit.org/YunoHost-Apps/gitea_ynh gitea` +`sudo yunohost app upgrade gitea -u https://framagit.org/YunoHost-Apps/gitea_ynh` ## Notes on SSH usage If you want to use Gitea with ssh and be able to pull/push with you ssh key, your ssh daemon must be properly configured to use private/public keys. Here is a sample configuration of `/etc/ssh/sshd_config` that works with Gitea: @@ -52,4 +52,4 @@ Any issue is welcome here : https://framagit.org/YunoHost-Apps/gitea_ynh/issues Gitea is published under the MIT License: https://github.com/go-gitea/gitea/blob/master/LICENSE -This package is published under the MIT License. +This package is published under the MIT License. \ No newline at end of file